Skip to content
Permalink
Browse files

serverpackethandler: Minor log message fixes

closes #10434
  • Loading branch information
sfan5 committed Nov 12, 2020
1 parent 61bbdd6 commit ad58ece18062d4c545432b45d71ce6dbe841746b
Showing with 6 additions and 7 deletions.
  1. +6 −7 src/network/serverpackethandler.cpp
@@ -1657,19 +1657,18 @@ void Server::handleCommand_SrpBytesM(NetworkPacket* pkt)

bool wantSudo = (cstate == CS_Active);

verbosestream << "Server: Received TOCLIENT_SRP_BYTES_M." << std::endl;
verbosestream << "Server: Received TOSERVER_SRP_BYTES_M." << std::endl;

if (!((cstate == CS_HelloSent) || (cstate == CS_Active))) {
actionstream << "Server: got SRP _M packet in wrong state "
<< cstate << " from " << addr_s
<< ". Ignoring." << std::endl;
warningstream << "Server: got SRP_M packet in wrong state "
<< cstate << " from " << addr_s << ". Ignoring." << std::endl;
return;
}

if (client->chosen_mech != AUTH_MECHANISM_SRP &&
client->chosen_mech != AUTH_MECHANISM_LEGACY_PASSWORD) {
actionstream << "Server: got SRP _M packet, while auth"
<< "is going on with mech " << client->chosen_mech << " from "
warningstream << "Server: got SRP_M packet, while auth "
"is going on with mech " << client->chosen_mech << " from "
<< addr_s << " (wantSudo=" << wantSudo << "). Denying." << std::endl;
if (wantSudo) {
DenySudoAccess(peer_id);
@@ -1717,7 +1716,7 @@ void Server::handleCommand_SrpBytesM(NetworkPacket* pkt)

std::string checkpwd; // not used, but needed for passing something
if (!m_script->getAuth(playername, &checkpwd, NULL)) {
actionstream << "Server: " << playername <<
errorstream << "Server: " << playername <<
" cannot be authenticated (auth handler does not work?)" <<
std::endl;
DenyAccess(peer_id, SERVER_ACCESSDENIED_SERVER_FAIL);

0 comments on commit ad58ece

Please sign in to comment.
You can’t perform that action at this time.