Skip to content

Commit

Permalink
Merge pull request #3203 from gfgtdf/1.14
Browse files Browse the repository at this point in the history 
add version mp command
  • Loading branch information
@gfgtdf
gfgtdf committed Jun 3, 2018
2 parents 287775c + c6aef1b commit cba86cc
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 24 deletions.
3 changes: 2 additions & 1 deletion src/server/player.cpp
View file
Expand Up @@ -16,10 +16,11 @@
#include "lexical_cast.hpp"

wesnothd::player::player(const std::string& n, simple_wml::node& cfg,
bool registered, const size_t max_messages,
bool registered, const std::string& version, const size_t max_messages,
const size_t time_period,
const bool moderator)
: name_(n)
, version_(version)
, cfg_(cfg)
, registered_(registered)
, flood_start_(0)
Expand Down
4 changes: 3 additions & 1 deletion src/server/player.hpp
View file
Expand Up @@ -32,7 +32,7 @@ class player
OBSERVING
};

player(const std::string& n, simple_wml::node& cfg, bool registered,
player(const std::string& n, simple_wml::node& cfg, bool registered, const std::string& version,
const size_t max_messages=4, const size_t time_period=10,
const bool moderator=false);

Expand All @@ -47,6 +47,7 @@ class player


const std::string& name() const { return name_; }
const std::string& version() const { return version_; }
const simple_wml::node* config_address() const { return &cfg_; }

bool is_message_flooding();
Expand All @@ -69,6 +70,7 @@ class player

private:
const std::string name_;
std::string version_;
simple_wml::node& cfg_;

bool registered_;
Expand Down
59 changes: 42 additions & 17 deletions src/server/server.cpp
View file
Expand Up @@ -355,6 +355,7 @@ void server::setup_handlers()
SETUP_HANDLER("sample", &server::sample_handler);
SETUP_HANDLER("help", &server::help_handler);
SETUP_HANDLER("stats", &server::stats_handler);
SETUP_HANDLER("version", &server::version_handler);
SETUP_HANDLER("metrics", &server::metrics_handler);
SETUP_HANDLER("requests", &server::requests_handler);
SETUP_HANDLER("games", &server::games_handler);
Expand Down Expand Up @@ -582,7 +583,7 @@ void server::read_version(socket_ptr socket, std::shared_ptr<simple_wml::documen
if(accepted_it != accepted_versions_.end()) {
LOG_SERVER << client_address(socket) << "\tplayer joined using accepted version " << version_str
<< ":\ttelling them to log in.\n";
async_send_doc(socket, login_response_, std::bind(&server::login, this, _1));
async_send_doc(socket, login_response_, std::bind(&server::login, this, _1, version_str));
return;
}

Expand Down Expand Up @@ -619,23 +620,23 @@ void server::read_version(socket_ptr socket, std::shared_ptr<simple_wml::documen
}
}

void server::login(socket_ptr socket)
void server::login(socket_ptr socket, std::string version)
{
async_receive_doc(socket, std::bind(&server::handle_login, this, _1, _2));
async_receive_doc(socket, std::bind(&server::handle_login, this, _1, _2, version));
}

void server::handle_login(socket_ptr socket, std::shared_ptr<simple_wml::document> doc)
void server::handle_login(socket_ptr socket, std::shared_ptr<simple_wml::document> doc, std::string version)
{
if(const simple_wml::node* const login = doc->child("login")) {
if(!is_login_allowed(socket, login)) {
server::login(socket); // keep reading logins from client until we get a successful one
if(!is_login_allowed(socket, login, version)) {
server::login(socket, version); // keep reading logins from client until we get a successful one
}
} else {
async_send_error(socket, "You must login first.", MP_MUST_LOGIN);
}
}

bool server::is_login_allowed(socket_ptr socket, const simple_wml::node* const login)
bool server::is_login_allowed(socket_ptr socket, const simple_wml::node* const login, const std::string& version)
{
// Check if the username is valid (all alpha-numeric plus underscore and hyphen)
std::string username = (*login)["username"].to_string();
Expand Down Expand Up @@ -672,7 +673,7 @@ bool server::is_login_allowed(socket_ptr socket, const simple_wml::node* const l
// Check for password

bool registered;
if(!authenticate(socket, username, (*login)["password"].to_string(), name_taken, registered))
if(!authenticate(socket, username, (*login)["password"].to_string(), version, name_taken, registered))
return true; // it's a failed login but we don't want to call server::login again
// because send_password_request() will handle the next network write and read instead

Expand Down Expand Up @@ -747,6 +748,7 @@ bool server::is_login_allowed(socket_ptr socket, const simple_wml::node* const l
username,
player_cfg,
registered,
version,
default_max_messages_,
default_time_period_,
user_handler_ && user_handler_->user_is_moderator(username)
Expand Down Expand Up @@ -787,7 +789,7 @@ bool server::is_login_allowed(socket_ptr socket, const simple_wml::node* const l
}

bool server::authenticate(
socket_ptr socket, const std::string& username, const std::string& password, bool name_taken, bool& registered)
socket_ptr socket, const std::string& username, const std::string& password, const std::string& version, bool name_taken, bool& registered)
{
// Current login procedure for registered nicks is:
// - Client asks to log in with a particular nick
Expand Down Expand Up @@ -816,14 +818,14 @@ bool server::authenticate(
// This name is registered and no password provided
if(password.empty()) {
if(!name_taken) {
send_password_request(socket, "The nickname '" + username + "' is registered on this server.",
username, MP_PASSWORD_REQUEST);
send_password_request(socket, "The nickname '" + username + "' is registered on this server.",
username, version, MP_PASSWORD_REQUEST);
} else {
send_password_request(socket,
"The nickname '" + username + "' is registered on this server."
"\n\nWARNING: There is already a client using this username, "
"logging in will cause that client to be kicked!",
username, MP_PASSWORD_REQUEST_FOR_LOGGED_IN_NAME, true
username, version, MP_PASSWORD_REQUEST_FOR_LOGGED_IN_NAME, true
);
}

Expand All @@ -833,7 +835,7 @@ bool server::authenticate(
// A password (or hashed password) was provided, however
// there is no seed
if(seeds_[reinterpret_cast<long int>(socket.get())].empty()) {
send_password_request(socket, "Please try again.", username, MP_NO_SEED_ERROR);
send_password_request(socket, "Please try again.", username, version, MP_NO_SEED_ERROR);
return false;
}

Expand Down Expand Up @@ -874,7 +876,7 @@ bool server::authenticate(
"You have made too many failed login attempts.", MP_TOO_MANY_ATTEMPTS_ERROR);
} else {
send_password_request(socket,
"The password you provided for the nickname '" + username + "' was incorrect.", username,
"The password you provided for the nickname '" + username + "' was incorrect.", username,version,
MP_INCORRECT_PASSWORD_ERROR);
}

Expand All @@ -899,6 +901,7 @@ bool server::authenticate(
void server::send_password_request(socket_ptr socket,
const std::string& msg,
const std::string& user,
const std::string& version,
const char* error_code,
bool force_confirmation)
{
Expand All @@ -917,7 +920,7 @@ void server::send_password_request(socket_ptr socket,
"cannot log in due to an error in the hashing algorithm. "
"Logging into your forum account on https://forums.wesnoth.org "
"may fix this problem.");
login(socket);
login(socket, version);
return;
}

Expand All @@ -935,7 +938,7 @@ void server::send_password_request(socket_ptr socket,
e.set_attr("error_code", error_code);
}

async_send_doc(socket, doc, std::bind(&server::login, this, _1));
async_send_doc(socket, doc, std::bind(&server::login, this, _1, version));
}

void server::add_player(socket_ptr socket, const wesnothd::player& player)
Expand Down Expand Up @@ -1065,7 +1068,7 @@ void server::handle_query(socket_ptr socket, simple_wml::node& query)

const std::string& query_help_msg =
"Available commands are: adminmsg <msg>, help, games, metrics,"
" motd, netstats [all], requests, sample, stats, status, wml.";
" motd, netstats [all], requests, sample, stats, status, version, wml.";

// Commands a player may issue.
if(command == "status") {
Expand All @@ -1078,6 +1081,7 @@ void server::handle_query(socket_ptr socket, simple_wml::node& query)
command == "motd" ||
command == "netstats" ||
command == "netstats all" ||
command.compare(0, 7, "version") == 0 ||
command == "requests" ||
command == "sample" ||
command == "stats" ||
Expand Down Expand Up @@ -2280,6 +2284,27 @@ void server::lobbymsg_handler(const std::string& /*issuer_name*/,
*out << "message '" << parameters << "' relayed to players";
}

void server::version_handler(
const std::string& /*issuer_name*/, const std::string& /*query*/, std::string& parameters, std::ostringstream* out)
{
assert(out != nullptr);


for(const auto& player : player_connections_) {
if(parameters == player.info().name()) {
*out << "Player " << parameters << " is using wesnoth " << player.info().version();
return;
}
}
if(parameters.empty()) {
*out << "Server version is " << game_config::version;

}
else {
*out << "Player " << parameters << " not found.";
}
}

void server::status_handler(
const std::string& issuer_name, const std::string& /*query*/, std::string& parameters, std::ostringstream* out)
{
Expand Down
11 changes: 6 additions & 5 deletions src/server/server.hpp
View file
Expand Up @@ -41,12 +41,12 @@ class server : public server_base
void handle_version(socket_ptr socket);
void read_version(socket_ptr socket, std::shared_ptr<simple_wml::document> doc);

void login(socket_ptr socket);
void handle_login(socket_ptr socket, std::shared_ptr<simple_wml::document> doc);
bool is_login_allowed(socket_ptr socket, const simple_wml::node* const login);
bool authenticate(socket_ptr socket, const std::string& username, const std::string& password, bool name_taken, bool& registered);
void login(socket_ptr socket, std::string version);
void handle_login(socket_ptr socket, std::shared_ptr<simple_wml::document> doc, std::string version);
bool is_login_allowed(socket_ptr socket, const simple_wml::node* const login, const std::string& version);
bool authenticate(socket_ptr socket, const std::string& username, const std::string& password, const std::string& version, bool name_taken, bool& registered);
void send_password_request(socket_ptr socket, const std::string& msg,
const std::string& user, const char* error_code = "", bool force_confirmation = false);
const std::string& user, const std::string& version, const char* error_code = "", bool force_confirmation = false);
bool accepting_connections() const { return !graceful_restart; }

void add_player(socket_ptr socket, const wesnothd::player&);
Expand Down Expand Up @@ -204,6 +204,7 @@ class server : public server_base
void netstats_handler(const std::string &, const std::string &, std::string &, std::ostringstream *);
void adminmsg_handler(const std::string &, const std::string &, std::string &, std::ostringstream *);
void pm_handler(const std::string &, const std::string &, std::string &, std::ostringstream *);
void version_handler(const std::string &, const std::string &, std::string &, std::ostringstream *);
void msg_handler(const std::string &, const std::string &, std::string &, std::ostringstream *);
void lobbymsg_handler(const std::string &, const std::string &, std::string &, std::ostringstream *);
void status_handler(const std::string &, const std::string &, std::string &, std::ostringstream *);
Expand Down

0 comments on commit cba86cc

Please sign in to comment.