Skip to content

Send password rejection before kicking client #1923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Flamefire merged 2 commits into from
May 7, 2026
Merged

Send password rejection before kicking client #1923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00c49eb
Send password rejection before kicking client
DevOpsOfChaos May 1, 2026
a3aaa5d
Merge branch 'master' into sidequest/direct-ip-wrong-password-message
DevOpsOfChaos May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions libs/s25main/network/GameServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,10 +938,12 @@ bool GameServer::OnGameMessage(const GameMessage_Server_Password& msg)
} else
playerInfos[msg.senderPlayerID].isHost = false;

player->sendMsgAsync(new GameMessage_Server_Password(passwordok));

if(passwordok == "false")
{
player->sendMsg(GameMessage_Server_Password(passwordok));
KickPlayer(msg.senderPlayerID, KickReason::WrongPassword, __LINE__);
} else
player->sendMsgAsync(new GameMessage_Server_Password(passwordok));
return true;
}

Expand Down
28 changes: 28 additions & 0 deletions tests/s25Main/network/testGameClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,34 @@ BOOST_AUTO_TEST_CASE(ClientDetectsMapBufferOverflow)
BOOST_TEST(client.GetState() == ClientState::Stopped);
}

BOOST_AUTO_TEST_CASE(ClientReportsWrongPasswordResponse)
{
GameClient client;
GameMessageInterface& clientMsgInterface = client;
MockClientInterface callbacks;
client.SetInterface(&callbacks);
TestServer server;
const auto serverPort = server.tryListen();
BOOST_TEST_REQUIRE(serverPort >= 0);
const auto serverType = rttr::test::randomEnum<ServerType>();
mock::sequence s;
MOCK_EXPECT(callbacks.CI_NextConnectState).in(s).with(ConnectState::Initiated).once();
MOCK_EXPECT(callbacks.CI_NextConnectState).in(s).with(ConnectState::VerifyServer).once();
MOCK_EXPECT(callbacks.CI_NextConnectState).in(s).with(ConnectState::QueryPw).once();
MOCK_EXPECT(callbacks.CI_Error).in(s).with(ClientError::WrongPassword).once();

BOOST_TEST_REQUIRE(client.Connect("localhost", rttr::test::randString(10), serverType, serverPort, false, false));
clientMsgInterface.OnGameMessage(GameMessage_Player_Id(1));
clientMsgInterface.OnGameMessage(GameMessage_Server_TypeOK(GameMessage_Server_TypeOK::StatusCode::Ok, ""));
BOOST_TEST_REQUIRE(boost::dynamic_pointer_cast<GameMessage_Server_Type>(client.GetMainPlayer().sendQueue.pop()));
BOOST_TEST_REQUIRE(
boost::dynamic_pointer_cast<GameMessage_Server_Password>(client.GetMainPlayer().sendQueue.pop()));

clientMsgInterface.OnGameMessage(GameMessage_Server_Password("false"));

BOOST_TEST(client.GetState() == ClientState::Stopped);
}

using namespace std::chrono_literals;

BOOST_AUTO_TEST_CASE(CanSetNewSpeed)
Expand Down
Loading