upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-01 05:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

allowed filtering the ban lists by ipmasks

Browse Source
This commit is contained in:
Gunter Labes 2009-08-09 22:03:56 +00:00
parent 09fc2580f8
commit 234fda3db0
3 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/server/ban.cpp
View File

@ -154,9 +154,11 @@ static lg::log_domain log_server("server");
ret.first = 0;
ret.second = 0;
std::vector<std::string> split_ip = utils::split(ip, '.');
if (split_ip.size() > 4) throw banned::error("Malformed ip address: " + ip);
unsigned int shift = 4*8; // start shifting from the highest byte
unsigned int mask = 0xFF000000;
const unsigned int complite_part_mask = 0xFF;
const unsigned int complete_part_mask = 0xFF;
std::vector<std::string>::const_iterator part = split_ip.begin();
bool wildcard = false;
do {
@ -165,7 +167,7 @@ static lg::log_domain log_server("server");
if (part == split_ip.end())
{
if (!wildcard)
throw banned::error("Malformed ip address given for ban: " + ip);
throw banned::error("Malformed ip address: '" + ip + "'");
// Adding 0 to ip and mask is nop
// we can then break out of loop
break;
@ -175,12 +177,12 @@ static lg::log_domain log_server("server");
wildcard = true;
// Adding 0 to ip and mask is nop
} else {
wildcard = false;
unsigned int part_ip = lexical_cast_default<unsigned int>(*part, complite_part_mask + 1);
if (part_ip > complite_part_mask)
throw banned::error("Malformed ip address given for ban: " + ip);
//wildcard = false;
unsigned int part_ip = lexical_cast_default<unsigned int>(*part, complete_part_mask + 1);
if (part_ip > complete_part_mask)
throw banned::error("Malformed ip address: '" + ip + "'");
ret.first |= (part_ip << shift);
ret.second |= (complite_part_mask << shift);
ret.second |= (complete_part_mask << shift);
}
}
++part;
@ -279,6 +281,11 @@ static lg::log_domain log_server("server");
return (ip_ & mask_) == (pair.first & mask_);
}
// Unlike match_ip this function takes the mask of the argument to do the matching.
bool banned::match_ipmask(const ip_mask& pair) const {
return (ip_ & pair.second) == (pair.first & pair.second);
}
void ban_manager::read()
{
if (filename_.empty() || !file_exists(filename_))
@ -572,7 +579,7 @@ static lg::log_domain log_server("server");
write();
}
void ban_manager::list_deleted_bans(std::ostringstream& out) const
void ban_manager::list_deleted_bans(std::ostringstream& out, const std::string& mask) const
{
if (deleted_bans_.empty())
{
@ -580,27 +587,43 @@ static lg::log_domain log_server("server");
return;
}
ip_mask pair;
try {
pair = parse_ip(mask);
} catch (banned::error& e) {
out << "parse error: " << e.message;
return;
}
out << "DELETED BANS LIST";
for (deleted_ban_list::const_iterator i = deleted_bans_.begin();
i != deleted_bans_.end();
++i)
{
if (i != deleted_bans_.begin())
out << "\n";
out << (**i);
if ((*i)->match_ipmask(pair)) out << "\n" << (**i);
}
}
void ban_manager::list_bans(std::ostringstream& out) const
void ban_manager::list_bans(std::ostringstream& out, const std::string& mask) const
{
if (bans_.empty())
{
out << "No bans set.";
return;
}
out << "BAN LIST\n";
ip_mask pair;
try {
pair = parse_ip(mask);
} catch (banned::error& e) {
out << "parse error: " << e.message;
return;
}
out << "BAN LIST";
std::set<std::string> groups;
for (ban_set::const_iterator i = bans_.begin();
@ -608,9 +631,7 @@ static lg::log_domain log_server("server");
{
if ((*i)->get_group().empty())
{
if (i != bans_.begin())
out << "\n";
out << (**i);
if ((*i)->match_ipmask(pair)) out << "\n" << (**i);
} else {
groups.insert((*i)->get_group());
}

5
src/server/ban.hpp
View File

@ -110,6 +110,7 @@ namespace wesnothd {
{ return group_ == group; }
bool match_ip(const ip_mask& ip) const;
bool match_ipmask(const ip_mask& ip) const;
unsigned int get_mask_ip(unsigned int) const;
unsigned int get_int_ip() const
@ -166,8 +167,8 @@ namespace wesnothd {
void check_ban_times(time_t time_now);
void list_deleted_bans(std::ostringstream& out) const;
void list_bans(std::ostringstream& out) const;
void list_deleted_bans(std::ostringstream& out, const std::string& mask = "*") const;
void list_bans(std::ostringstream& out, const std::string& mask = "*") const;
std::string is_ip_banned(const std::string& ip) const;

11
src/server/server.cpp
View File

@ -1420,10 +1420,15 @@ std::string server::process_command(std::string query, std::string issuer_name)
}
if (!found_something) return "No clones found.";
} else if (command == "bans") {
if (utils::lowercase(parameters) == "deleted") {
ban_manager_.list_deleted_bans(out);
} else {
if (parameters.empty()) {
ban_manager_.list_bans(out);
} else if (utils::lowercase(parameters) == "deleted") {
ban_manager_.list_deleted_bans(out);
} else if (utils::lowercase(parameters).find("deleted") == 0) {
std::string mask = parameters.substr(7);
ban_manager_.list_deleted_bans(out, utils::strip(mask));
} else {
ban_manager_.list_bans(out, utils::strip(parameters));
}
} else if (command == "ban" || command == "kban" || command == "kickban" || command == "gban") {
bool banned = false;