Merge pull request #11 from IW4x/feature/add-guid-validation

Generate new key if player guid has been shared.

src/Components/Modules/Auth.cpp

@@ -8,6 +8,10 @@ namespace Components
 	Utils::Cryptography::Token Auth::ComputeToken;
 	Utils::Cryptography::ECC::Key Auth::GuidKey;
 
+	std::vector<std::uint64_t> Auth::BannedUids = {
+		0xf4d2c30b712ac6e3
+	};
+	
 	void Auth::Frame()
 	{
 		if (Auth::TokenContainer.generating)
@@ -53,7 +57,7 @@ namespace Components
 			Auth::TokenContainer.cancel = false;
 		}
 	}
-
+	
 	void Auth::SendConnectDataStub(Game::netsrc_t sock, Game::netadr_t adr, const char *format, int len)
 	{
 		// Ensure our certificate is loaded
@@ -64,6 +68,13 @@ namespace Components
 			return;
 		}
 
+		if (std::find(Auth::BannedUids.begin(), Auth::BannedUids.end(), Steam::SteamUser()->GetSteamID().bits) != Auth::BannedUids.end())
+		{
+			Auth::GenerateKey();
+			Logger::SoftError("Your online profile is invalid. A new key has been generated.");
+			return;
+		}
+		
 		std::string connectString(format, len);
 		Game::SV_Cmd_TokenizeString(connectString.data());
 
@@ -187,6 +198,12 @@ namespace Components
 				return;
 			}
 
+			if (std::find(Auth::BannedUids.begin(), Auth::BannedUids.end(), xuid) != Auth::BannedUids.end())
+			{
+				Network::Send(address, "error\nYour online profile is invalid. Delete your players folder and restart ^2IW4x^7.");
+				return;
+			}
+
 			if (xuid != Auth::GetKeyHash(connectData.publickey()))
 			{
 				Network::Send(address, "error\nXUID doesn't match the certificate!");
@@ -268,6 +285,14 @@ namespace Components
 		}
 	}
 
+	void Auth::GenerateKey()
+	{
+		Auth::GuidToken.clear();
+		Auth::ComputeToken.clear();
+		Auth::GuidKey = Utils::Cryptography::ECC::GenerateKey(512);
+		Auth::StoreKey();
+	}
+
 	void Auth::LoadKey(bool force)
 	{
 		if (Dedicated::IsEnabled() || ZoneBuilder::IsEnabled()) return;
@@ -287,10 +312,7 @@ namespace Components
 
 		if (!Auth::GuidKey.isValid())
 		{
-			Auth::GuidToken.clear();
-			Auth::ComputeToken.clear();
-			Auth::GuidKey = Utils::Cryptography::ECC::GenerateKey(512);
-			Auth::StoreKey();
+			Auth::GenerateKey();
 		}
 	}
 

src/Components/Modules/Auth.hpp

@@ -13,6 +13,8 @@ namespace Components
 
 		static void StoreKey();
 		static void LoadKey(bool force = false);
+		static void GenerateKey();
+		
 		static unsigned __int64 GetKeyHash();
 		static unsigned __int64 GetKeyHash(const std::string& key);
 
@@ -41,7 +43,8 @@ namespace Components
 		static Utils::Cryptography::Token GuidToken;
 		static Utils::Cryptography::Token ComputeToken;
 		static Utils::Cryptography::ECC::Key GuidKey;
-
+		static std::vector<std::uint64_t> BannedUids;
+		
 		static void SendConnectDataStub(Game::netsrc_t sock, Game::netadr_t adr, const char *format, int len);
 		static void ParseConnectData(Game::msg_t* msg, Game::netadr_t* addr);
 		static void DirectConnectStub();

src/Components/Modules/QuickPatch.cpp

@@ -128,7 +128,7 @@ namespace Components
 		{
 			if (!dest[i]) break;
 
-			if (dest[i] > 125 || dest[i] < 32) 
+			if (dest[i] > 125 || dest[i] < 32 || dest[i] == '%') 
 			{
 				return false;
 			}