Sanitizing the path to which we save server configurations, and also demo files

src/base/system.c

@@ -1610,6 +1610,22 @@ void str_sanitize_cc(char *str_in)
 	}
 }
 
+void str_sanitize_pathname(char* str_in)
+{
+	str_sanitize_pathname_from_character(str_in, 0);
+}
+
+void str_sanitize_pathname_from_character(char* str_in, unsigned int fromCharN)
+{
+	unsigned char *str = ((unsigned char *) str_in) + fromCharN;
+	while(*str)
+	{
+		if (*str == '\\' || *str == '/' || *str == '~')
+			*str = '-';
+		str++;
+	}
+}
+
 /* makes sure that the string only contains the characters between 32 and 255 + \r\n\t */
 void str_sanitize(char *str_in)
 {

src/base/system.h

@@ -813,6 +813,25 @@ void str_sanitize_cc(char *str);
 */
 void str_sanitize(char *str);
 
+/*
+	Function: str_sanitize_pathname_from_character
+		Replaces all characters '/' '\' and '~' which can lead path
+		hijacking, with '-', starting from character at position str_in fromCharN
+
+	Parameters:
+		str - String to sanitize.
+		fromCharN - Positive integer of the first character to check (form 0)
+
+	Remarks:
+		- The strings are treated as zero-terminated strings.
+*/
+void str_sanitize_pathname_from_character(char* str_in, unsigned int fromCharN);
+
+/*
+	Same as the function above but starting from first character
+*/
+void str_sanitize_pathname(char* str_in);
+
 /*
 	Function: str_clean_whitespaces
 		Removes leading and trailing spaces and limits the use of multiple spaces.

src/engine/server/server.cpp

@@ -1487,6 +1487,7 @@ void CServer::ConRecord(IConsole::IResult *pResult, void *pUser)
 		str_timestamp(aDate, sizeof(aDate));
 		str_format(aFilename, sizeof(aFilename), "demos/demo_%s.demo", aDate);
 	}
+	str_sanitize_pathname_from_character(aFilename, 6);
 	pServer->m_DemoRecorder.Start(pServer->Storage(), pServer->Console(), aFilename, pServer->GameServer()->NetVersion(), pServer->m_aCurrentMap, pServer->m_CurrentMapCrc, "server");
 }
 
@@ -1507,14 +1508,15 @@ void CServer::ConSaveConfig(IConsole::IResult *pResult, void *pUser)
 	
 	char aFilename[128];
 	if(pResult->NumArguments())
-		str_format(aFilename, sizeof(aFilename), "%s.cfg", pResult->GetString(0));
+		str_format(aFilename, sizeof(aFilename), "serverconf/%s.cfg", (pResult->GetString(0)));
 	else
 	{
 		char aDate[20];
 		str_timestamp(aDate, sizeof(aDate));
-		str_format(aFilename, sizeof(aFilename), "server_config_%s.cfg", aDate);
+		str_format(aFilename, sizeof(aFilename), "serverconf/server_config_%s.cfg", aDate);
 	}
 	
+	str_sanitize_pathname_from_character(aFilename, 11);
 	char aBuf[256];
 	if (currentConfig->SaveServerConfigs(aFilename) == 0)
 	{
@@ -1622,7 +1624,7 @@ void CServer::RegisterCommands()
 
 	Console()->Register("reload", "", CFGFLAG_SERVER, ConMapReload, this, "Reload the map");
 
-	Console()->Register("save_conf", "?s", CFGFLAG_SERVER, ConSaveConfig, this, "Save current configuration to file");
+	Console()->Register("saveserverconf", "?s", CFGFLAG_SERVER, ConSaveConfig, this, "Save current configuration to file");
 
 	Console()->Chain("sv_name", ConchainSpecialInfoupdate, this);
 	Console()->Chain("password", ConchainSpecialInfoupdate, this);

src/engine/shared/storage.cpp

@@ -68,6 +68,7 @@ public:
 				fs_makedir(GetPath(TYPE_SAVE, "dumps", aPath, sizeof(aPath)));
 				fs_makedir(GetPath(TYPE_SAVE, "demos", aPath, sizeof(aPath)));
 				fs_makedir(GetPath(TYPE_SAVE, "demos/auto", aPath, sizeof(aPath)));
+				fs_makedir(GetPath(TYPE_SAVE, "serverconf", aPath, sizeof(aPath)));
 			}
 			else
 			{