big refactor (#171)v1.10.0-rc1

* use in-file macros rather than global funcs for registering dll load callbacks

* move more things to macros

* fix debug crashes

* move sqvm funcs to sq managers

* get rid of context file

* refactor some squirrel stuff and ingame compilation error message

* move tier0 and playlist funcs to namespaces

* uiscript_reset concommand: don't loop forever if compilation fails

* improve showing console for ui script compile errors

* standardise concommand func naming in c++

* use lambdas for dll load callbacks so intellisense shits itself less

* use cvar change callbacks for unescaping ns_server_name and ns_server_desc

* add proper helpstrings to masterserver cvars

* add cvar help and find

* allow parsing of convar flags from string

* normalise mod fs paths to be lowercase

* move hoststate to its own file and add host_init hooks

* better IsFlagSet def

* replace files in ReadFromCache

* rename g_ModManager to g_pModManager

* formatting changes

* make cvar print work on dedi, move demo fix stuff, add findflags

* add proper map autocompletes and maps command

* formatting changes

* separate gameutils into multiple r2 headers

* Update keyvalues.cpp

* move sqvm funcs into wrappers in the manager class

* remove unnecessary header files

* lots of cleanup and starting moving to new hooking macros

* update more stuff to new hook macros

* rename project folder (:tf: commit log)

* fix up postbuild commands to use relative dir

* almost fully replaced hooking lib

* completely remove old hooking

* add nsprefix because i forgot to include it

* move exploit prevention and limits code out of serverauthentication, and have actual defs for CBasePlayer

* use modular ServerPresence system for registering servers

* add new memory lib

* accidentally pushed broke code oops

* lots of stuff idk

* implement some more prs

* improve rpakfilesystem

* fix line endings on vcxproj

* Revert "fix line endings on vcxproj"

This reverts commit 4ff7d022d2602c2dba37beba8b8df735cf5cd7d9.

* add more prs

* i swear i committed these how are they not there

* Add ability to load Datatables from files (#238)

* first version of kinda working custom datatables

* Fix copy error

* Finish custom datatables

* Fix Merge

* Fix line endings

* Add fallback to rpak when ns_prefere_datatable_from_disk is true

* fix typo

* Bug fixess

* Fix Function Registration hook

* Set convar value

* Fix Client and Ui VM

* enable server auth with ms agian

* Add Filters

* FIx unused import

* Merge remote-tracking branch 'upsteam/bobs-big-refactor-pr' into datatables

Co-authored-by: RoyalBlue1 <realEmail@veryRealURL.com>

* Add some changes from main to refactor (#243)

* Add PR template

* Update CI folder location

* Delete startup args txt files

* Fix line endings (hopefully) (#244)

* Fix line endings (hopefully)

* Fix more line endings

* Update refactor (#250)

* Add PR template

* Update CI folder location

* Delete startup args txt files

* Add editorconfig file (#246)

* Add editorconfig file

It's a cross-editor compatible config file that defines certain editor
behaviour (e.g. adding/removing newline at end of file)

It is supported by major editors like Visual Studio (Code) and by
version control  providers like GitHub.

Should end the constant adding/removing of final newline in PRs

* More settings

- unicode by default
- trim newlines
- use tabs for indentation (ugh)

* Ignore folder rename (#245)

* Hot reload banlist on player join (#233)

* added banlist hotreload

* fix formatting

* didnt append, cleared whole file oopsie

* unfuckedunban not rewriting file

* fixed not checking for new line

Co-authored-by: ScureX <47725553+ScureX@users.noreply.github.com>

* Refactor cleanup (#256)

* Fix indentation

* Fix path in clang-format command in readme

* Refactor cleanup (some formatting fixes) (#257)

* Fix some formatting

* More formatting fixes

* add scriptdatatable.cpp rewrite

* Some formatting fixes (#260)

* More formatting stuff (#261)

* various formatting changes and fixes

* Fix changed icon (#264)

* clang format, fix issues with server registration and rpak loading

* fix more formatting

* update postbuild step

* set launcher directory and error on fail creating log files

* change some stuff in exploitfixes

* only unrestrict dev commands when commandline flag is present

* fix issues with cvar flag commit

* fixup command flags better and reformat

* bring up to date with main

* fixup formatting

* improve cvar flag fixup and remove temp thing from findflags

* set serverfilter better

* avoid ptr decay when setting auth token

* add more entity functions

* Fix the MS server registration issues. (#285)

* Port ms presence reporter to std::async

* Fix crash due to std::optional being assigned nullptr.

* Fix formatting.

* Wait 20 seconds if MS returns DUPLICATE_SERVER.

* Change PERSISTENCE_MAX_SIZE to fix player authentication (#287)

The size check added in the refactor was incorrect:

- 56306: expected pdata size based on the pdef
- 512: allowance for trailing junk (r2 adds 137 bytes of trailing junk)
- 100: for some wiggle room

Co-Authored-By: pg9182 <96569817+pg9182@users.noreply.github.com>

* change miscserverscript to use actual entity arguments rather than
player index jank

* Fix token clearing hook (#290)

A certain someone forgot to put an `0x` in front of their hex number, meaning the offset is wrong.
This would cause token to be leaked again

Co-authored-by: Maya <malte.hoermeyer@web.de>
Co-authored-by: RoyalBlue1 <realEmail@veryRealURL.com>
Co-authored-by: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Co-authored-by: ScureX <47725553+ScureX@users.noreply.github.com>
Co-authored-by: Erlite <ys.aameziane@gmail.com>
Co-authored-by: Emma Miler <emma.pi@protonmail.com>
Co-authored-by: pg9182 <96569817+pg9182@users.noreply.github.com>

1 files changed, 24 insertions, 79 deletions

diff --git a/NorthstarDLL/serverauthentication.h b/NorthstarDLL/serverauthentication.h
index e79577e6..08854ac0 100644
--- a/NorthstarDLL/serverauthentication.h
+++ b/NorthstarDLL/serverauthentication.h
@@ -1,10 +1,11 @@
 #pragma once
 #include "convar.h"
 #include "httplib.h"
+#include "r2engine.h"
 #include <unordered_map>
 #include <string>
 
-struct AuthData
+struct RemoteAuthData
 {
 	char uid[33];
 	char username[64];
@@ -14,99 +15,43 @@ struct AuthData
 	size_t pdataSize;
 };
 
-struct AdditionalPlayerData
+struct PlayerAuthenticationData
 {
 	bool usingLocalPdata;
 	size_t pdataSize;
 	bool needPersistenceWriteOnLeave = true;
-
-	double lastClientCommandQuotaStart = -1.0;
-	int numClientCommandsInQuota = 0;
-
-	double lastNetChanProcessingLimitStart = -1.0;
-	double netChanProcessingLimitTime = 0.0;
-
-	double lastSayTextLimitStart = -1.0;
-	int sayTextLimitCount = 0;
-
-	uint64_t uid;
-};
-
-#pragma once
-typedef enum
-{
-	NA_NULL = 0,
-	NA_LOOPBACK,
-	NA_IP,
-} netadrtype_t;
-
-#pragma pack(push, 1)
-typedef struct netadr_s
-{
-	netadrtype_t type;
-	unsigned char ip[16]; // IPv6
-	// IPv4's 127.0.0.1 is [::ffff:127.0.0.1], that is:
-	// 00 00 00 00 00 00 00 00    00 00 FF FF 7F 00 00 01
-	unsigned short port;
-} netadr_t;
-#pragma pack(pop)
-
-#pragma pack(push, 1)
-typedef struct netpacket_s
-{
-	netadr_t adr; // sender address
-	// int				source;		// received source
-	char unk[10];
-	double received_time;
-	unsigned char* data; // pointer to raw packet data
-	void* message; // easy bitbuf data access // 'inpacket.message' etc etc (pointer)
-	char unk2[16];
-	int size;
-
-	// bf_read			message;	// easy bitbuf data access // 'inpacket.message' etc etc (pointer)
-	// int				size;		// size in bytes
-	// int				wiresize;   // size in bytes before decompression
-	// bool			stream;		// was send as stream
-	// struct netpacket_s* pNext;	// for internal use, should be NULL in public
-} netpacket_t;
-#pragma pack(pop)
-
-struct UnconnectedPlayerSendData
-{
-	char ip[16];
-	double lastQuotaStart = 0.0;
-	int packetCount = 0;
-	double timeoutEnd = -1.0;
 };
 
 class ServerAuthenticationManager
 {
   private:
-	httplib::Server m_playerAuthServer;
+	httplib::Server m_PlayerAuthServer;
 
   public:
-	std::mutex m_authDataMutex;
-	std::unordered_map<std::string, AuthData> m_authData;
-	std::unordered_map<void*, AdditionalPlayerData> m_additionalPlayerData;
-	std::vector<UnconnectedPlayerSendData> m_unconnectedPlayerSendData;
-	bool m_runningPlayerAuthThread = false;
+	ConVar* Cvar_ns_player_auth_port;
+	ConVar* Cvar_ns_erase_auth_info;
+	ConVar* CVar_ns_auth_allow_insecure;
+	ConVar* CVar_ns_auth_allow_insecure_write;
+
+	std::mutex m_AuthDataMutex;
+	std::unordered_map<std::string, RemoteAuthData> m_RemoteAuthenticationData;
+	std::unordered_map<R2::CBaseClient*, PlayerAuthenticationData> m_PlayerAuthenticationData;
+	bool m_bRequireClientAuth = true;
+	bool m_bAllowDuplicateAccounts = false;
+	bool m_bRunningPlayerAuthThread = false;
 	bool m_bNeedLocalAuthForNewgame = false;
-	bool m_bForceReadLocalPlayerPersistenceFromDisk = false;
+	bool m_bForceResetLocalPlayerPersistence = false;
 
   public:
 	void StartPlayerAuthServer();
 	void StopPlayerAuthServer();
-	bool AuthenticatePlayer(void* player, int64_t uid, char* authToken);
-	char* VerifyPlayerName(void* player, char* authToken, char* name);
-	bool RemovePlayerAuthData(void* player);
-	void WritePersistentData(void* player);
-	bool CheckPlayerChatRatelimit(void* player);
+	void AddPlayer(R2::CBaseClient* player, const char* pToken);
+	void RemovePlayer(R2::CBaseClient* player);
+	bool CheckDuplicateAccounts(R2::CBaseClient* player);
+	bool AuthenticatePlayer(R2::CBaseClient* player, uint64_t uid, char* authToken);
+	void VerifyPlayerName(R2::CBaseClient* player, char* authToken, char* name);
+	bool RemovePlayerAuthData(R2::CBaseClient* player);
+	void WritePersistentData(R2::CBaseClient* player);
 };
 
-typedef void (*CBaseClient__DisconnectType)(void* self, uint32_t unknownButAlways1, const char* reason, ...);
-extern CBaseClient__DisconnectType CBaseClient__Disconnect;
-
-void InitialiseServerAuthentication(HMODULE baseAddress);
-
-extern ServerAuthenticationManager* g_ServerAuthenticationManager;
-extern ConVar* Cvar_ns_player_auth_port;
+extern ServerAuthenticationManager* g_pServerAuthentication;