Merge remote-tracking branch 'heinrich5991/banmaster' into banmaster_v2

Conflicts:
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/config_variables.h
	src/engine/shared/network.h
	src/engine/shared/network_server.cpp

5 files changed, 172 insertions, 1 deletions

diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index a231d1e8..2cb33f36 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -27,6 +27,8 @@
 
 #include <mastersrv/mastersrv.h>
 
+#include <banmaster/banmaster.h>
+
 #include "register.h"
 #include "server.h"
 
@@ -36,6 +38,8 @@
 	#include <windows.h>
 #endif
 
+static const char SERVER_BANMASTERFILE[] = "banmasters.cfg";
+
 static const char *StrUTF8Ltrim(const char *pStr)
 {
 	while(*pStr)
@@ -1178,6 +1182,38 @@ void CServer::PumpNetwork()
 				{
 					SendServerInfo(&Packet.m_Address, ((unsigned char *)Packet.m_pData)[sizeof(SERVERBROWSE_GETINFO)]);
 				}
+
+				/*if(Packet.m_DataSize >= sizeof(BANMASTER_IPOK) &&
+				  mem_comp(Packet.m_pData, BANMASTER_IPOK, sizeof(BANMASTER_IPOK)) == 0 &&
+				  m_NetServer.BanmasterCheck(&Packet.m_Address) != -1)
+				{
+				}*/
+
+				if(Packet.m_DataSize >= sizeof(BANMASTER_IPBAN) &&
+				  mem_comp(Packet.m_pData, BANMASTER_IPBAN, sizeof(BANMASTER_IPBAN)) == 0)
+				{
+					if(!g_Config.m_SvGlobalBantime)
+						return;
+
+					if(m_NetServer.BanmasterCheck(&Packet.m_Address) == -1)
+						return;
+
+					CUnpacker Up;
+					char aIp[NETADDR_MAXSTRSIZE];
+					char aReason[256];
+					NETADDR Addr;
+					Up.Reset((unsigned char*)Packet.m_pData + sizeof(BANMASTER_IPBAN), Packet.m_DataSize - sizeof(BANMASTER_IPBAN));
+					str_copy(aIp, Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES), sizeof(aIp));
+					str_copy(aReason, Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES), sizeof(aReason));
+					if(net_addr_from_str(&Addr, aIp))
+					{
+						dbg_msg("globalbans", "dropped weird message from banmaster");
+						return;
+					}
+
+					m_ServerBan.BanAddr(&Addr, g_Config.m_SvGlobalBantime * 60, aReason);
+					dbg_msg("globalbans", "added ban, ip=%s, reason='%s'", aIp, aReason);
+				}
 			}
 		}
 		else
@@ -1294,6 +1330,8 @@ int CServer::Run()
 	m_ServerBan.Init(Console(), Storage(), this);
 	m_Econ.Init(Console(), &m_ServerBan);
 
+	Console()->ExecuteFile(SERVER_BANMASTERFILE);
+		
 	char aBuf[256];
 	str_format(aBuf, sizeof(aBuf), "server name is '%s'", g_Config.m_SvName);
 	Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
@@ -1531,6 +1569,46 @@ void CServer::ConMapReload(IConsole::IResult *pResult, void *pUser)
 	((CServer *)pUser)->m_MapReload = 1;
 }
 
+
+void CServer::ConAddBanmaster(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pServer = (CServer *)pUser;
+	
+	int Result = pServer->m_NetServer.BanmasterAdd(pResult->GetString(0));
+	
+	if(Result == 0)
+		pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", "succesfully added banmaster");
+	else if (Result == 1)
+		pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", "invalid address for banmaster / net lookup failed");
+	else
+		pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", "too many banmasters");
+}
+
+void CServer::ConBanmasters(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pServer = (CServer *)pUser;
+	int NumBanmasters = pServer->m_NetServer.BanmasterNum();
+	
+	char aBuf[128];
+	char aIpString[64];
+	
+	for(int i = 0; i < NumBanmasters; i++)
+	{
+		NETADDR *pBanmaster = pServer->m_NetServer.BanmasterGet(i);
+		net_addr_str(pBanmaster, aIpString, sizeof(aIpString), 0);
+		str_format(aBuf, sizeof(aBuf), "%d: %s", i, aIpString);
+		pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", aBuf);
+	}
+}
+
+void CServer::ConClearBanmasters(IConsole::IResult *pResult, void *pUser)
+{
+	CServer *pServer = (CServer *)pUser;
+	
+	pServer->m_NetServer.BanmastersClear();
+	pServer->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server/banmaster", "cleared banmaster list");
+}
+
 void CServer::ConLogout(IConsole::IResult *pResult, void *pUser)
 {
 	CServer *pServer = (CServer *)pUser;
@@ -1617,7 +1695,11 @@ void CServer::RegisterCommands()
 	Console()->Register("record", "?s", CFGFLAG_SERVER|CFGFLAG_STORE, ConRecord, this, "Record to a file");
 	Console()->Register("stoprecord", "", CFGFLAG_SERVER, ConStopRecord, this, "Stop recording");
 
-	Console()->Register("reload", "", CFGFLAG_SERVER, ConMapReload, this, "Reload the map");
+	Console()->Register("add_banmaster", "s", CFGFLAG_SERVER, ConAddBanmaster, this, "");
+	Console()->Register("banmasters", "", CFGFLAG_SERVER, ConBanmasters, this, "");
+	Console()->Register("clear_banmasters",	"", CFGFLAG_SERVER, ConClearBanmasters, this, "");
+
+	Console()->Register("reload", "", CFGFLAG_SERVER, ConMapReload, this, "");
 
 	Console()->Chain("sv_name", ConchainSpecialInfoupdate, this);
 	Console()->Chain("password", ConchainSpecialInfoupdate, this);
diff --git a/src/engine/server/server.h b/src/engine/server/server.h
index 696b472d..731ab1b9 100644
--- a/src/engine/server/server.h
+++ b/src/engine/server/server.h
@@ -230,6 +230,10 @@ public:
 	static void ConchainModCommandUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainConsoleOutputLevelUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 
+	static void ConAddBanmaster(IConsole::IResult *pResult, void *pUser);
+	static void ConBanmasters(IConsole::IResult *pResult, void *pUser);
+	static void ConClearBanmasters(IConsole::IResult *pResult, void *pUser);
+
 	void RegisterCommands();
 
 
diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h
index ac913162..76e4ccd3 100644
--- a/src/engine/shared/config_variables.h
+++ b/src/engine/shared/config_variables.h
@@ -100,6 +100,8 @@ MACRO_CONFIG_INT(EcBantime, ec_bantime, 0, 0, 1440, CFGFLAG_ECON, "The time a cl
 MACRO_CONFIG_INT(EcAuthTimeout, ec_auth_timeout, 30, 1, 120, CFGFLAG_ECON, "Time in seconds before the the econ authentification times out")
 MACRO_CONFIG_INT(EcOutputLevel, ec_output_level, 1, 0, 2, CFGFLAG_ECON, "Adjusts the amount of information in the external console")
 
+MACRO_CONFIG_INT(SvGlobalBantime, sv_global_bantime, 60, 0, 1440, CFGFLAG_SERVER, "The time a client gets banned if the ban server reports it. 0 to disable")
+
 MACRO_CONFIG_INT(Debug, debug, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SERVER, "Debug mode")
 MACRO_CONFIG_INT(DbgStress, dbg_stress, 0, 0, 0, CFGFLAG_CLIENT|CFGFLAG_SERVER, "Stress systems")
 MACRO_CONFIG_INT(DbgStressNetwork, dbg_stress_network, 0, 0, 0, CFGFLAG_CLIENT|CFGFLAG_SERVER, "Stress network")
diff --git a/src/engine/shared/network.h b/src/engine/shared/network.h
index dd43389e..385f21f2 100644
--- a/src/engine/shared/network.h
+++ b/src/engine/shared/network.h
@@ -242,6 +242,20 @@ public:
 // server side
 class CNetServer
 {
+public:
+	enum
+	{
+		MAX_BANMASTERS=16
+	};
+
+	struct CBanInfo
+	{
+		NETADDR m_Addr;
+		int m_Expires;
+		char m_Reason[128];
+	};
+
+private:
 	struct CSlot
 	{
 	public:
@@ -254,6 +268,9 @@ class CNetServer
 	int m_MaxClients;
 	int m_MaxClientsPerIP;
 
+	NETADDR m_aBanmasters[MAX_BANMASTERS];
+	int m_NumBanmasters;
+
 	NETFUNC_NEWCLIENT m_pfnNewClient;
 	NETFUNC_DELCLIENT m_pfnDelClient;
 	void *m_UserPtr;
@@ -284,6 +301,11 @@ public:
 
 	//
 	void SetMaxClientsPerIP(int Max);
+	int BanmasterAdd(const char *pAddrStr);
+	int BanmasterNum() const;
+	NETADDR* BanmasterGet(int Index);
+	int BanmasterCheck(NETADDR *pAddr);
+	void BanmastersClear();
 };
 
 class CNetConsole
diff --git a/src/engine/shared/network_server.cpp b/src/engine/shared/network_server.cpp
index 1264a4a5..32525802 100644
--- a/src/engine/shared/network_server.cpp
+++ b/src/engine/shared/network_server.cpp
@@ -1,6 +1,7 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <base/system.h>
+#include <banmaster/banmaster.h>
 
 #include <engine/console.h>
 
@@ -140,6 +141,22 @@ int CNetServer::Recv(CNetChunk *pChunk)
 					// client that wants to connect
 					if(!Found)
 					{
+						CNetChunk Packet;
+						char aBuffer[sizeof(BANMASTER_IPCHECK) + NETADDR_MAXSTRSIZE];
+						mem_copy(aBuffer, BANMASTER_IPCHECK, sizeof(BANMASTER_IPCHECK));
+						net_addr_str(&Addr, aBuffer + sizeof(BANMASTER_IPCHECK), sizeof(aBuffer) - sizeof(BANMASTER_IPCHECK), 0);
+
+						Packet.m_ClientID = -1;
+						Packet.m_Flags = NETSENDFLAG_CONNLESS;
+						Packet.m_DataSize = str_length(aBuffer) + 1;
+						Packet.m_pData = aBuffer;
+
+						for(int i = 0; i < m_NumBanmasters; i++)
+						{
+							Packet.m_Address = m_aBanmasters[i];
+							Send(&Packet);
+						}
+
 						// only allow a specific number of players with the same ip
 						NETADDR ThisAddr = Addr, OtherAddr;
 						int FoundAddr = 1;
@@ -171,6 +188,7 @@ int CNetServer::Recv(CNetChunk *pChunk)
 								m_aSlots[i].m_Connection.Feed(&m_RecvUnpacker.m_Data, &Addr);
 								if(m_pfnNewClient)
 									m_pfnNewClient(i, m_UserPtr);
+								
 								break;
 							}
 						}
@@ -248,3 +266,46 @@ void CNetServer::SetMaxClientsPerIP(int Max)
 
 	m_MaxClientsPerIP = Max;
 }
+
+int CNetServer::BanmasterAdd(const char *pAddrStr)
+{
+	if(m_NumBanmasters >= MAX_BANMASTERS)
+		return 2;
+	
+	if(net_host_lookup(pAddrStr, &m_aBanmasters[m_NumBanmasters], NETTYPE_IPV4))
+		return 1;
+	
+	if(m_aBanmasters[m_NumBanmasters].port == 0)
+		m_aBanmasters[m_NumBanmasters].port = BANMASTER_PORT;
+	
+	m_NumBanmasters++;
+	return 0;
+}
+
+int CNetServer::BanmasterNum() const
+{
+	return m_NumBanmasters;
+}
+
+NETADDR* CNetServer::BanmasterGet(int Index)
+{
+	if(Index < 0 || Index >= m_NumBanmasters)
+		return 0;
+	
+	return &m_aBanmasters[Index];
+}
+
+int CNetServer::BanmasterCheck(NETADDR *pAddr)
+{
+	for(int i = 0; i < m_NumBanmasters; i++)
+		if(net_addr_comp(&m_aBanmasters[i], pAddr) == 0)
+			return i;
+
+	return -1;
+}
+
+void CNetServer::BanmastersClear()
+{
+	m_NumBanmasters = 0;
+}
+