Unarelith/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ServerConnectState] Added simple regex check for username.

Browse Source
This commit is contained in:
Quentin Bazin 2020-06-26 02:05:22 +02:00
parent 93a396e926
commit a3eea107f5
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/client/states/ServerConnectState.cpp
View File

@ -66,16 +66,23 @@ ServerConnectState::ServerConnectState(gk::ApplicationState *parent) : Interface
}
}
std::string username = m_usernameInput.string();
if (port == 0 || isPortInvalid) {
m_errorText.setString("Error: Invalid server address");
m_errorText.updateVertexBuffer();
updateWidgetPosition();
}
else if (!gk::regexMatch(username, "^[A-Za-z0-9_]+$")) {
m_errorText.setString("Error: Invalid username");
m_errorText.updateVertexBuffer();
updateWidgetPosition();
}
else {
auto &game = m_stateStack->push<GameState>();
auto &serverLoadingState = m_stateStack->push<ServerLoadingState>(game, true, host, port, this);
serverLoadingState.setTexturePack(m_texturePack);
serverLoadingState.setUsername(m_usernameInput.string());
serverLoadingState.setUsername(username);
}
});
@ -151,7 +158,7 @@ void ServerConnectState::updateWidgetPosition() {
m_errorText.setPosition(
Config::screenWidth / 2.0f - m_errorText.getSize().x * Config::guiScale / 2.0f,
Config::screenHeight / 2.0f - 30 * Config::guiScale
Config::screenHeight / 2.0f + 30 * Config::guiScale
);
}