Remove sample_user_handler.
While I understand the reason it's here, it's been over a decade, no other user handlers have been added, and there's no indication any others will be added. Therefore, it doesn't seem like there's much of a reason to keep this code around.
This commit is contained in:
Pentarctagon
Gunter Labes
parent
2144642d6d
commit
77fc455b0b
4 changed files with 1 additions and 365 deletions
|
|
@ -5,7 +5,6 @@ server/metrics.cpp
|
|||
server/player.cpp
|
||||
server/player_connection.cpp
|
||||
server/player_network.cpp
|
||||
server/sample_user_handler.cpp
|
||||
server/server.cpp
|
||||
server/server_base.cpp
|
||||
server/simple_wml.cpp
|
||||
|
|
|
|||
|
|
@ -1,259 +0,0 @@
|
|||
/*
|
||||
Copyright (C) 2008 - 2018 by Thomas Baumhauer <thomas.baumhauer@NOSPAMgmail.com>
|
||||
Part of the Battle for Wesnoth Project https://www.wesnoth.org/
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY.
|
||||
|
||||
See the COPYING file for more details.
|
||||
*/
|
||||
|
||||
#include "server/sample_user_handler.hpp"
|
||||
|
||||
#include "config.hpp"
|
||||
#include "lexical_cast.hpp"
|
||||
#include "serialization/string_utils.hpp"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
suh::suh(config c)
|
||||
: user_expiration_(0)
|
||||
, users_()
|
||||
{
|
||||
|
||||
if(c["user_expiration"].empty()) {
|
||||
user_expiration_ = 60;
|
||||
} else {
|
||||
user_expiration_ = lexical_cast_default<int>(c["user_expiration"], 60);
|
||||
}
|
||||
}
|
||||
|
||||
void suh::add_user(const std::string& name, const std::string& mail, const std::string& password) {
|
||||
if(user_exists(name)) throw error("This nickname is already registered");
|
||||
|
||||
users_.emplace(name, user());
|
||||
|
||||
set_password(name, password);
|
||||
set_mail(name, mail);
|
||||
|
||||
user_logged_in(name);
|
||||
}
|
||||
|
||||
void suh::remove_user(const std::string& name) {
|
||||
if(!user_exists(name)) throw error("This nickname is not registered");
|
||||
|
||||
users_.erase(name);
|
||||
}
|
||||
|
||||
bool suh::user_exists(const std::string& name) {
|
||||
std::map<std::string,user>::const_iterator u = users_.find(name);
|
||||
|
||||
return (u != users_.end());
|
||||
}
|
||||
|
||||
bool suh::user_is_active(const std::string& /*name*/) {
|
||||
// FIXME: add support for inactive users maybe?
|
||||
return true;
|
||||
}
|
||||
|
||||
std::vector<std::string> suh::users() {
|
||||
std::vector<std::string> users;
|
||||
for(std::map<std::string,user>::const_iterator u = users_.begin(); u != users_.end(); ++u) {
|
||||
users.push_back(u->first);
|
||||
}
|
||||
return users;
|
||||
}
|
||||
|
||||
void suh::set_user_detail(const std::string& user, const std::string& detail, const std::string& value) {
|
||||
if(detail == "mail") {
|
||||
set_mail(user, value);
|
||||
} else if (detail == "password") {
|
||||
set_password(user, value);
|
||||
} else if (detail == "realname") {
|
||||
set_realname(user, value);
|
||||
} else {
|
||||
throw error("Invalid usersdetail '" + detail + "'. Valid details are: " + get_valid_details());
|
||||
}
|
||||
}
|
||||
|
||||
std::string suh::get_valid_details() {
|
||||
return "'mail', 'password', 'realname';";
|
||||
}
|
||||
|
||||
|
||||
bool suh::user_is_moderator(const std::string& name) {
|
||||
if(!user_exists(name)) return false;
|
||||
return users_[name].is_moderator;
|
||||
}
|
||||
|
||||
void suh::set_is_moderator(const std::string& name, const bool& is_moderator) {
|
||||
if(!user_exists(name)) return;
|
||||
users_[name].is_moderator = is_moderator;
|
||||
}
|
||||
|
||||
suh::ban_info suh::user_is_banned(const std::string&, const std::string&) {
|
||||
// FIXME: stub
|
||||
return {};
|
||||
}
|
||||
|
||||
void suh::set_mail(const std::string& user, const std::string& mail) {
|
||||
check_mail(mail);
|
||||
users_[user].mail = mail;
|
||||
}
|
||||
|
||||
void suh::set_password(const std::string& user, const std::string& password) {
|
||||
check_password(password);
|
||||
users_[user].password = password;
|
||||
}
|
||||
|
||||
void suh::set_realname(const std::string& user, const std::string& realname) {
|
||||
check_realname(realname);
|
||||
users_[user].realname = realname;
|
||||
}
|
||||
|
||||
//--
|
||||
// set_lastlogin() is not called by the server via set_user_detail()
|
||||
// and thus must not throw user_handler::error
|
||||
|
||||
void suh::set_lastlogin(const std::string& user, const std::time_t& lastlogin) {
|
||||
users_[user].lastlogin = lastlogin;
|
||||
}
|
||||
|
||||
//---
|
||||
|
||||
std::string suh::get_mail(const std::string& user) {
|
||||
return users_[user].mail;
|
||||
}
|
||||
|
||||
std::string suh::get_password(const std::string& user) {
|
||||
return users_[user].password;
|
||||
}
|
||||
|
||||
std::string suh::get_realname(const std::string& user) {
|
||||
return users_[user].realname;
|
||||
}
|
||||
|
||||
std::time_t suh::get_lastlogin(const std::string& user) {
|
||||
return users_[user].lastlogin;
|
||||
}
|
||||
|
||||
std::time_t suh::get_registrationdate(const std::string& user) {
|
||||
return users_[user].registrationdate;
|
||||
}
|
||||
|
||||
//---
|
||||
|
||||
void suh::check_name(const std::string& name) {
|
||||
if(!utils::isvalid_username(name)) {
|
||||
throw error("This username contains invalid "
|
||||
"characters. Only alpha-numeric characters, underscores and hyphens"
|
||||
"are allowed.");
|
||||
}
|
||||
if(name.size() > 20) {
|
||||
throw error("This username is too long. Usernames must be 20 characters or less.");
|
||||
}
|
||||
}
|
||||
|
||||
void suh::check_mail(const std::string& /*mail*/) {
|
||||
return;
|
||||
}
|
||||
|
||||
void suh::check_password(const std::string& password) {
|
||||
if(!utils::isvalid_username(password)) {
|
||||
throw error("Password contains invalid characters");
|
||||
}
|
||||
}
|
||||
|
||||
void suh::check_realname(const std::string& realname) {
|
||||
if(realname.size() > 50) {
|
||||
throw error("This name is too long. Names must be 50 characters or less");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void suh::clean_up() {
|
||||
// Remove users that have not logged in for user_expiration_ days:
|
||||
// Check if the last login of this user exceeds the
|
||||
// expiration limit
|
||||
|
||||
//The expiration time set to 0 means no expiration limit
|
||||
if(!user_expiration_) {
|
||||
return;
|
||||
}
|
||||
|
||||
std::time_t now = std::time(nullptr);
|
||||
|
||||
//A minute has 60 seconds, an hour 60 minutes and
|
||||
//a day 24 hours.
|
||||
std::time_t limit = user_expiration_ * 60 * 60 * 24;
|
||||
|
||||
std::vector<std::string> us = users();
|
||||
for(std::vector<std::string>::const_iterator u = us.begin(); u != us.end(); ++u) {
|
||||
if((now - get_lastlogin(*u)) > limit) {
|
||||
std::cout << "User '" << *u << "' exceeds expiration limit.\n";
|
||||
remove_user(*u);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool suh::login(const std::string& name, const std::string& password, const std::string&) {
|
||||
return password == get_password(name);
|
||||
}
|
||||
|
||||
void suh::user_logged_in(const std::string& name) {
|
||||
set_lastlogin(name, std::time(nullptr));
|
||||
}
|
||||
|
||||
std::string suh::user_info(const std::string& name) {
|
||||
if(!user_exists(name)) throw error("No user with the name '" + name + "' exists.");
|
||||
|
||||
std::time_t reg_date = get_registrationdate(name);
|
||||
std::time_t ll_date = get_lastlogin(name);
|
||||
|
||||
std::string reg_string = ctime(®_date);
|
||||
std::string ll_string;
|
||||
|
||||
if(ll_date) {
|
||||
ll_string = ctime(&ll_date);
|
||||
} else {
|
||||
ll_string = "Never\n";
|
||||
}
|
||||
|
||||
std::stringstream info;
|
||||
info << "Name: " << name << "\n"
|
||||
<< "Real name: " << get_realname(name) << "\n"
|
||||
<< "Registered: " << reg_string
|
||||
<< "Last login: " << ll_string;
|
||||
if(!user_is_active(name)) {
|
||||
info << "This account is currently inactive.\n";
|
||||
}
|
||||
return info.str();
|
||||
}
|
||||
|
||||
std::string suh::get_uuid(){
|
||||
return "";
|
||||
}
|
||||
|
||||
void suh::db_insert_game_info(const std::string& uuid, int game_id, const std::string& version, const std::string& name){
|
||||
std::cout << uuid << " - " << game_id << " - " << version << " - " << name << std::endl;
|
||||
}
|
||||
void suh::db_update_game_start(const std::string& uuid, int game_id, const std::string& map_name, const std::string& era_name){
|
||||
std::cout << uuid << " - " << game_id << " - " << map_name << " - " << era_name << std::endl;
|
||||
}
|
||||
void suh::db_update_game_end(const std::string& uuid, int game_id, const std::string& replay_location){
|
||||
std::cout << uuid << " - " << game_id << " - " << replay_location << std::endl;
|
||||
}
|
||||
void suh::db_insert_game_player_info(const std::string& uuid, int game_id, const std::string& username, int side_number, const std::string& is_host, const std::string& faction){
|
||||
std::cout << uuid << " - " << game_id << " - " << username << " - " << side_number << " - " << is_host << " - " << faction << std::endl;
|
||||
}
|
||||
void suh::db_insert_modification_info(const std::string& uuid, int game_id, const std::string& modification_name){
|
||||
std::cout << uuid << " - " << game_id << " - " << modification_name << std::endl;
|
||||
}
|
||||
|
||||
void suh::db_set_oos_flag(const std::string& uuid, int game_id){
|
||||
std::cout << uuid << " - " << game_id << " - " << "OOS occurred!" << std::endl;
|
||||
}
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
/*
|
||||
Copyright (C) 2008 - 2018 by Thomas Baumhauer <thomas.baumhauer@NOSPAMgmail.com>
|
||||
Part of the Battle for Wesnoth Project https://www.wesnoth.org/
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY.
|
||||
|
||||
See the COPYING file for more details.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "server/user_handler.hpp"
|
||||
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
/**
|
||||
* An example of how to implement user_handler.
|
||||
* If you use this on anything real, you are insane.
|
||||
*/
|
||||
class suh : public user_handler {
|
||||
public:
|
||||
suh(config c);
|
||||
|
||||
void add_user(const std::string& name, const std::string& mail, const std::string& password);
|
||||
void remove_user(const std::string& name);
|
||||
|
||||
void clean_up();
|
||||
|
||||
bool login(const std::string& name, const std::string& password, const std::string&);
|
||||
void user_logged_in(const std::string& name);
|
||||
|
||||
bool user_exists(const std::string& name);
|
||||
bool user_is_active(const std::string& name);
|
||||
|
||||
bool user_is_moderator(const std::string& name);
|
||||
void set_is_moderator(const std::string& name, const bool& is_moderator);
|
||||
|
||||
ban_info user_is_banned(const std::string& name, const std::string&);
|
||||
|
||||
std::string user_info(const std::string& name);
|
||||
|
||||
struct user {
|
||||
user() :
|
||||
password(),
|
||||
realname(),
|
||||
mail(),
|
||||
lastlogin(std::time(nullptr)),
|
||||
registrationdate(std::time(nullptr)),
|
||||
is_moderator(false) {}
|
||||
std::string password;
|
||||
std::string realname;
|
||||
std::string mail;
|
||||
std::time_t lastlogin;
|
||||
std::time_t registrationdate;
|
||||
bool is_moderator;
|
||||
};
|
||||
|
||||
void set_user_detail(const std::string& user, const std::string& detail, const std::string& value);
|
||||
std::string get_valid_details();
|
||||
|
||||
std::string extract_salt(const std::string&) { return ""; }
|
||||
bool use_phpbb_encryption() const { return false; }
|
||||
|
||||
std::string get_uuid();
|
||||
void db_insert_game_info(const std::string& uuid, int game_id, const std::string& version, const std::string& name);
|
||||
void db_update_game_start(const std::string& uuid, int game_id, const std::string& map_name, const std::string& era_name);
|
||||
void db_update_game_end(const std::string& uuid, int game_id, const std::string& replay_location);
|
||||
void db_insert_game_player_info(const std::string& uuid, int game_id, const std::string& username, int side_number, const std::string& is_host, const std::string& faction);
|
||||
void db_insert_modification_info(const std::string& uuid, int game_id, const std::string& modification_name);
|
||||
void db_set_oos_flag(const std::string& uuid, int game_id);
|
||||
|
||||
private:
|
||||
std::string get_mail(const std::string& user);
|
||||
std::string get_password(const std::string& user);
|
||||
std::string get_realname(const std::string& user) ;
|
||||
std::time_t get_lastlogin(const std::string& user);
|
||||
std::time_t get_registrationdate(const std::string& user);
|
||||
|
||||
void check_name(const std::string& name);
|
||||
void check_mail(const std::string& mail);
|
||||
void check_password(const std::string& password);
|
||||
void check_realname(const std::string& realname);
|
||||
|
||||
void set_mail(const std::string& user, const std::string& mail);
|
||||
void set_password(const std::string& user, const std::string& password);
|
||||
void set_realname(const std::string& user, const std::string& realname);
|
||||
|
||||
void set_lastlogin(const std::string& user, const std::time_t& lastlogin);
|
||||
|
||||
int user_expiration_;
|
||||
|
||||
std::map <std::string,user> users_;
|
||||
std::vector<std::string> users();
|
||||
};
|
||||
|
|
@ -38,7 +38,6 @@
|
|||
#include "server/metrics.hpp"
|
||||
#include "server/player.hpp"
|
||||
#include "server/player_network.hpp"
|
||||
#include "server/sample_user_handler.hpp"
|
||||
#include "server/simple_wml.hpp"
|
||||
#include "server/user_handler.hpp"
|
||||
|
||||
|
|
@ -525,11 +524,8 @@ void server::load_config()
|
|||
user_handler_.reset();
|
||||
|
||||
if(const config& user_handler = cfg_.child("user_handler")) {
|
||||
if(uh_name_ == "sample") {
|
||||
user_handler_.reset(new suh(user_handler));
|
||||
}
|
||||
#ifdef HAVE_MYSQLPP
|
||||
else if(uh_name_ == "forum" || uh_name_.empty()) {
|
||||
if(uh_name_ == "forum" || uh_name_.empty()) {
|
||||
user_handler_.reset(new fuh(user_handler));
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue