feat: cvars spray_exploit_fixer_punish_client and spray_exploit_fixer_bantime (#6)

Author: Rushaway

addons/sourcemod/scripting/FixSprayExploit.sp

@@ -18,7 +18,7 @@
 
 
 
-#define PLUGIN_VERSION 		"2.22"
+#define PLUGIN_VERSION 		"2.23"
 
 /*=======================================================================================
 	Plugin Info:
@@ -31,8 +31,11 @@
 
 ========================================================================================
 	Change Log:
+2.23 (01-Apr-2023)
+	- Now only TestClient depending cvar
+	- Now ban lenght can be adjusted via cvar
 
-2.22 (15-Feb-2023)
+2.22 (19-Feb-2023)
 	- Now prevents even more log spamming duplicate entries. Thanks to ".Rushaway" for reporting.
 
 2.21 (22-Jan-2023)
@@ -181,7 +184,7 @@ char g_sDownloads[PLATFORM_MAX_PATH];
 char g_sPath1[MAXPLAYERS+1][PLATFORM_MAX_PATH];
 char g_sPath2[MAXPLAYERS+1][PLATFORM_MAX_PATH];
 float g_fSprayed[MAXPLAYERS+1];
-ConVar g_hCvarBan, g_hCvarKick, g_hCvarLog, g_hCvarMsg, g_hCvarPath;
+ConVar g_hCvarBan, g_hCvarBanTime, g_hCvarKick, g_hCvarLog, g_hCvarMsg, g_hCvarPath, g_hCvarPunish;
 EngineVersion g_iEngine;
 StringMap g_smChecked;
 StringMap g_smReceive;
@@ -259,11 +262,13 @@ public void OnPluginStart()
 		}
 	}
 
-	CreateConVar(					"spray_exploit_fixer",			PLUGIN_VERSION,		"Spray Exploit Fixer plugin version.", FCVAR_DONTRECORD);
+	CreateConVar(						"spray_exploit_fixer",			PLUGIN_VERSION,		"Spray Exploit Fixer plugin version.", FCVAR_DONTRECORD);
+	g_hCvarPunish 	= CreateConVar(		"spray_exploit_fixer_punish_client",	"0",		"0=Off. 1=PlayerDecal. 2=FileCheck. 3=Both. Run the TestClient function");
 	if( g_iEngine != Engine_TF2 )
 	{
-		g_hCvarBan = CreateConVar(	"spray_exploit_fixer_ban",		"0",				"0=Off. 1=Ban users who trigger invalid sprays (may still be some false positives).");
-		g_hCvarKick = CreateConVar(	"spray_exploit_fixer_kick",		"0",				"0=Off. 1=Kick users who trigger invalid sprays (may still be some false positives).");
+		g_hCvarBan 		= CreateConVar(	"spray_exploit_fixer_ban",		"0",				"0=Off. 1=Ban users who trigger invalid sprays (may still be some false positives).");
+		g_hCvarKick 	= CreateConVar(	"spray_exploit_fixer_kick",		"0",				"0=Off. 1=Kick users who trigger invalid sprays (may still be some false positives).");
+		g_hCvarBanTime 	= CreateConVar( "spray_exploit_fixer_bantime",  "5", 				"0=Perm. Ban time (in minutes)");
 	}
 	g_hCvarLog = CreateConVar(		"spray_exploit_fixer_log",		"1",				"Logging saved to sourcemod/logs/spray_downloads.log: 0=Off. 1=Log all user uploads. 2=Log invalid sprays only.");
 	g_hCvarMsg = CreateConVar(		"spray_exploit_fixer_msg",		"1",				"Print to server console: 0=Off. 1=Missing sprays and invalid sprays. 2=Only invalid sprays.");
@@ -733,9 +738,9 @@ Action PlayerDecal(const char[] te_name, const int[] Players, int numClients, fl
 
 	if( !val )
 	{
-		static char auth[32];
+		static char auth[64];
 		GetClientAuthId(client, AuthId_Steam2, auth, sizeof(auth));
-		if( strncmp(auth[6], "ID_", 3) == 0 )
+		if ( auth[6] == 'I' )
 		{
 			GetClientAuthId(client, AuthId_Steam2, auth, sizeof(auth), false);
 			Format(auth, sizeof(auth), "Unverified: %s", auth);
@@ -750,7 +755,8 @@ Action PlayerDecal(const char[] te_name, const int[] Players, int numClients, fl
 				if( g_hCvarMsg.IntValue ) PrintToServer("[Spray Exploit] Blocked invalid spray: %s from (%N) [%s]", g_sFilename, client, auth);
 			}
 
-			TestClient(client);
+			if( g_hCvarPunish.IntValue == 1 || g_hCvarPunish.IntValue >= 3)
+				TestClient(client);
 		}
 		else
 		{
@@ -841,26 +847,23 @@ void TestClient(int client)
 	{
 		if( g_hCvarBan.IntValue )
 		{
+			int iDuration = g_hCvarBanTime.IntValue;
+
 			if( g_bSourceBans )
-			{
-				SBPP_BanPlayer(0, client, 0, "Invalid spray");
-				LogAction(client, -1, "[Spray Exploit] %L Banned for invalid Spray", client);
-			}
+				SBPP_BanPlayer(0, client, iDuration, "Invalid spray");
 			else if( g_bMaterialAdmin )
-			{
-				MABanPlayer(0, client, MA_BAN_STEAM, 0, "Invalid spray");
-				LogAction(client, -1, "[Spray Exploit] %L Banned for invalid Spray", client);
-			}
+				MABanPlayer(0, client, MA_BAN_STEAM, iDuration, "Invalid spray");
 			else
-			{
-				BanClient(client, 0, BANFLAG_AUTO, "Invalid spray");
-				LogAction(client, -1, "[Spray Exploit] %L Banned for invalid Spray", client);
-			}
+				BanClient(client, iDuration, BANFLAG_AUTO, "Invalid spray");
+
+			LogAction(client, -1, "[Spray Exploit] %L Banned %d minutes for invalid Spray", client, iDuration);
+			return;
 		}
 		else if( g_hCvarKick.IntValue )
 		{
-			KickClient(client, "Invalid spray");
-			LogAction(client, -1, "[Spray Exploit] %L kicked for invalid Spray", client);
+			KickClient(client, "Invalid spray. Please change it");
+			LogAction(client, -1, "[Spray Exploit] %L was kicked for invalid Spray.", client);
+			return;
 		}
 	}
 }
@@ -903,9 +906,9 @@ public Action OnFileReceive(int client, const char[] sFile)
 	{
 		if( client )
 		{
-			static char auth[32];
+			static char auth[64];
 			GetClientAuthId(client, AuthId_Steam2, auth, sizeof(auth));
-			if( strncmp(auth[6], "ID_", 3) == 0 )
+			if ( auth[6] == 'I' )
 			{
 				GetClientAuthId(client, AuthId_Steam2, auth, sizeof(auth), false);
 				Format(auth, sizeof(auth), "Unverified: %s", auth);
@@ -969,9 +972,9 @@ void FileCheck()
 					if( !client ) client = GetClientFromJingle();
 					if( client )
 					{
-						static char auth[32];
+						static char auth[64];
 						GetClientAuthId(client, AuthId_Steam2, auth, sizeof(auth));
-						if( strncmp(auth[6], "ID_", 3) == 0 )
+						if ( auth[6] == 'I' )
 						{
 							GetClientAuthId(client, AuthId_Steam2, auth, sizeof(auth), false);
 							Format(auth, sizeof(auth), "Unverified: %s", auth);
@@ -984,7 +987,8 @@ void FileCheck()
 						if( g_hCvarMsg.IntValue ) PrintToServer("[Spray Exploit] Invalid spray: %s: %02d (%02X <> %02X)", g_sFilename, i, iRead[i], g_iVal[i]);
 					}
 
-					TestClient(client);
+					if( g_hCvarPunish.IntValue >= 2 )
+						TestClient(client);
 
 					g_smChecked.SetValue(g_sFilename, false);
 					return;