Add simple accelerator integration

Author: Poggicek

extension.cpp

@@ -4,20 +4,26 @@
 #include "client/linux/handler/exception_handler.h"
 #include "common/linux/linux_libc_support.h"
 #include "third_party/lss/linux_syscall_support.h"
+#include "common/linux/http_upload.h"
 
 #include <dirent.h>
 #include <unistd.h>
 #else
 #include "client/windows/handler/exception_handler.h"
+#include "common/windows/http_upload.h"
 #endif
 
+#include "vendor/nlohmann/json.hpp"
+
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <limits>
 #include <filesystem>
 #include <codecvt>
+#include <thread>
+#include <fstream>
 
 #include "common/path_helper.h"
 #include "common/using_std_string.h"
@@ -42,6 +48,8 @@ char crashMap[256];
 char crashGamePath[512];
 char crashCommandLine[1024];
 char dumpStoragePath[512];
+std::string g_serverId;
+std::string g_UserId;
 
 CGameEntitySystem *GameEntitySystem()
 {
@@ -283,6 +291,137 @@ static bool dumpCallback(const wchar_t* dump_path,
 }
 #endif
 
+#ifdef _LINUX
+void UploadThread()
+{
+	for (const auto& entry : std::filesystem::directory_iterator(dumpStoragePath)) {
+		if (entry.path().extension() == ".dmp") {
+			std::filesystem::path uploadedPath = entry.path();
+
+			// is dump already uploaded
+			if (entry.path().stem().string().find("_uploaded") != std::string::npos) {
+				continue;
+			}
+
+			ConMsg("Uploading minidump %s\n", entry.path().string().c_str());
+
+			std::map<std::string, std::string> params;
+
+			params["UserID"] = g_UserId.c_str();
+			params["GameDirectory"] = "csgo";
+			params["ExtensionVersion"] = std::string(g_AcceleratorCS2.GetVersion()) + " [AcceleratorCS2 Build]";
+			params["ServerID"] = g_serverId.c_str();
+			params["PresubmitToken"] = "";
+
+			std::filesystem::path metadataPath = entry.path();
+			metadataPath.replace_extension(".dmp.txt");
+
+			std::map<std::string, std::string> files;
+			files["upload_file_minidump"] = entry.path().string();
+			files["upload_file_metadata"] = metadataPath.string();
+
+			std::string res;
+			google_breakpad::HTTPUpload::SendRequest("http://crash.limetech.org/submit", params, files, "", "", "", &res, nullptr, nullptr);
+
+			ConMsg("Upload response: %s\n", res.c_str());
+
+			uploadedPath.replace_filename(uploadedPath.stem().string() + "_uploaded" + uploadedPath.extension().string());
+			std::filesystem::rename(entry.path(), uploadedPath);
+		}
+	}
+};
+#else
+void UploadThread()
+{
+	for (const auto& entry : std::filesystem::directory_iterator(dumpStoragePath)) {
+		if (entry.path().extension() == ".dmp") {
+			std::filesystem::path uploadedPath = entry.path();
+
+
+			// is dump already uploaded
+			if (entry.path().stem().string().find("_uploaded") != std::string::npos) {
+				continue;
+			}
+
+			ConMsg("Uploading minidump %s\n", entry.path().string().c_str());
+
+			std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> strconverter;
+			std::map<std::wstring, std::wstring> params;
+
+			params[L"UserID"] = strconverter.from_bytes(g_UserId).c_str();
+			params[L"GameDirectory"] = L"csgo";
+			params[L"ExtensionVersion"] = strconverter.from_bytes(g_AcceleratorCS2.GetVersion()) + L" [AcceleratorCS2 Build]";
+			params[L"ServerID"] = strconverter.from_bytes(g_serverId).c_str();
+			params[L"PresubmitToken"] = L"";
+
+			std::filesystem::path metadataPath = entry.path();
+			metadataPath.replace_extension(".dmp.txt");
+
+			std::map<std::wstring, std::wstring> files;
+			files[L"upload_file_minidump"] = entry.path().wstring();
+			files[L"upload_file_metadata"] = metadataPath.wstring();
+
+			std::wstring res;
+			google_breakpad::HTTPUpload::SendMultipartPostRequest(L"http://crash.limetech.org/submit", params, files, nullptr, &res, nullptr);
+
+			ConMsg("Upload response: %s\n", strconverter.to_bytes(res).c_str());
+
+			uploadedPath.replace_filename(uploadedPath.stem().string() + "_uploaded" + uploadedPath.extension().string());
+			std::filesystem::rename(entry.path(), uploadedPath);
+		}
+	}
+};
+#endif
+
+void LoadServerId()
+{
+	std::string serverIdPath = std::string(crashGamePath) + "/addons/accelerator_local/serverid.txt";
+	std::ifstream serverIdFile(serverIdPath);
+	if (serverIdFile.is_open()) {
+		serverIdFile >> g_serverId;
+		serverIdFile.close();
+	}
+	else {
+		char buffer[64];
+		V_snprintf(buffer, sizeof(buffer), "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+			rand() % 255, rand() % 255, rand() % 255, rand() % 255, rand() % 255, rand() % 255, 0x40 | ((rand() % 255) & 0x0F), rand() % 255,
+			0x80 | ((rand() % 255) & 0x3F), rand() % 255, rand() % 255, rand() % 255, rand() % 255, rand() % 255, rand() % 255, rand() % 255);
+		g_serverId = buffer;
+
+		std::ofstream serverIdFile(serverIdPath);
+		if (serverIdFile.is_open()) {
+			serverIdFile << g_serverId;
+			serverIdFile.close();
+		}
+	}
+};
+
+void LoadConfig()
+{
+	// load json config
+	std::string configPath = std::string(crashGamePath) + "/addons/accelerator_local/config.json";
+	std::ifstream configFile(configPath);
+	if (configFile.is_open()) {
+		nlohmann::json config;
+		configFile >> config;
+		configFile.close();
+
+		if (config.contains("MinidumpAccountSteamId64")) {
+			g_UserId = config["MinidumpAccountSteamId64"];
+		}
+	}
+	else {
+		nlohmann::json config;
+		config["MinidumpAccountSteamId64"] = "";
+
+		std::ofstream configFile(configPath);
+		if (configFile.is_open()) {
+			configFile << config.dump(2);
+			configFile.close();
+		}
+	}
+}
+
 bool AcceleratorCS2::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool late)
 {
 	PLUGIN_SAVEVARS();
@@ -324,6 +463,12 @@ bool AcceleratorCS2::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen
 	if (late)
 		StartupServer({}, nullptr, nullptr);
 
+	LoadServerId();
+	LoadConfig();
+
+	ConMsg("Start accelerator uploader thread\n");
+	new std::thread(UploadThread);
+
 	return true;
 }
 

extension.h

@@ -1,5 +1,4 @@
-#ifndef _INCLUDE_METAMOD_SOURCE_STUB_PLUGIN_H_
-#define _INCLUDE_METAMOD_SOURCE_STUB_PLUGIN_H_
+#pragma once
 #include <ISmmPlugin.h>
 #include <igameevents.h>
 #include <sh_vector.h>
@@ -22,5 +21,4 @@ class AcceleratorCS2 : public ISmmPlugin, public IMetamodListener
 private: // Hooks
 	void GameFrame(bool simulating, bool bFirstTick, bool bLastTick);
 	void StartupServer(const GameSessionConfiguration_t& config, ISource2WorldSession*, const char*);
-};
-#endif //_INCLUDE_METAMOD_SOURCE_STUB_PLUGIN_H_
+};

patches/0006-Fix-multipart-missing-CLRF.patch

@@ -0,0 +1,13 @@
+diff --git a/src/common/windows/http_upload.cc b/src/common/windows/http_upload.cc
+index bd48a233..cd12a24e 100644
+--- a/src/common/windows/http_upload.cc
++++ b/src/common/windows/http_upload.cc
+@@ -427,7 +427,7 @@ namespace {
+         return false;
+       }
+     }
+-    request_body->append("--" + boundary_str + "--\r\n");
++    request_body->append("\r\n--" + boundary_str + "--\r\n");
+     return true;
+   }
+ }

premake/breakpad.lua

@@ -133,7 +133,8 @@ project "breakpad-client"
 			path.join(breakpadPath, "common", "linux", "guid_creator.cc"),
 			path.join(breakpadPath, "common", "linux", "linux_libc_support.cc"),
 			path.join(breakpadPath, "common", "linux", "memory_mapped_file.cc"),
-			path.join(breakpadPath, "common", "linux", "safe_readlink.cc")
+			path.join(breakpadPath, "common", "linux", "safe_readlink.cc"),
+			path.join(breakpadPath, "common", "linux", "http_upload.cc")
 		}
 
 		includedirs {
@@ -147,13 +148,16 @@ project "breakpad-client"
 			path.join(breakpadPath, "client", "windows", "crash_generation", "crash_generation_server.cc"),
 			path.join(breakpadPath, "client", "windows", "crash_generation", "minidump_generator.cc"),
 			path.join(breakpadPath, "client", "windows", "handler", "exception_handler.cc"),
-			path.join(breakpadPath, "common", "windows", "guid_string.cc")
+			path.join(breakpadPath, "common", "windows", "guid_string.cc"),
+			path.join(breakpadPath, "common", "windows", "http_upload.cc")
 		}
 
 		includedirs {
 			path.join(_MAIN_SCRIPT_DIR, "breakpad-config", "windows")
 		}
 
+		links "wininet"
+
 	filter {}
 
 project "libdisasm"