revamp all the code (not done yet!)

This commit is contained in:
rjindael 2023-07-26 01:24:24 -07:00
parent 9143e64c24
commit 5ddb727d6d
No known key found for this signature in database
GPG Key ID: D069369C906CCF31
38 changed files with 1453 additions and 2251 deletions

416
.gitignore vendored
View File

@ -1,398 +1,18 @@
## Ignore Visual Studio temporary files, build results, and # GitHub official CMake gitignore template
## files generated by popular Visual Studio add-ons. # https://github.com/github/gitignore/blob/main/CMake.gitignore
##
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore CMakeLists.txt.user
CMakeCache.txt
# User-specific files CMakeFiles
*.rsuser CMakeScripts
*.suo Testing
*.user Makefile
*.userosscache cmake_install.cmake
*.sln.docstates install_manifest.txt
compile_commands.json
# User-specific files (MonoDevelop/Xamarin Studio) CTestTestfile.cmake
*.userprefs _deps
# Mono auto generated files # Kiseki
mono_crash.* build
.vscode
# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/
# Visual Studio 2015/2017 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/
# Visual Studio 2017 auto generated files
Generated\ Files/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
# NUnit
*.VisualState.xml
TestResult.xml
nunit-*.xml
# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
# Benchmark Results
BenchmarkDotNet.Artifacts/
# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
# ASP.NET Scaffolding
ScaffoldingReadMe.txt
# StyleCop
StyleCopReport.xml
# Files built by Visual Studio
*_i.c
*_p.c
*_h.h
*.ilk
*.meta
*.obj
*.iobj
*.pch
*.pdb
*.ipdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*_wpftmp.csproj
*.log
*.tlog
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc
# Chutzpah Test files
_Chutzpah*
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb
# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap
# Visual Studio Trace Files
*.e2e
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# AxoCover is a Code Coverage Tool
.axoCover/*
!.axoCover/settings.json
# Coverlet is a free, cross platform Code Coverage Tool
coverage*.json
coverage*.xml
coverage*.info
# Visual Studio code coverage results
*.coverage
*.coveragexml
# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
# MightyMoose
*.mm.*
AutoTest.Net/
# Web workbench (sass)
.sass-cache/
# Installshield output folder
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# Note: Comment the next line if you want to checkin your web deploy settings,
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/
# NuGet Packages
*.nupkg
# NuGet Symbol Packages
*.snupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
!**/[Pp]ackages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/[Pp]ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
# Microsoft Azure Build Output
csx/
*.build.csdef
# Microsoft Azure Emulator
ecf/
rcf/
# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
*.appxbundle
*.appxupload
# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!?*.[Cc]ache/
# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs
# Including strong name files can present a security risk
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
ServiceFabricBackup/
*.rptproj.bak
# SQL Server files
*.mdf
*.ldf
*.ndf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
*- [Bb]ackup.rdl
*- [Bb]ackup ([0-9]).rdl
*- [Bb]ackup ([0-9][0-9]).rdl
# Microsoft Fakes
FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/
# Visual Studio 6 build log
*.plg
# Visual Studio 6 workspace options file
*.opt
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
# Visual Studio 6 auto-generated project file (contains which files were open etc.)
*.vbp
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
*.dsw
*.dsp
# Visual Studio 6 technical files
*.ncb
*.aps
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
paket-files/
# FAKE - F# Make
.fake/
# CodeRush personal settings
.cr/personal
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config
# Tabs Studio
*.tss
# Telerik's JustMock configuration file
*.jmconfig
# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs
# OpenCover UI analysis results
OpenCover/
# Azure Stream Analytics local run output
ASALocalRun/
# MSBuild Binary and Structured Log
*.binlog
# NVidia Nsight GPU debugger configuration file
*.nvuser
# MFractors (Xamarin productivity tool) working folder
.mfractor/
# Local History for Visual Studio
.localhistory/
# Visual Studio History (VSHistory) files
.vshistory/
# BeatPulse healthcheck temp database
healthchecksdb
# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/
# Fody - auto-generated XML schema
FodyWeavers.xsd
# VS Code files for those working on multiple tools
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace
# Local History for Visual Studio Code
.history/
# Windows Installer files from build outputs
*.cab
*.msi
*.msix
*.msm
*.msp
# JetBrains Rider
*.sln.iml

6
CMakeLists.txt Normal file
View File

@ -0,0 +1,6 @@
cmake_minimum_required(VERSION 3.4)
project(Kiseki.Patcher VERSION 1.0.0)
option(COMPILE_PLAYER "Include player-specific code" OFF)
option(COMPILE_SERVER "Include server-specific code" OFF)

View File

@ -1,25 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Kiseki.Patcher", "Kiseki.Patcher\Kiseki.Patcher.vcxproj", "{9D232642-FB2F-43DC-B0AC-C56E3B691233}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9D232642-FB2F-43DC-B0AC-C56E3B691233}.Debug|x86.ActiveCfg = Debug|Win32
{9D232642-FB2F-43DC-B0AC-C56E3B691233}.Debug|x86.Build.0 = Debug|Win32
{9D232642-FB2F-43DC-B0AC-C56E3B691233}.Release|x86.ActiveCfg = Release|Win32
{9D232642-FB2F-43DC-B0AC-C56E3B691233}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {01A4798F-B42A-4C9B-BFE7-A6D1BD35C7B3}
EndGlobalSection
EndGlobal

View File

@ -1,61 +1,50 @@
#pragma once #pragma once
/* #define ALLOWED_WILDCARD_DOMAINS "kiseki.lol", "rbxcdn.com", "roblox.com"
* This is commented out since our CI defines this automatically. #define ALLOWED_DOMAINS
* Uncomment this if you want to test locally, but please do not push with these uncommented! #define ALLOWED_SCHEMES "http", "https"
*/ #define ALLOWED_EMBEDDED_SCHEMES "javascript", "jscript", "res"
// #define SERVER #ifdef _DEBUG
// #define PLAYER #define PUBLIC_KEY ""
#else
#define BASE_URL "https://kiseki.lol" #define PUBLIC_KEY 0x00
#define DISCORD_APP_ID 0 #endif
#define ALLOWED_WILDCARD_DOMAINS "kiseki.lol", "rbxcdn.com", "roblox.com" #define RBX__MESSAGE_INFO 0
#define ALLOWED_DOMAINS #define RBX__MESSAGE_OUTPUT 1
#define ALLOWED_SCHEMES "http", "https" #define RBX__MESSAGE_WARNING 2
#define ALLOWED_EMBEDDED_SCHEMES "javascript", "jscript", "res" #define RBX__MESSAGE_ERROR 3
#ifdef _DEBUG // TODO: Verify this
#define PUBLIC_KEY "" #define CLASSPADDING_DATAMODEL__JOBID 739
#else
#define PUBLIC_KEY 0x00 #define ADDRESS_HTTP__HTTPGETPOSTWININET 0x0
#endif #define ADDRESS_HTTP__TRUSTCHECK 0x005B7050
#define ADDRESS_CRYPT__VERIFYSIGNATUREBASE64 0x00809EC0
// TODO: Verify this #define ADDRESS_CONTEXT__REQUIREPERMISSION 0x0
#define CLASSPADDING_DATAMODEL__JOBID 739 #define ADDRESS_CONTEXT__ISINROLE 0x0
#define ADDRESS_DATAMODEL__GETJOBID 0x005E70C0
#define ADDRESS_HTTP__HTTPGETPOSTWININET 0x0 #define ADDRESS_STANDARDOUT__PRINT 0x005B25E0
#define ADDRESS_HTTP__TRUSTCHECK 0x005B7050 #define ADDRESS_SERVERREPLICATOR__SENDTOP 0x00513E80
#define ADDRESS_CRYPT__VERIFYSIGNATUREBASE64 0x00809EC0 #define ADDRESS_SERVERREPLICATOR__PROCESSTICKET 0x00514B60
#define ADDRESS_CONTEXT__REQUIREPERMISSION 0x0 #define ADDRESS_SERVERREPLICATOR__PROCESSPACKET 0x00514B60
#define ADDRESS_CONTEXT__ISINROLE 0x0
#define ADDRESS_DATAMODEL__GETJOBID 0x005E70C0 #define CLASSLOCATION_CROBLOXAPP 0x00CBA8A0
#define ADDRESS_STANDARDOUT__PRINT 0x005B25E0 #define CLASSLOCATION_CAPP 0x00406D80
#define ADDRESS_SERVERREPLICATOR__SENDTOP 0x00513E80
#define ADDRESS_SERVERREPLICATOR__PROCESSTICKET 0x00514B60 #define CLASSPADDING_CROBLOXDOC__WORKSPACE 45
#define ADDRESS_SERVERREPLICATOR__PROCESSPACKET 0x00514B60
#define ADDRESS_CAPP__CREATEGAME 0x00406D80
#define CLASSLOCATION_CROBLOXAPP 0x00CBA8A0 #define ADDRESS_CAPP__ROBLOXAUTHENTICATE 0x00409050
#define CLASSLOCATION_CAPP 0x00406D80 #define ADDRESS_CROBLOXAPP__INITINSTANCE 0x004613C0
#define ADDRESS_CROBLOXAPP__CREATEDOCUMENT 0x0045D030
#define CLASSPADDING_CROBLOXDOC__WORKSPACE 45 #define ADDRESS_CWORKSPACE__EXECURLSCRIPT 0x0049FC90
#define ADDRESS_CROBLOXCOMMANDLINEINFO__PARSEPARAM 0x0045EE50
#define ADDRESS_CAPP__CREATEGAME 0x00406D80 #define ADDRESS_CCOMMANDLINEINFO__PARSELAST 0x0081354A
#define ADDRESS_CAPP__ROBLOXAUTHENTICATE 0x00409050
#define ADDRESS_CROBLOXAPP__INITINSTANCE 0x004613C0 #ifdef _DEBUG
#define ADDRESS_CROBLOXAPP__CREATEDOCUMENT 0x0045D030 #define PADDING_STRUCT 0
#define ADDRESS_CWORKSPACE__EXECURLSCRIPT 0x0049FC90 #else
#define ADDRESS_CROBLOXCOMMANDLINEINFO__PARSEPARAM 0x0045EE50 #define PADDING_STRUCT 1
#define ADDRESS_CCOMMANDLINEINFO__PARSELAST 0x0081354A #endif
#ifndef _DEBUG
#define PADDING_STRUCT 1
#else
#define PADDING_STRUCT 0
#endif
#define RBX__MESSAGE_INFO 0
#define RBX__MESSAGE_OUTPUT 1
#define RBX__MESSAGE_WARNING 2
#define RBX__MESSAGE_ERROR 3

View File

@ -1,20 +1,22 @@
#pragma once #ifdef PLAYER
#include <discord_rpc.h> #pragma once
#include <discord_register.h>
#include <rapidjson/document.h> #include <discord_rpc.h>
#include <discord_register.h>
#include "Configuration.h" #include <rapidjson/document.h>
#include "Hooks/CRoblox.h"
#include "Configuration.hpp"
#ifdef PLAYER
#include "Hooks/CRoblox.hpp"
class Discord {
public:
static void Initialize(const std::string joinScriptUrl); class Discord {
static void Cleanup(); public:
private: static void Initialize(const std::string joinScriptUrl);
static void Update(); static void Cleanup();
}; private:
static void Update();
};
#endif #endif

View File

@ -1,26 +1,26 @@
#pragma once #pragma once
#include <curl/curl.h> #include <curl/curl.h>
#include "Configuration.h" #include "Configuration.hpp"
class Helpers class Helpers
{ {
public: public:
static const std::vector<BYTE> publicKey; static const std::vector<BYTE> publicKey;
static const std::vector<std::string> allowedWildcardDomains; static const std::vector<std::string> allowedWildcardDomains;
static const std::vector<std::string> allowedDomains; static const std::vector<std::string> allowedDomains;
static const std::vector<std::string> allowedSchemes; static const std::vector<std::string> allowedSchemes;
static const std::vector<std::string> allowedEmbeddedSchemes; static const std::vector<std::string> allowedEmbeddedSchemes;
static bool isASCII(const std::string& s); static bool isASCII(const std::string& s);
static std::string toLower(std::string s); static std::string toLower(std::string s);
static std::vector<BYTE> base64Decode(const std::string_view data); static std::vector<BYTE> base64Decode(const std::string_view data);
static std::map<std::string, std::string> parseQueryString(const std::string query); static std::map<std::string, std::string> parseQueryString(const std::string query);
static std::string joinQueryString(const std::map<std::string, std::string> query); static std::string joinQueryString(const std::map<std::string, std::string> query);
static std::string ws2s(const std::wstring widestring); static std::string ws2s(const std::wstring widestring);
static size_t write(char* contents, size_t size, size_t memory, void* pointer); static size_t write(char* contents, size_t size, size_t memory, void* pointer);
static std::string getModulePath(); static std::string getModulePath();
static std::string getISOTimestamp(); static std::string getISOTimestamp();
static std::pair<bool, std::map<std::string, std::string>> parseURL(const std::string url); static std::pair<bool, std::map<std::string, std::string>> parseURL(const std::string url);
static std::pair<bool, std::string> httpGet(const std::string url); static std::pair<bool, std::string> httpGet(const std::string url);
}; };

View File

@ -1,47 +1,47 @@
#pragma once #pragma once
#include <curl/curl.h> #include <curl/curl.h>
#include "Configuration.h" #include "Configuration.hpp"
#include "Helpers.h" #include "Helpers.hpp"
#include "Discord.h" #include "Discord.hpp"
class CWorkspace; class CWorkspace;
const auto CWorkspace__ExecUrlScript = (HRESULT(__stdcall*)(CWorkspace * workspace, LPCWSTR, VARIANTARG, VARIANTARG, VARIANTARG, VARIANTARG, LPVOID))ADDRESS_CWORKSPACE__EXECURLSCRIPT; const auto CWorkspace__ExecUrlScript = (HRESULT(__stdcall*)(CWorkspace * workspace, LPCWSTR, VARIANTARG, VARIANTARG, VARIANTARG, VARIANTARG, LPVOID))ADDRESS_CWORKSPACE__EXECURLSCRIPT;
struct CRobloxDoc struct CRobloxDoc
{ {
void* padding1[CLASSPADDING_CROBLOXDOC__WORKSPACE]; void* padding1[CLASSPADDING_CROBLOXDOC__WORKSPACE];
CWorkspace* workspace; CWorkspace* workspace;
}; };
struct CApp; struct CApp;
const auto CApp__RobloxAuthenticate = (void* (__thiscall*)(CApp * _this, LPVOID, LPCWSTR, LPCWSTR))ADDRESS_CAPP__ROBLOXAUTHENTICATE; const auto CApp__RobloxAuthenticate = (void* (__thiscall*)(CApp * _this, LPVOID, LPCWSTR, LPCWSTR))ADDRESS_CAPP__ROBLOXAUTHENTICATE;
struct CRobloxApp; struct CRobloxApp;
const auto CRobloxApp__CreateDocument = (CRobloxDoc * (__thiscall*)(CRobloxApp * _this))ADDRESS_CROBLOXAPP__CREATEDOCUMENT; const auto CRobloxApp__CreateDocument = (CRobloxDoc * (__thiscall*)(CRobloxApp * _this))ADDRESS_CROBLOXAPP__CREATEDOCUMENT;
struct CCommandLineInfo struct CCommandLineInfo
{ {
void* padding1[3]; void* padding1[3];
BOOL m_bRunAutomated; BOOL m_bRunAutomated;
}; };
class CRobloxCommandLineInfo : public CCommandLineInfo {}; class CRobloxCommandLineInfo : public CCommandLineInfo {};
const auto CCommandLineInfo__ParseLast = (void(__thiscall*)(CCommandLineInfo * _this, BOOL bLast))ADDRESS_CCOMMANDLINEINFO__PARSELAST; const auto CCommandLineInfo__ParseLast = (void(__thiscall*)(CCommandLineInfo * _this, BOOL bLast))ADDRESS_CCOMMANDLINEINFO__PARSELAST;
typedef BOOL(__thiscall* CRobloxApp__InitInstance_t)(CRobloxApp* _this); typedef BOOL(__thiscall* CRobloxApp__InitInstance_t)(CRobloxApp* _this);
typedef void(__thiscall* CRobloxCommandLineInfo__ParseParam_t)(CRobloxCommandLineInfo* _this, const char* pszParam, BOOL bFlag, BOOL bLast); typedef void(__thiscall* CRobloxCommandLineInfo__ParseParam_t)(CRobloxCommandLineInfo* _this, const char* pszParam, BOOL bFlag, BOOL bLast);
BOOL __fastcall CRobloxApp__InitInstance_hook(CRobloxApp* _this); BOOL __fastcall CRobloxApp__InitInstance_hook(CRobloxApp* _this);
void __fastcall CRobloxCommandLineInfo__ParseParam_hook(CRobloxCommandLineInfo* _this, void*, const char* pszParam, BOOL bFlag, BOOL bLast); void __fastcall CRobloxCommandLineInfo__ParseParam_hook(CRobloxCommandLineInfo* _this, void*, const char* pszParam, BOOL bFlag, BOOL bLast);
extern CRobloxApp__InitInstance_t CRobloxApp__InitInstance; extern CRobloxApp__InitInstance_t CRobloxApp__InitInstance;
extern CRobloxCommandLineInfo__ParseParam_t CRobloxCommandLineInfo__ParseParam; extern CRobloxCommandLineInfo__ParseParam_t CRobloxCommandLineInfo__ParseParam;
extern std::wstring jobId; extern std::wstring jobId;
extern bool hasJobId; extern bool hasJobId;

View File

@ -1,13 +1,13 @@
#pragma once #ifdef _DEBUG
#include "Configuration.h" #pragma once
#ifdef _DEBUG #include "Configuration.hpp"
const auto Context__isInRole = (bool(__cdecl*)(int identity, int permission))ADDRESS_CONTEXT__ISINROLE; const auto Context__isInRole = (bool(__cdecl*)(int identity, int permission))ADDRESS_CONTEXT__ISINROLE;
typedef void (__thiscall* Context__requirePermission_t)(void* _this, int permission, const char* operation); typedef void (__thiscall* Context__requirePermission_t)(void* _this, int permission, const char* operation);
void __fastcall Context__requirePermission_hook(void* _this, void*, int permission, const char* operation); void __fastcall Context__requirePermission_hook(void* _this, void*, int permission, const char* operation);
extern Context__requirePermission_t Context__requirePermission; extern Context__requirePermission_t Context__requirePermission;
#endif #endif

View File

@ -1,20 +1,20 @@
#pragma once #pragma once
#include <wincrypt.h> #include <wincrypt.h>
#include "Configuration.h" #include "Configuration.hpp"
typedef void(__thiscall* Crypt__verifySignatureBase64_t)(HCRYPTPROV* _this, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15); typedef void(__thiscall* Crypt__verifySignatureBase64_t)(HCRYPTPROV* _this, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15);
void __fastcall Crypt__verifySignatureBase64_hook(HCRYPTPROV* _this, void*, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15); void __fastcall Crypt__verifySignatureBase64_hook(HCRYPTPROV* _this, void*, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15);
extern Crypt__verifySignatureBase64_t Crypt__verifySignatureBase64; extern Crypt__verifySignatureBase64_t Crypt__verifySignatureBase64;
class Crypt class Crypt
{ {
HCRYPTPROV context; HCRYPTPROV context;
HCRYPTKEY key; HCRYPTKEY key;
public: public:
Crypt(); Crypt();
~Crypt(); ~Crypt();
bool verifySignatureBase64(std::string message, std::string signatureBase64, ALG_ID algorithm); bool verifySignatureBase64(std::string message, std::string signatureBase64, ALG_ID algorithm);
}; };

View File

@ -1,20 +1,20 @@
#pragma once #ifdef SERVER
#include "Helpers.h" #pragma once
#include "Configuration.h"
#include "Hooks/CRoblox.hpp"
#include "Hooks/CRoblox.h"
#include "Configuration.hpp"
#ifdef SERVER #include "Helpers.hpp"
struct DataModel struct DataModel
{ {
void* padding1[CLASSPADDING_DATAMODEL__JOBID]; void* padding1[CLASSPADDING_DATAMODEL__JOBID];
std::string jobId; std::string jobId;
}; };
typedef INT(__thiscall* DataModel__getJobId_t)(DataModel* _this, int a2); typedef INT(__thiscall* DataModel__getJobId_t)(DataModel* _this, int a2);
int __fastcall DataModel__getJobId_hook(DataModel* _this, void*, int a2); int __fastcall DataModel__getJobId_hook(DataModel* _this, void*, int a2);
extern DataModel__getJobId_t DataModel__getJobId; extern DataModel__getJobId_t DataModel__getJobId;
#endif #endif

View File

@ -1,30 +1,28 @@
#pragma once #include <curl/curl.h>
#include <rapidjson/document.h>
#include <curl/curl.h>
#include <rapidjson/document.h> #ifdef SERVER
#include "Hooks/StandardOut.hpp"
#include "Configuration.h" #endif
#include "Helpers.h"
#include "Configuration.hpp"
#ifdef SERVER #include "Helpers.hpp"
#include "Hooks/StandardOut.h"
#endif struct Http
{
struct Http #if PADDING_STRUCT != 0
{ void* padding1[1];
#if PADDING_STRUCT != 0 #endif
void* padding1[1]; std::string alternateUrl;
#endif void* padding2[3 + PADDING_STRUCT];
std::string alternateUrl; std::string url;
void* padding2[3 + PADDING_STRUCT]; };
std::string url;
}; typedef void (__thiscall* Http__httpGetPostWinInet_t)(Http* _this, bool isPost, int a3, bool compressData, LPCSTR additionalHeaders, int a6);
typedef bool(__thiscall* Http__trustCheck_t)(const char* url);
typedef void (__thiscall* Http__httpGetPostWinInet_t)(Http* _this, bool isPost, int a3, bool compressData, LPCSTR additionalHeaders, int a6);
typedef bool(__thiscall* Http__trustCheck_t)(const char* url); void __fastcall Http__httpGetPostWinInet_hook(Http* _this, void*, bool isPost, int a3, bool compressData, LPCSTR additionalHeaders, int a6);
bool __fastcall Http__trustCheck_hook(const char* url);
void __fastcall Http__httpGetPostWinInet_hook(Http* _this, void*, bool isPost, int a3, bool compressData, LPCSTR additionalHeaders, int a6);
bool __fastcall Http__trustCheck_hook(const char* url); extern Http__httpGetPostWinInet_t Http__httpGetPostWinInet;
extern Http__httpGetPostWinInet_t Http__httpGetPostWinInet;
extern Http__trustCheck_t Http__trustCheck; extern Http__trustCheck_t Http__trustCheck;

View File

@ -1,33 +1,33 @@
#pragma once #ifdef SERVER
#include "Configuration.h" #pragma once
#if defined(SERVER) #include "Configuration.hpp"
struct Packet struct Packet
{ {
void* padding1[7]; void* padding1[7];
unsigned int length; unsigned int length;
void* padding2[1]; void* padding2[1];
unsigned char* data; unsigned char* data;
}; };
struct RakPeerInterface {}; struct RakPeerInterface {};
struct ServerReplicator struct ServerReplicator
{ {
void* padding1[1869]; // offset of 0 -> 7476 void* padding1[1869]; // offset of 0 -> 7476
bool padding2; // offset of 7476 -> 7477 bool padding2; // offset of 7476 -> 7477
bool isAuthenticated; // offset of 7477 -> 7478 bool isAuthenticated; // offset of 7477 -> 7478
}; };
typedef void(__thiscall* ServerReplicator__sendTop_t)(ServerReplicator* _this, RakPeerInterface* peer); typedef void(__thiscall* ServerReplicator__sendTop_t)(ServerReplicator* _this, RakPeerInterface* peer);
typedef void(__thiscall* ServerReplicator__processTicket_t)(ServerReplicator* _this, Packet* packet); typedef void(__thiscall* ServerReplicator__processTicket_t)(ServerReplicator* _this, Packet* packet);
void __fastcall ServerReplicator__sendTop_hook(ServerReplicator* _this, void*, RakPeerInterface* peer); void __fastcall ServerReplicator__sendTop_hook(ServerReplicator* _this, void*, RakPeerInterface* peer);
void __fastcall ServerReplicator__processTicket_hook(ServerReplicator* _this, void*, Packet* packet); void __fastcall ServerReplicator__processTicket_hook(ServerReplicator* _this, void*, Packet* packet);
extern ServerReplicator__sendTop_t ServerReplicator__sendTop; extern ServerReplicator__sendTop_t ServerReplicator__sendTop;
extern ServerReplicator__processTicket_t ServerReplicator__processTicket; extern ServerReplicator__processTicket_t ServerReplicator__processTicket;
#endif #endif

View File

@ -1,14 +1,14 @@
#pragma once #ifdef SERVER
#include "Configuration.h" #pragma once
#include "Patches.h"
#include "Helpers.h" #include "Configuration.hpp"
#include "Server.h" #include "Helpers.hpp"
#include "Patches.hpp"
#ifdef SERVER #include "Server.hpp"
typedef void(__thiscall* StandardOut__print_t)(int _this, int type, std::string* message); typedef void(__thiscall* StandardOut__print_t)(int _this, int type, std::string* message);
void __fastcall StandardOut__print_hook(int _this, void*, int type, std::string* message); void __fastcall StandardOut__print_hook(int _this, void*, int type, std::string* message);
extern StandardOut__print_t StandardOut__print; extern StandardOut__print_t StandardOut__print;
#endif #endif

View File

@ -1,16 +1,16 @@
#pragma once #pragma once
#include <detours/detours.h> #include <detours/detours.h>
namespace Patches namespace Patcher
{ {
typedef std::pair<void**, void*> Patch; typedef std::pair<void**, void*> Patch;
extern std::vector<Patch> patchList; extern std::vector<Patch> patchList;
LONG Apply(); LONG Apply();
} }
#define START_PATCH_LIST() std::vector<Patches::Patch> Patches::patchList = { #define START_PATCH_LIST() std::vector<Patcher::Patch> Patcher::patchList = {
#define ADD_PATCH(a, b) { (void**)&(a), (b) }, #define ADD_PATCH(a, b) { (void**)&(a), (b) },
#define END_PATCH_LIST() }; #define END_PATCH_LIST() };

View File

@ -1,42 +1,42 @@
#pragma once #ifdef SERVER
#include "Configuration.h" #pragma once
#include "Helpers.h"
#include "Configuration.hpp"
#include "Hooks/StandardOut.h" #include "Helpers.hpp"
#ifdef SERVER #include "Hooks/StandardOut.hpp"
enum class RequestType { enum class RequestType {
POST, POST,
GET GET
}; };
enum class LogSeverity { enum class LogSeverity {
Information = RBX__MESSAGE_INFO, Information = RBX__MESSAGE_INFO,
Output = RBX__MESSAGE_OUTPUT, Output = RBX__MESSAGE_OUTPUT,
Warning = RBX__MESSAGE_WARNING, Warning = RBX__MESSAGE_WARNING,
Error = RBX__MESSAGE_ERROR Error = RBX__MESSAGE_ERROR
}; };
class Server { class Server {
public: public:
static HANDLE Handle; static HANDLE Handle;
static void Initialize(const std::wstring jobId); static void Initialize(const std::wstring jobId);
static void Cleanup(); static void Cleanup();
struct Log struct Log
{ {
static void Http(const RequestType type, const std::string message); static void Http(const RequestType type, const std::string message);
static void Output(const LogSeverity severity, const std::string message); static void Output(const LogSeverity severity, const std::string message);
}; };
private: private:
static std::string HttpLogPath; static std::string HttpLogPath;
static std::string OutputLogPath; static std::string OutputLogPath;
static std::ofstream HttpLog; static std::ofstream HttpLog;
static std::ofstream OutputLog; static std::ofstream OutputLog;
}; };
#endif #endif

View File

@ -1,5 +0,0 @@
#pragma once
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files
#include <windows.h>

View File

@ -1,18 +0,0 @@
#pragma once
#include <windows.h>
#include <iomanip>
#include <iostream>
#include <filesystem>
#include <fstream>
#include <sstream>
#include <string>
#include <vector>
#include <map>
#include <algorithm>
#include <stdexcept>
#include <thread>
#include <ctime>
#include <ios>
namespace fs = std::filesystem;

View File

@ -1,14 +0,0 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by PolygonDLL.rc
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@ -1,100 +0,0 @@
// Microsoft Visual C++ generated resource script.
//
#include "Include/resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,0
PRODUCTVERSION 1,0,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Kiseki"
VALUE "FileDescription", "Client Functionality Library"
VALUE "FileVersion", "1.0.0.0"
VALUE "InternalName", "Kiseki.Patcher.dll"
VALUE "LegalCopyright", "Copyright (C) Kiseki 2022-2023"
VALUE "OriginalFilename", "Kiseki.Patcher.dll"
VALUE "ProductName", "Client Functionality Library"
VALUE "ProductVersion", "1.0.0.0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View File

@ -1,163 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{9d232642-fb2f-43dc-b0ac-c56e3b691233}</ProjectGuid>
<RootNamespace>Kiseki.Patcher</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<EnableManagedIncrementalBuild>true</EnableManagedIncrementalBuild>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>obj\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<EnableManagedIncrementalBuild>true</EnableManagedIncrementalBuild>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>obj\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Label="Vcpkg">
<VcpkgEnableManifest>true</VcpkgEnableManifest>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<VcpkgInstalledDir>$(SolutionDir)packages</VcpkgInstalledDir>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<VcpkgInstalledDir>$(SolutionDir)packages</VcpkgInstalledDir>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;KISEKIPATCHER_EXPORTS;_WINDOWS;_USRDLL;$(CIDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>$(ProjectDir)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>detours.lib;crypt32.lib;libcurl-d.lib;WS2_32.lib;zlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>LIBCMTD</IgnoreSpecificDefaultLibraries>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>
</FunctionLevelLinking>
<IntrinsicFunctions>false</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;KISEKIPATCHER_EXPORTS;_WINDOWS;_USRDLL;$(CIDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>$(ProjectDir)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>detours.lib;crypt32.lib;libcurl.lib;WS2_32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="Include\Configuration.h" />
<ClInclude Include="Include\Discord.h" />
<ClInclude Include="Include\Hooks\Context.h" />
<ClInclude Include="Include\Hooks\CRoblox.h" />
<ClInclude Include="Include\Hooks\DataModel.h" />
<ClInclude Include="Include\Hooks\StandardOut.h" />
<ClInclude Include="Include\Hooks\ServerReplicator.h" />
<ClInclude Include="Include\Hooks\Http.h" />
<ClInclude Include="Include\Server.h" />
<ClInclude Include="Include\Patches.h" />
<ClInclude Include="Include\pch.h" />
<ClInclude Include="Include\Helpers.h" />
<ClInclude Include="Include\Hooks\Crypt.h" />
<ClInclude Include="Include\resource.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="Discord.cpp" />
<ClCompile Include="Hooks\Context.cpp" />
<ClCompile Include="dllmain.cpp" />
<ClCompile Include="Hooks\CRoblox.cpp" />
<ClCompile Include="Hooks\DataModel.cpp" />
<ClCompile Include="Server.cpp" />
<ClCompile Include="Patches.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Hooks\StandardOut.cpp" />
<ClCompile Include="Hooks\ServerReplicator.cpp" />
<ClCompile Include="Hooks\Http.cpp" />
<ClCompile Include="Helpers.cpp" />
<ClCompile Include="Hooks\Crypt.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Kiseki.DLL.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -1,113 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Source Files\Hooks">
<UniqueIdentifier>{e1630ddd-f689-40cc-9f7b-506bcf8aca31}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Hooks">
<UniqueIdentifier>{51130969-bcf1-4ae5-b838-7f4fb658856e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Include\pch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Include\Patches.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Include\Helpers.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Include\Hooks\Crypt.h">
<Filter>Header Files\Hooks</Filter>
</ClInclude>
<ClInclude Include="Include\Hooks\CRoblox.h">
<Filter>Header Files\Hooks</Filter>
</ClInclude>
<ClInclude Include="Include\Hooks\ServerReplicator.h">
<Filter>Header Files\Hooks</Filter>
</ClInclude>
<ClInclude Include="Include\Hooks\StandardOut.h">
<Filter>Header Files\Hooks</Filter>
</ClInclude>
<ClInclude Include="Include\Hooks\Http.h">
<Filter>Header Files\Hooks</Filter>
</ClInclude>
<ClInclude Include="Include\Hooks\Context.h">
<Filter>Header Files\Hooks</Filter>
</ClInclude>
<ClInclude Include="Include\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Include\Discord.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Include\Server.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Include\Hooks\DataModel.h">
<Filter>Header Files\Hooks</Filter>
</ClInclude>
<ClInclude Include="Include\Configuration.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="dllmain.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pch.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Patches.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Helpers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Hooks\Crypt.cpp">
<Filter>Source Files\Hooks</Filter>
</ClCompile>
<ClCompile Include="Hooks\CRoblox.cpp">
<Filter>Source Files\Hooks</Filter>
</ClCompile>
<ClCompile Include="Hooks\ServerReplicator.cpp">
<Filter>Source Files\Hooks</Filter>
</ClCompile>
<ClCompile Include="Hooks\StandardOut.cpp">
<Filter>Source Files\Hooks</Filter>
</ClCompile>
<ClCompile Include="Hooks\Http.cpp">
<Filter>Source Files\Hooks</Filter>
</ClCompile>
<ClCompile Include="Hooks\Context.cpp">
<Filter>Source Files\Hooks</Filter>
</ClCompile>
<ClCompile Include="Discord.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Server.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Hooks\DataModel.cpp">
<Filter>Source Files\Hooks</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Kiseki.DLL.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>

View File

@ -0,0 +1,12 @@
#pragma once
#define VERSION_MAJOR_MINOR_STR "1.0"
#define VERSION_MAJOR_MINOR_PATCH_STR "1.0.0"
#define VERSION_FULL_STR "1.0.0.0"
#define VERSION_RESOURCE 1, 0, 0, 0
#define VERSION_RESOURCE_STR VERSION_FULL_STR "\0"
#define APP_NAME "Kiseki.Patcher"
#define APP_DESCRIPTION "Client Functionality Library"
#define APP_ORGANIZATION "Kiseki"
#define APP_COPYRIGHT "Copyright (c) Kiseki 2023"

View File

@ -0,0 +1,36 @@
#include "Information.h"
#include <winres.h>
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_RESOURCE
PRODUCTVERSION VERSION_RESOURCE
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", APP_ORGANIZATION "\0"
VALUE "FileDescription", APP_DESCRIPTION "\0"
VALUE "FileVersion", VERSION_FULL_STR "\0"
VALUE "LegalCopyright", APP_COPYRIGHT "\0"
VALUE "ProductName", APP_NAME "\0"
VALUE "ProductVersion", VERSION_FULL_STR "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0409, 1200
END
END

View File

@ -1,124 +1,122 @@
#include "pch.h" #ifdef PLAYER
#include "Discord.h" #include "Discord.hpp"
#ifdef PLAYER bool isRunning = false;
std::string username;
bool isRunning = false; int placeId;
std::string username;
int placeId; void Discord::Initialize(const std::string joinScriptUrl)
{
void Discord::Initialize(const std::string joinScriptUrl) std::pair<bool, std::map<std::string, std::string>> parsed = Helpers::parseURL(joinScriptUrl);
{
std::pair<bool, std::map<std::string, std::string>> parsed = Helpers::parseURL(joinScriptUrl); if (!parsed.first)
{
if (!parsed.first) return;
{ }
return;
} if (parsed.second["query"].empty())
{
if (parsed.second["query"].empty()) return;
{ }
return;
} std::map<std::string, std::string> query = Helpers::parseQueryString(parsed.second["query"]);
std::map<std::string, std::string> query = Helpers::parseQueryString(parsed.second["query"]); if (query.find("ticket") == query.end())
{
if (query.find("ticket") == query.end()) return;
{ }
return;
} if (query.find("discord") == query.end())
{
if (query.find("discord") == query.end()) return;
{ }
return;
} if (query["ticket"].empty())
{
if (query["ticket"].empty()) return;
{ }
return;
} if (query["discord"] == "0")
{
if (query["discord"] == "0") return;
{ }
return;
} // Get the username and placeId
std::pair<bool, std::string> response = Helpers::httpGet(Helpers::getBaseUrl() + std::string("/api/places/information?ticket=" + query["ticket"]));
// Get the username and placeId if (!response.first)
std::pair<bool, std::string> response = Helpers::httpGet(BASE_URL + std::string("/api/places/information?ticket=" + query["ticket"])); {
if (!response.first) return;
{ }
return;
} rapidjson::Document document;
document.Parse(response.second.c_str());
rapidjson::Document document;
document.Parse(response.second.c_str()); if (document.HasParseError() || !document.HasMember("username") || !document.HasMember("placeId"))
{
if (document.HasParseError() || !document.HasMember("username") || !document.HasMember("placeId")) return;
{ }
return;
} username = document["username"].GetString();
placeId = document["placeId"].GetInt();
username = document["username"].GetString();
placeId = document["placeId"].GetInt(); Discord::Update();
Discord::Update(); // Run the updater
std::thread updater(Discord::Update);
// Run the updater updater.join();
std::thread updater(Discord::Update); }
updater.join();
} void Discord::Update()
{
void Discord::Update() isRunning = true;
{
isRunning = true; while (isRunning)
{
while (isRunning) std::this_thread::sleep_for(std::chrono::milliseconds(60 * 1000));
{
std::this_thread::sleep_for(std::chrono::milliseconds(60 * 1000)); std::string title = "";
int size = 0;
std::string title = ""; int max = 0;
int size = 0;
int max = 0; // Get title, size, and max
std::pair<bool, std::string> response = Helpers::httpGet(Helpers::getBaseUrl() + std::string("/api/places/information?id=" + placeId));
// Get title, size, and max if (!response.first)
std::pair<bool, std::string> response = Helpers::httpGet(BASE_URL + std::string("/api/places/information?id=" + placeId)); {
if (!response.first) return;
{ }
return;
} rapidjson::Document document;
document.Parse(response.second.c_str());
rapidjson::Document document;
document.Parse(response.second.c_str()); if (document.HasParseError() || !document.HasMember("title") || !document.HasMember("size") || !document.HasMember("max"))
{
if (document.HasParseError() || !document.HasMember("title") || !document.HasMember("size") || !document.HasMember("max")) return;
{ }
return;
} title = document["title"].GetString();
size = document["size"].GetInt();
title = document["title"].GetString(); max = document["max"].GetInt();
size = document["size"].GetInt();
max = document["max"].GetInt(); DiscordRichPresence presence;
memset(&presence, 0, sizeof(presence));
DiscordRichPresence presence;
memset(&presence, 0, sizeof(presence)); presence.largeImageText = username.c_str();
presence.largeImageKey = "logo";
presence.largeImageText = username.c_str(); presence.smallImageText = "2011";
presence.largeImageKey = "logo"; presence.smallImageKey = "2011";
presence.smallImageText = "2011";
presence.smallImageKey = "2011"; presence.details = title.c_str();
presence.state = "In a game";
presence.details = title.c_str(); presence.partySize = size;
presence.state = "In a game"; presence.partyMax = max;
presence.partySize = size; }
presence.partyMax = max; }
}
} void Discord::Cleanup()
{
void Discord::Cleanup() isRunning = false;
{ Discord_Shutdown();
isRunning = false; }
Discord_Shutdown();
}
#endif #endif

View File

@ -1,211 +1,209 @@
#include "pch.h" #include "Helpers.hpp"
#include "Helpers.h" #ifdef _DEBUG
const std::vector<BYTE> Helpers::publicKey = Helpers::base64Decode(PUBLIC_KEY);
#ifdef _DEBUG #else
const std::vector<BYTE> Helpers::publicKey = Helpers::base64Decode(PUBLIC_KEY); const std::vector<BYTE> Helpers::publicKey { PUBLIC_KEY };
#else #endif
const std::vector<BYTE> Helpers::publicKey { PUBLIC_KEY };
#endif const std::vector<std::string> Helpers::allowedWildcardDomains { ALLOWED_WILDCARD_DOMAINS };
const std::vector<std::string> Helpers::allowedDomains { ALLOWED_DOMAINS };
const std::vector<std::string> Helpers::allowedWildcardDomains { ALLOWED_WILDCARD_DOMAINS }; const std::vector<std::string> Helpers::allowedSchemes { ALLOWED_SCHEMES };
const std::vector<std::string> Helpers::allowedDomains { ALLOWED_DOMAINS }; const std::vector<std::string> Helpers::allowedEmbeddedSchemes { ALLOWED_EMBEDDED_SCHEMES };
const std::vector<std::string> Helpers::allowedSchemes { ALLOWED_SCHEMES };
const std::vector<std::string> Helpers::allowedEmbeddedSchemes { ALLOWED_EMBEDDED_SCHEMES }; // https://stackoverflow.com/questions/48212992/how-to-find-out-if-there-is-any-non-ascii-character-in-a-string-with-a-file-path
bool Helpers::isASCII(const std::string& s)
// https://stackoverflow.com/questions/48212992/how-to-find-out-if-there-is-any-non-ascii-character-in-a-string-with-a-file-path {
bool Helpers::isASCII(const std::string& s) return !std::any_of(s.begin(), s.end(), [](char c) {
{ return static_cast<unsigned char>(c) > 127;
return !std::any_of(s.begin(), s.end(), [](char c) { });
return static_cast<unsigned char>(c) > 127; }
});
} // https://stackoverflow.com/questions/313970/how-to-convert-an-instance-of-stdstring-to-lower-case
std::string Helpers::toLower(std::string s)
// https://stackoverflow.com/questions/313970/how-to-convert-an-instance-of-stdstring-to-lower-case {
std::string Helpers::toLower(std::string s) std::transform(s.begin(), s.end(), s.begin(), [](unsigned char c) { return std::tolower(c); });
{ return s;
std::transform(s.begin(), s.end(), s.begin(), [](unsigned char c) { return std::tolower(c); }); }
return s;
} // https://stackoverflow.com/a/44562527
std::vector<BYTE> Helpers::base64Decode(const std::string_view data)
// https://stackoverflow.com/a/44562527 {
std::vector<BYTE> Helpers::base64Decode(const std::string_view data) // table from '+' to 'z'
{ const uint8_t lookup[] = {
// table from '+' to 'z' 62, 255, 62, 255, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 255,
const uint8_t lookup[] = { 255, 0, 255, 255, 255, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
62, 255, 62, 255, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 255, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
255, 0, 255, 255, 255, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 255, 255, 255, 255, 63, 255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51
255, 255, 255, 255, 63, 255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, };
36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51
}; static_assert(sizeof(lookup) == 'z' - '+' + 1);
static_assert(sizeof(lookup) == 'z' - '+' + 1); std::vector<unsigned char> out;
int val = 0, valb = -8;
std::vector<unsigned char> out; for (uint8_t c : data)
int val = 0, valb = -8; {
for (uint8_t c : data) if (c < '+' || c > 'z')
{ {
if (c < '+' || c > 'z') break;
{ }
break;
} c -= '+';
if (lookup[c] >= 64)
c -= '+'; {
if (lookup[c] >= 64) break;
{ }
break;
} val = (val << 6) + lookup[c];
valb += 6;
val = (val << 6) + lookup[c];
valb += 6; if (valb >= 0)
{
if (valb >= 0) out.push_back(char((val >> valb) & 0xFF));
{ valb -= 8;
out.push_back(char((val >> valb) & 0xFF)); }
valb -= 8; }
}
} return out;
}
return out;
} // https://stackoverflow.com/a/28269049
std::map<std::string, std::string> Helpers::parseQueryString(const std::string query)
// https://stackoverflow.com/a/28269049 {
std::map<std::string, std::string> Helpers::parseQueryString(const std::string query) std::istringstream stream(query);
{ std::map<std::string, std::string> parsed;
std::istringstream stream(query); std::string pair, key, value;
std::map<std::string, std::string> parsed;
std::string pair, key, value; while (std::getline(stream, pair, '&')) // split each term
{
while (std::getline(stream, pair, '&')) // split each term std::istringstream term(pair);
{
std::istringstream term(pair); if (std::getline(std::getline(term, key, '='), value))
{
if (std::getline(std::getline(term, key, '='), value)) parsed[key] = value;
{ }
parsed[key] = value; }
}
} return parsed;
}
return parsed;
} std::string Helpers::joinQueryString(const std::map<std::string, std::string> query)
{
std::string Helpers::joinQueryString(const std::map<std::string, std::string> query) std::stringstream stream;
{ stream << "?";
std::stringstream stream;
stream << "?"; for (auto const& pair : query)
{
for (auto const& pair : query) stream << pair.first << "=" << pair.second << "&";
{ }
stream << pair.first << "=" << pair.second << "&";
} std::string result = stream.str();
result.pop_back(); // remove ending ampersand
std::string result = stream.str();
result.pop_back(); // remove ending ampersand return result;
}
return result;
} // https://stackoverflow.com/a/12097772
std::string Helpers::ws2s(const std::wstring widestring)
// https://stackoverflow.com/a/12097772 {
std::string Helpers::ws2s(const std::wstring widestring) std::string string;
{ std::transform(widestring.begin(), widestring.end(), std::back_inserter(string), [](wchar_t c) {
std::string string; return (char)c;
std::transform(widestring.begin(), widestring.end(), std::back_inserter(string), [](wchar_t c) { });
return (char)c;
}); return string;
}
return string;
} size_t Helpers::write(char* contents, size_t size, size_t memory, void* pointer)
{
size_t Helpers::write(char* contents, size_t size, size_t memory, void* pointer) ((std::string*)pointer)->append((char*)contents, size * memory);
{ return size * memory;
((std::string*)pointer)->append((char*)contents, size * memory); }
return size * memory;
} std::string Helpers::getModulePath()
{
std::string Helpers::getModulePath() char buffer[MAX_PATH];
{ GetModuleFileNameA(NULL, buffer, MAX_PATH);
char buffer[MAX_PATH];
GetModuleFileNameA(NULL, buffer, MAX_PATH); return std::string(buffer);
}
return std::string(buffer);
} std::string Helpers::getISOTimestamp()
{
std::string Helpers::getISOTimestamp() time_t now = time(0);
{ struct tm now_gmt {};
time_t now = time(0);
struct tm now_gmt {}; gmtime_s(&now_gmt, &now);
gmtime_s(&now_gmt, &now); char buffer[20];
strftime(buffer, sizeof(buffer), "%FT%TZ", &now_gmt);
char buffer[20];
strftime(buffer, sizeof(buffer), "%FT%TZ", &now_gmt); return std::string(buffer);
}
return std::string(buffer);
} std::pair<bool, std::map<std::string, std::string>> Helpers::parseURL(const std::string url)
{
std::pair<bool, std::map<std::string, std::string>> Helpers::parseURL(const std::string url) CURLU* curl = curl_url();
{ CURLUcode result = curl_url_set(curl, CURLUPART_URL, url.c_str(), 0);
CURLU* curl = curl_url();
CURLUcode result = curl_url_set(curl, CURLUPART_URL, url.c_str(), 0); std::map<std::string, std::string> map;
bool success = false;
std::map<std::string, std::string> map;
bool success = false; if (result == CURLE_OK)
{
if (result == CURLE_OK) success = true;
{
success = true; char* path;
char* host;
char* path; char* query;
char* host;
char* query; curl_url_get(curl, CURLUPART_PATH, &path, 0);
curl_url_get(curl, CURLUPART_HOST, &host, 0);
curl_url_get(curl, CURLUPART_PATH, &path, 0); curl_url_get(curl, CURLUPART_QUERY, &query, 0);
curl_url_get(curl, CURLUPART_HOST, &host, 0); curl_url_cleanup(curl);
curl_url_get(curl, CURLUPART_QUERY, &query, 0);
curl_url_cleanup(curl); map = {
{ "path", std::string(path) },
map = { { "host", std::string(host) },
{ "path", std::string(path) }, { "query", std::string(query) }
{ "host", std::string(host) }, };
{ "query", std::string(query) }
}; curl_free(path);
curl_free(host);
curl_free(path); curl_free(query);
curl_free(host); }
curl_free(query);
} return std::make_pair(success, map);
}
return std::make_pair(success, map);
} std::pair<bool, std::string> Helpers::httpGet(const std::string url)
{
std::pair<bool, std::string> Helpers::httpGet(const std::string url) bool success = false;
{ std::string data;
bool success = false;
std::string data; CURL* curl = curl_easy_init();
CURLcode result;
CURL* curl = curl_easy_init(); long response = 0;
CURLcode result;
long response = 0; if (!curl)
{
if (!curl) return std::make_pair(false, "");
{ }
return std::make_pair(false, "");
} curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, Helpers::write);
curl_easy_setopt(curl, CURLOPT_URL, url); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &data);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, Helpers::write);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &data); result = curl_easy_perform(curl);
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response);
result = curl_easy_perform(curl);
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response); curl_easy_cleanup(curl);
curl_easy_cleanup(curl); if (result != CURLE_OK || response != 200)
{
if (result != CURLE_OK || response != 200) return std::make_pair(false, "");
{ }
return std::make_pair(false, "");
} return std::make_pair(true, data);
}
return std::make_pair(true, data);
}

View File

@ -1,150 +1,148 @@
#include "pch.h" #include "Hooks/CRoblox.hpp"
#include "Hooks/CRoblox.h" #ifdef SERVER
#include "Server.h"
#ifdef SERVER #endif
#include "Server.h"
#endif bool hasAuthenticationUrl = false;
bool hasAuthenticationTicket = false;
bool hasAuthenticationUrl = false; bool hasJoinScriptUrl = false;
bool hasAuthenticationTicket = false; bool hasJobId = false;
bool hasJoinScriptUrl = false;
bool hasJobId = false; std::wstring authenticationUrl;
std::wstring authenticationTicket;
std::wstring authenticationUrl; std::wstring joinScriptUrl;
std::wstring authenticationTicket; std::wstring jobId;
std::wstring joinScriptUrl;
std::wstring jobId; CRobloxApp__InitInstance_t CRobloxApp__InitInstance = (CRobloxApp__InitInstance_t)ADDRESS_CROBLOXAPP__INITINSTANCE;
CRobloxCommandLineInfo__ParseParam_t CRobloxCommandLineInfo__ParseParam = (CRobloxCommandLineInfo__ParseParam_t)ADDRESS_CROBLOXCOMMANDLINEINFO__PARSEPARAM;
CRobloxApp__InitInstance_t CRobloxApp__InitInstance = (CRobloxApp__InitInstance_t)ADDRESS_CROBLOXAPP__INITINSTANCE;
CRobloxCommandLineInfo__ParseParam_t CRobloxCommandLineInfo__ParseParam = (CRobloxCommandLineInfo__ParseParam_t)ADDRESS_CROBLOXCOMMANDLINEINFO__PARSEPARAM; BOOL __fastcall CRobloxApp__InitInstance_hook(CRobloxApp* _this)
{
BOOL __fastcall CRobloxApp__InitInstance_hook(CRobloxApp* _this) if (!CRobloxApp__InitInstance(_this))
{ {
if (!CRobloxApp__InitInstance(_this)) return FALSE;
{ }
return FALSE;
} CApp* app = reinterpret_cast<CApp*>(CLASSLOCATION_CAPP);
CApp* app = reinterpret_cast<CApp*>(CLASSLOCATION_CAPP); if (hasAuthenticationUrl && hasAuthenticationTicket && !authenticationUrl.empty() && !authenticationTicket.empty())
{
if (hasAuthenticationUrl && hasAuthenticationTicket && !authenticationUrl.empty() && !authenticationTicket.empty()) CApp__RobloxAuthenticate(app, nullptr, authenticationUrl.c_str(), authenticationTicket.c_str());
{ }
CApp__RobloxAuthenticate(app, nullptr, authenticationUrl.c_str(), authenticationTicket.c_str());
} if (hasJoinScriptUrl && !joinScriptUrl.empty())
{
if (hasJoinScriptUrl && !joinScriptUrl.empty()) try
{ {
try CRobloxDoc* document = CRobloxApp__CreateDocument(_this);
{ CWorkspace__ExecUrlScript(document->workspace, joinScriptUrl.c_str(), VARIANT(), VARIANT(), VARIANT(), VARIANT(), nullptr);
CRobloxDoc* document = CRobloxApp__CreateDocument(_this); }
CWorkspace__ExecUrlScript(document->workspace, joinScriptUrl.c_str(), VARIANT(), VARIANT(), VARIANT(), VARIANT(), nullptr); catch (std::runtime_error)
} {
catch (std::runtime_error) return FALSE;
{ }
return FALSE; }
}
} #ifdef PLAYER
if (!hasAuthenticationUrl || !hasAuthenticationTicket || !hasJoinScriptUrl)
#ifdef PLAYER {
if (!hasAuthenticationUrl || !hasAuthenticationTicket || !hasJoinScriptUrl) return FALSE;
{ }
return FALSE; #endif
}
#endif #ifdef SERVER
if (!hasAuthenticationUrl || !hasAuthenticationTicket || !hasJoinScriptUrl || !hasJobId)
#ifdef SERVER {
if (!hasAuthenticationUrl || !hasAuthenticationTicket || !hasJoinScriptUrl || !hasJobId) ShellExecute(0, 0, L"https://kiseki.lol/games", 0, 0, SW_SHOW);
{ return FALSE;
ShellExecute(0, 0, L"https://kiseki.lol/games", 0, 0, SW_SHOW); }
return FALSE; #endif
}
#endif return TRUE;
}
return TRUE;
} void __fastcall CRobloxCommandLineInfo__ParseParam_hook(CRobloxCommandLineInfo* _this, void*, const char* pszParam, BOOL bFlag, BOOL bLast)
{
void __fastcall CRobloxCommandLineInfo__ParseParam_hook(CRobloxCommandLineInfo* _this, void*, const char* pszParam, BOOL bFlag, BOOL bLast) if (hasJoinScriptUrl && joinScriptUrl.empty())
{ {
if (hasJoinScriptUrl && joinScriptUrl.empty()) int size = MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), nullptr, 0);
{ joinScriptUrl.resize(size);
int size = MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), nullptr, 0); MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), &joinScriptUrl[0], size);
joinScriptUrl.resize(size);
MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), &joinScriptUrl[0], size); _this->m_bRunAutomated = TRUE;
_this->m_bRunAutomated = TRUE; CCommandLineInfo__ParseLast(_this, bLast);
CCommandLineInfo__ParseLast(_this, bLast); #ifdef PLAYER
Discord::Initialize(Helpers::ws2s(joinScriptUrl));
#ifdef PLAYER #endif
Discord::Initialize(Helpers::ws2s(joinScriptUrl)); }
#endif
} if (hasAuthenticationUrl && authenticationUrl.empty())
{
if (hasAuthenticationUrl && authenticationUrl.empty()) int size = MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), nullptr, 0);
{ authenticationUrl.resize(size);
int size = MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), nullptr, 0); MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), &authenticationUrl[0], size);
authenticationUrl.resize(size);
MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), &authenticationUrl[0], size); CCommandLineInfo__ParseLast(_this, bLast);
return;
CCommandLineInfo__ParseLast(_this, bLast); }
return;
} if (hasAuthenticationTicket && authenticationTicket.empty())
{
if (hasAuthenticationTicket && authenticationTicket.empty()) int size = MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), nullptr, 0);
{ authenticationTicket.resize(size);
int size = MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), nullptr, 0); MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), &authenticationTicket[0], size);
authenticationTicket.resize(size);
MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), &authenticationTicket[0], size); CCommandLineInfo__ParseLast(_this, bLast);
return;
CCommandLineInfo__ParseLast(_this, bLast); }
return;
} #ifdef SERVER
if (hasJobId && jobId.empty())
#ifdef SERVER {
if (hasJobId && jobId.empty()) int size = MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), nullptr, 0);
{ jobId.resize(size);
int size = MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), nullptr, 0); MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), &jobId[0], size);
jobId.resize(size);
MultiByteToWideChar(CP_ACP, 0, pszParam, strlen(pszParam), &jobId[0], size); CCommandLineInfo__ParseLast(_this, bLast);
return;
CCommandLineInfo__ParseLast(_this, bLast); }
return; #endif
}
#endif if (bFlag && _stricmp(pszParam, "a") == 0)
{
if (bFlag && _stricmp(pszParam, "a") == 0) hasAuthenticationUrl = true;
{ CCommandLineInfo__ParseLast(_this, bLast);
hasAuthenticationUrl = true; return;
CCommandLineInfo__ParseLast(_this, bLast); }
return;
} if (bFlag && _stricmp(pszParam, "t") == 0)
{
if (bFlag && _stricmp(pszParam, "t") == 0) hasAuthenticationTicket = true;
{ CCommandLineInfo__ParseLast(_this, bLast);
hasAuthenticationTicket = true; return;
CCommandLineInfo__ParseLast(_this, bLast); }
return;
} if (bFlag && _stricmp(pszParam, "j") == 0)
{
if (bFlag && _stricmp(pszParam, "j") == 0) hasJoinScriptUrl = true;
{ CCommandLineInfo__ParseLast(_this, bLast);
hasJoinScriptUrl = true; return;
CCommandLineInfo__ParseLast(_this, bLast); }
return;
} #ifdef SERVER
if (bFlag && _stricmp(pszParam, "jobId") == 0)
#ifdef SERVER {
if (bFlag && _stricmp(pszParam, "jobId") == 0) hasJobId = true;
{ CCommandLineInfo__ParseLast(_this, bLast);
hasJobId = true;
CCommandLineInfo__ParseLast(_this, bLast); Server::Initialize(jobId);
Server::Initialize(jobId); return;
}
return; #endif
}
#endif CRobloxCommandLineInfo__ParseParam(_this, pszParam, bFlag, bLast);
CRobloxCommandLineInfo__ParseParam(_this, pszParam, bFlag, bLast);
} }

View File

@ -1,27 +1,24 @@
#include "pch.h" #ifdef _DEBUG
#include "Helpers.h" #include "Hooks/Context.hpp"
#include "Hooks/Context.h"
Context__requirePermission_t Context__requirePermission = (Context__requirePermission_t)ADDRESS_CONTEXT__REQUIREPERMISSION;
#ifdef _DEBUG
void __fastcall Context__requirePermission_hook(void* _this, void*, int permission, const char* operation)
Context__requirePermission_t Context__requirePermission = (Context__requirePermission_t)ADDRESS_CONTEXT__REQUIREPERMISSION; {
int identity = ((int*)_this)[0];
void __fastcall Context__requirePermission_hook(void* _this, void*, int permission, const char* operation)
{ if (!Context__isInRole(identity, permission))
int identity = ((int*)_this)[0]; {
if (operation != 0)
if (!Context__isInRole(identity, permission)) {
{ throw std::runtime_error("The current identity (" + std::to_string(identity) + ") cannot " + std::string(operation) + " (requires " + std::to_string(permission) + ")");
if (operation != 0) }
{ else
throw std::runtime_error("The current identity (" + std::to_string(identity) + ") cannot " + std::string(operation) + " (requires " + std::to_string(permission) + ")"); {
} throw std::runtime_error("The current identity (" + std::to_string(identity) + ") cannot perform the requested operation (requires " + std::to_string(permission) + ")");
else }
{ }
throw std::runtime_error("The current identity (" + std::to_string(identity) + ") cannot perform the requested operation (requires " + std::to_string(permission) + ")"); }
}
}
}
#endif #endif

View File

@ -1,131 +1,130 @@
#include "pch.h" #include "Hooks/Crypt.hpp"
#include "Patches.h" #include "Helpers.hpp"
#include "Helpers.h" #include "Patches.hpp"
#include "Hooks/Crypt.h"
Crypt::Crypt()
Crypt::Crypt() {
{ if (!CryptAcquireContext(&context, NULL, MS_ENH_RSA_AES_PROV, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
if (!CryptAcquireContext(&context, NULL, MS_ENH_RSA_AES_PROV, PROV_RSA_AES, CRYPT_VERIFYCONTEXT)) {
{ if (::GetLastError() == NTE_BAD_KEYSET)
if (::GetLastError() == NTE_BAD_KEYSET) {
{ if (!CryptAcquireContext(&context, NULL, MS_ENH_RSA_AES_PROV, PROV_RSA_AES, CRYPT_VERIFYCONTEXT | CRYPT_NEWKEYSET))
if (!CryptAcquireContext(&context, NULL, MS_ENH_RSA_AES_PROV, PROV_RSA_AES, CRYPT_VERIFYCONTEXT | CRYPT_NEWKEYSET)) {
{ throw std::runtime_error("Error during CryptAcquireContext 2");
throw std::runtime_error("Error during CryptAcquireContext 2\n"); }
} }
} else
else {
{ throw std::runtime_error("Error during CryptAcquireContext");
throw std::runtime_error("Error during CryptAcquireContext\n"); }
} }
}
try
try {
{ BYTE* blob = new BYTE[Helpers::publicKey.size()];
BYTE* blob = new BYTE[Helpers::publicKey.size()]; std::copy(Helpers::publicKey.begin(), Helpers::publicKey.end(), blob);
std::copy(Helpers::publicKey.begin(), Helpers::publicKey.end(), blob);
if (!CryptImportKey(context, blob, Helpers::publicKey.size(), 0, 0, &key))
if (!CryptImportKey(context, blob, Helpers::publicKey.size(), 0, 0, &key)) {
{ throw std::runtime_error("");
throw std::runtime_error(""); }
} }
} catch (...)
catch (...) {
{ #ifdef _DEBUG
#ifdef _DEBUG throw std::runtime_error("Failed to import public key");
throw std::runtime_error("Failed to import public key"); #else
#else throw std::runtime_error("Error during CryptImportKey");
throw std::runtime_error("Error during CryptImportKey"); #endif
#endif }
} }
}
Crypt::~Crypt()
Crypt::~Crypt() {
{ CryptDestroyKey(key);
CryptDestroyKey(key); CryptReleaseContext(context, 0);
CryptReleaseContext(context, 0); }
}
bool Crypt::verifySignatureBase64(std::string message, std::string signatureBase64, ALG_ID algorithm = CALG_SHA_256)
bool Crypt::verifySignatureBase64(std::string message, std::string signatureBase64, ALG_ID algorithm = CALG_SHA_256) {
{ // Check for a reasonable signature length before verifying
// Check for a reasonable signature length before verifying if (signatureBase64.length() > 4096)
if (signatureBase64.length() > 4096) {
{ return false;
return false; }
}
HCRYPTHASH hash;
HCRYPTHASH hash;
if (!CryptCreateHash(context, algorithm, NULL, 0, &hash))
if (!CryptCreateHash(context, algorithm, NULL, 0, &hash)) {
{ throw std::runtime_error("");
throw std::runtime_error(""); }
}
try
try {
{ if (!CryptHashData(hash, (BYTE*)message.c_str(), message.size(), 0))
if (!CryptHashData(hash, (BYTE*)message.c_str(), message.size(), 0)) {
{ return false;
return false; }
}
std::vector<BYTE> signature = Helpers::base64Decode(signatureBase64);
std::vector<BYTE> signature = Helpers::base64Decode(signatureBase64);
/*
/* The native cryptography API uses little-endian byte order
The native cryptography API uses little-endian byte order while OpenSSL uses big-endian byte order.
while OpenSSL uses big-endian byte order.
If you are verifying a signature generated by using a OpenSSL API
If you are verifying a signature generated by using a OpenSSL API (or similar), you must swap the order of signature bytes before
(or similar), you must swap the order of signature bytes before calling the CryptVerifySignature function to verify the signature.
calling the CryptVerifySignature function to verify the signature. */
*/
std::reverse(signature.begin(), signature.end());
std::reverse(signature.begin(), signature.end());
BYTE* signatureData = new BYTE[signature.size()];
BYTE* signatureData = new BYTE[signature.size()]; std::copy(signature.begin(), signature.end(), signatureData);
std::copy(signature.begin(), signature.end(), signatureData);
if (!CryptVerifySignature(hash, signatureData, signature.size(), key, NULL, 0))
if (!CryptVerifySignature(hash, signatureData, signature.size(), key, NULL, 0)) {
{ return false;
return false; }
} }
} catch (...)
catch (...) {
{ ::CryptDestroyHash(hash);
::CryptDestroyHash(hash); return false;
return false; }
}
::CryptDestroyHash(hash);
::CryptDestroyHash(hash);
return true;
return true; }
}
Crypt__verifySignatureBase64_t Crypt__verifySignatureBase64 = (Crypt__verifySignatureBase64_t)ADDRESS_CRYPT__VERIFYSIGNATUREBASE64;
Crypt__verifySignatureBase64_t Crypt__verifySignatureBase64 = (Crypt__verifySignatureBase64_t)ADDRESS_CRYPT__VERIFYSIGNATUREBASE64;
// Crypt::verifySignatureBase64(std::string message, std::string signatureBase64)
// Crypt::verifySignatureBase64(std::string message, std::string signatureBase64) void __fastcall Crypt__verifySignatureBase64_hook(HCRYPTPROV* _this, void*, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15)
void __fastcall Crypt__verifySignatureBase64_hook(HCRYPTPROV* _this, void*, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15) {
{ // We have to reconstruct the parameters by hand since using the original function signature causes crashes
// We have to reconstruct the parameters by hand since using the original function signature causes crashes
std::string message;
std::string message; std::string signatureBase64;
std::string signatureBase64;
// Get message
// Get message message = std::string(reinterpret_cast<const char*>(pbData), dwDataLen);
message = std::string(reinterpret_cast<const char*>(pbData), dwDataLen);
// Get signatureBase64
// Get signatureBase64 int* v21 = (int*)a10;
int* v21 = (int*)a10; if ((unsigned int)a15 < 0x10)
if ((unsigned int)a15 < 0x10) {
{ v21 = &a10;
v21 = &a10; }
}
signatureBase64 = std::string(reinterpret_cast<const char*>(v21), a14);
signatureBase64 = std::string(reinterpret_cast<const char*>(v21), a14);
// Verify signature
// Verify signature if (!Crypt().verifySignatureBase64(message, signatureBase64, CALG_SHA_256))
if (!Crypt().verifySignatureBase64(message, signatureBase64, CALG_SHA_256)) {
{ throw std::runtime_error("");
throw std::runtime_error(""); }
}
} }

View File

@ -1,22 +1,20 @@
#include "pch.h" #ifdef SERVER
#include "Hooks/DataModel.h" #include "Hooks/DataModel.hpp"
#ifdef SERVER bool setJobId = false;
bool setJobId = false; DataModel__getJobId_t DataModel__getJobId = (DataModel__getJobId_t)ADDRESS_DATAMODEL__GETJOBID;
DataModel__getJobId_t DataModel__getJobId = (DataModel__getJobId_t)ADDRESS_DATAMODEL__GETJOBID; int __fastcall DataModel__getJobId_hook(DataModel* _this, void*, int a2)
{
int __fastcall DataModel__getJobId_hook(DataModel* _this, void*, int a2) if (!setJobId && hasJobId && !jobId.empty())
{ {
if (!setJobId && hasJobId && !jobId.empty()) _this->jobId = Helpers::ws2s(jobId);
{ setJobId = true;
_this->jobId = Helpers::ws2s(jobId); }
setJobId = true;
} return DataModel__getJobId(_this, a2);
}
return DataModel__getJobId(_this, a2);
} #endif
#endif

View File

@ -1,149 +1,147 @@
#include "pch.h" #include "Hooks/Http.hpp"
#include "Hooks/Http.h" #define CHECK(condition, code) \
if(!error) { \
#define CHECK(condition, code) \ if ((condition)) { \
if(!error) { \ error = code; \
if ((condition)) { \ } \
error = code; \ }
} \
} Http__httpGetPostWinInet_t Http__httpGetPostWinInet = (Http__httpGetPostWinInet_t)ADDRESS_HTTP__HTTPGETPOSTWININET;
Http__trustCheck_t Http__trustCheck = (Http__trustCheck_t)ADDRESS_HTTP__TRUSTCHECK;
Http__httpGetPostWinInet_t Http__httpGetPostWinInet = (Http__httpGetPostWinInet_t)ADDRESS_HTTP__HTTPGETPOSTWININET;
Http__trustCheck_t Http__trustCheck = (Http__trustCheck_t)ADDRESS_HTTP__TRUSTCHECK; void __fastcall Http__httpGetPostWinInet_hook(Http* _this, void*, bool isPost, int a3, bool compressData, LPCSTR additionalHeaders, int a6)
{
void __fastcall Http__httpGetPostWinInet_hook(Http* _this, void*, bool isPost, int a3, bool compressData, LPCSTR additionalHeaders, int a6) std::pair<bool, std::map<std::string, std::string>> parsed = Helpers::parseURL(_this->url);
{ Http _changed = *_this;
std::pair<bool, std::map<std::string, std::string>> parsed = Helpers::parseURL(_this->url);
Http _changed = *_this; if (parsed.first)
{
if (parsed.first) std::map<std::string, std::string> url = parsed.second;
{
std::map<std::string, std::string> url = parsed.second; if (!url["path"].empty() && !url["host"].empty() && !url["query"].empty())
{
if (!url["path"].empty() && !url["host"].empty() && !url["query"].empty()) url["path"] = Helpers::toLower(url["path"]);
{
url["path"] = Helpers::toLower(url["path"]); if (url["host"] == "roblox.com" || url["host"] == "www.roblox.com")
{
if (url["host"] == "roblox.com" || url["host"] == "www.roblox.com") if (url["path"] == "/asset" || url["path"] == "/asset/" || url["path"] == "/asset/default.ashx")
{ {
if (url["path"] == "/asset" || url["path"] == "/asset/" || url["path"] == "/asset/default.ashx") _changed.url = "https://assetdelivery.roblox.com/v1/asset/?" + url["query"];
{ _this = &_changed;
_changed.url = "https://assetdelivery.roblox.com/v1/asset/?" + url["query"]; }
_this = &_changed; else if (url["path"] == "/thumbs/asset.ashx" || url["path"] == "/thumbs/avatar.ashx")
} {
else if (url["path"] == "/thumbs/asset.ashx" || url["path"] == "/thumbs/avatar.ashx") std::string api = "https://www.roblox.com/" + std::string(url["path"] == "/thumbs/asset.ashx" ? "asset" : "avatar") + "/request-thumbnail-fix";
{
std::string api = "https://www.roblox.com/" + std::string(url["path"] == "/thumbs/asset.ashx" ? "asset" : "avatar") + "/request-thumbnail-fix"; std::map<std::string, std::string> source = Helpers::parseQueryString(url["query"]);
std::map<std::string, std::string> fixed = {
std::map<std::string, std::string> source = Helpers::parseQueryString(url["query"]); { url["path"] == "/thumbs/asset.ashx" ? "overrideModeration" : "dummy", "false" },
std::map<std::string, std::string> fixed = { { "thumbnailFormatId", "0" }
{ url["path"] == "/thumbs/asset.ashx" ? "overrideModeration" : "dummy", "false" }, };
{ "thumbnailFormatId", "0" }
}; for (auto& pair : source)
{
for (auto& pair : source) fixed[Helpers::toLower(pair.first)] = pair.second;
{ }
fixed[Helpers::toLower(pair.first)] = pair.second;
} if (fixed.find("id") != fixed.end())
{
if (fixed.find("id") != fixed.end()) auto handler = fixed.extract("id");
{ handler.key() = url["path"] == "/thumbs/asset.ashx" ? "assetId" : "userId";
auto handler = fixed.extract("id");
handler.key() = url["path"] == "/thumbs/asset.ashx" ? "assetId" : "userId"; fixed.insert(std::move(handler));
}
fixed.insert(std::move(handler));
} api += Helpers::joinQueryString(fixed);
api += Helpers::joinQueryString(fixed); // Get the API response
std::pair<bool, std::string> response = Helpers::httpGet(api);
// Get the API response if (!response.first)
std::pair<bool, std::string> response = Helpers::httpGet(api); {
if (!response.first) throw std::runtime_error("Unexpected error occurred when fetching Roblox API: 0x0");
{ }
throw std::runtime_error("Unexpected error occurred when fetching Roblox API: 0x0");
} std::string data = response.second;
std::string data = response.second; rapidjson::Document document;
document.Parse(data.c_str());
rapidjson::Document document;
document.Parse(data.c_str()); int error = 0;
int error = 0; CHECK(document.HasParseError(), 0x01);
CHECK(!document.HasMember("d"), 0x02);
CHECK(document.HasParseError(), 0x01); CHECK(!document["d"].IsObject(), 0x03);
CHECK(!document.HasMember("d"), 0x02); CHECK(!document["d"].HasMember("url"), 0x04);
CHECK(!document["d"].IsObject(), 0x03); CHECK(!document["d"]["url"].IsString(), 0x05);
CHECK(!document["d"].HasMember("url"), 0x04);
CHECK(!document["d"]["url"].IsString(), 0x05); if (error != 0)
{
if (error != 0) throw std::runtime_error("Unexpected error occurred when fetching Roblox API: 0x0" + std::to_string(error));
{ }
throw std::runtime_error("Unexpected error occurred when fetching Roblox API: 0x0" + std::to_string(error));
} _changed.url = document["d"]["url"].GetString();
_this = &_changed;
_changed.url = document["d"]["url"].GetString(); }
_this = &_changed; }
} }
} }
}
} #ifdef SERVER
if (Server::Handle)
#ifdef SERVER {
if (Server::Handle) Server::Log::Http((RequestType)isPost, _this->url);
{ }
Server::Log::Http((RequestType)isPost, _this->url); #endif
}
#endif Http__httpGetPostWinInet(_this, isPost, a3, compressData, additionalHeaders, a6);
}
Http__httpGetPostWinInet(_this, isPost, a3, compressData, additionalHeaders, a6);
} bool __fastcall Http__trustCheck_hook(const char* url)
{
bool __fastcall Http__trustCheck_hook(const char* url) if (strlen(url) == 7 && !Helpers::isASCII(url))
{ {
if (strlen(url) == 7 && !Helpers::isASCII(url)) url = ((char**)url)[0];
{ }
url = ((char**)url)[0];
} std::string _url = std::string(url);
std::string _url = std::string(url); if (_url == "about:blank")
{
if (_url == "about:blank") return true;
{ }
return true;
} for (std::string allowedEmbeddedScheme : Helpers::allowedEmbeddedSchemes)
{
for (std::string allowedEmbeddedScheme : Helpers::allowedEmbeddedSchemes) if (_url.rfind(allowedEmbeddedScheme + ":", 0) == 0)
{ {
if (_url.rfind(allowedEmbeddedScheme + ":", 0) == 0) return true;
{ }
return true; }
}
} std::pair<bool, std::map<std::string, std::string>> result = Helpers::parseURL(url);
if (!result.first)
std::pair<bool, std::map<std::string, std::string>> result = Helpers::parseURL(url); {
if (!result.first) return false;
{ }
return false;
} std::map<std::string, std::string> parsed = result.second;
std::map<std::string, std::string> parsed = result.second; if (!parsed["scheme"].empty() && !parsed["host"].empty())
{
if (!parsed["scheme"].empty() && !parsed["host"].empty()) if (std::find(Helpers::allowedSchemes.begin(), Helpers::allowedSchemes.end(), std::string(parsed["scheme"])) != Helpers::allowedSchemes.end())
{ {
if (std::find(Helpers::allowedSchemes.begin(), Helpers::allowedSchemes.end(), std::string(parsed["scheme"])) != Helpers::allowedSchemes.end()) for (std::string wildcard : Helpers::allowedWildcardDomains)
{ {
for (std::string wildcard : Helpers::allowedWildcardDomains) if (parsed["host"].size() >= wildcard.size() && 0 == wildcard.compare(parsed["host"].size() - wildcard.size(), wildcard.size(), wildcard))
{ {
if (parsed["host"].size() >= wildcard.size() && 0 == wildcard.compare(parsed["host"].size() - wildcard.size(), wildcard.size(), wildcard)) return true;
{ }
return true; }
}
} return std::find(Helpers::allowedDomains.begin(), Helpers::allowedDomains.end(), parsed["host"]) != Helpers::allowedDomains.end();
}
return std::find(Helpers::allowedDomains.begin(), Helpers::allowedDomains.end(), parsed["host"]) != Helpers::allowedDomains.end(); }
}
} return false;
return false;
} }

View File

@ -1,35 +1,33 @@
#include "pch.h" #ifdef SERVER
#include "Hooks/ServerReplicator.h" #include "Hooks/ServerReplicator.hpp"
#ifdef SERVER static std::map<ServerReplicator*, RakPeerInterface*> rakPeers;
static std::map<ServerReplicator*, RakPeerInterface*> rakPeers; ServerReplicator__sendTop_t ServerReplicator__sendTop = (ServerReplicator__sendTop_t)ADDRESS_SERVERREPLICATOR__SENDTOP;
ServerReplicator__processTicket_t ServerReplicator__processTicket = (ServerReplicator__processTicket_t)ADDRESS_SERVERREPLICATOR__PROCESSTICKET;
ServerReplicator__sendTop_t ServerReplicator__sendTop = (ServerReplicator__sendTop_t)ADDRESS_SERVERREPLICATOR__SENDTOP;
ServerReplicator__processTicket_t ServerReplicator__processTicket = (ServerReplicator__processTicket_t)ADDRESS_SERVERREPLICATOR__PROCESSTICKET; void __fastcall ServerReplicator__sendTop_hook(ServerReplicator* _this, void*, RakPeerInterface* peer)
{
void __fastcall ServerReplicator__sendTop_hook(ServerReplicator* _this, void*, RakPeerInterface* peer) if (_this->isAuthenticated)
{ {
if (_this->isAuthenticated) ServerReplicator__sendTop(_this, peer);
{ }
ServerReplicator__sendTop(_this, peer); else if (rakPeers.find(_this) == rakPeers.end())
} {
else if (rakPeers.find(_this) == rakPeers.end()) rakPeers.insert(std::pair<ServerReplicator*, RakPeerInterface*>(_this, peer));
{ }
rakPeers.insert(std::pair<ServerReplicator*, RakPeerInterface*>(_this, peer)); }
}
} void __fastcall ServerReplicator__processTicket_hook(ServerReplicator* _this, void*, Packet* packet)
{
void __fastcall ServerReplicator__processTicket_hook(ServerReplicator* _this, void*, Packet* packet) ServerReplicator__processTicket(_this, packet);
{
ServerReplicator__processTicket(_this, packet); auto pos = rakPeers.find(_this);
if (_this->isAuthenticated)
auto pos = rakPeers.find(_this); {
if (_this->isAuthenticated) ServerReplicator__sendTop_hook(_this, nullptr, pos->second);
{ }
ServerReplicator__sendTop_hook(_this, nullptr, pos->second); }
}
}
#endif #endif

View File

@ -1,26 +1,22 @@
#include "pch.h" #ifdef SERVER
#include "Hooks/StandardOut.h" #include "Hooks/StandardOut.hpp"
#ifdef SERVER StandardOut__print_t StandardOut__print = (StandardOut__print_t)ADDRESS_STANDARDOUT__PRINT;
StandardOut__print_t StandardOut__print = (StandardOut__print_t)ADDRESS_STANDARDOUT__PRINT; void __fastcall StandardOut__print_hook(int _this, void*, int type, std::string* message)
{
void __fastcall StandardOut__print_hook(int _this, void*, int type, std::string* message) StandardOut__print(_this, type, message);
{
StandardOut__print(_this, type, message); if (Server::Handle)
{
#ifdef SERVER #ifndef _DEBUG
if (Server::Handle) // Message pointer is offset 4 bytes when the DLL is compiled as release
{ message = reinterpret_cast<std::string*>((int)message + 4);
#ifndef _DEBUG #endif
// Message pointer is offset 4 bytes when the DLL is compiled as release
message = reinterpret_cast<std::string*>((int)message + 4); Server::Log::Output((LogSeverity)type, message->c_str());
#endif }
}
Server::Log::Output((LogSeverity)type, message->c_str());
}
#endif
}
#endif #endif

View File

@ -1,15 +1,13 @@
#include "pch.h" #include "Patcher.hpp"
#include "Patches.h" LONG Patcher::Apply()
{
LONG Patches::Apply() DetourTransactionBegin();
{
DetourTransactionBegin(); for (Patch patch : patchList)
{
for (Patch patch : patchList) DetourAttach(&(PVOID&)*patch.first, patch.second);
{ }
DetourAttach(&(PVOID&)*patch.first, patch.second);
} return DetourTransactionCommit();
return DetourTransactionCommit();
} }

View File

@ -1,99 +1,97 @@
#include "pch.h" #ifdef SERVER
#include "Server.h" #include "Server.hpp"
#ifdef SERVER HANDLE Server::Handle;
HANDLE Server::Handle; std::ofstream Server::OutputLog;
std::ofstream Server::HttpLog;
std::ofstream Server::OutputLog;
std::ofstream Server::HttpLog; std::string Server::OutputLogPath;
std::string Server::HttpLogPath;
std::string Server::OutputLogPath;
std::string Server::HttpLogPath; void Server::Initialize(const std::wstring jobId)
{
void Server::Initialize(const std::wstring jobId) std::string _jobId = Helpers::ws2s(jobId);
{ std::string signature = "Kiseki.Patcher v1.0.0";
std::string _jobId = Helpers::ws2s(jobId);
std::string signature = "Kiseki.Patcher v1.0.0"; #ifdef _DEBUG
signature += " (compiled as Debug)";
#ifdef _DEBUG #endif
signature += " (compiled as Debug)";
#endif AllocConsole();
freopen_s((FILE**)stdout, "CONOUT$", "w", stdout);
AllocConsole(); Server::Handle = CreateFileA("CONOUT$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
freopen_s((FILE**)stdout, "CONOUT$", "w", stdout); SetStdHandle(STD_OUTPUT_HANDLE, Server::Handle);
Server::Handle = CreateFileA("CONOUT$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
SetStdHandle(STD_OUTPUT_HANDLE, Server::Handle); printf((signature + "\n\n").c_str());
printf((signature + "\n\n").c_str()); // Initialize file logging
fs::create_directory(fs::path(Helpers::getModulePath()).parent_path() / "logs");
// Initialize file logging
fs::create_directory(fs::path(Helpers::getModulePath()).parent_path() / "logs"); OutputLogPath = (fs::path(Helpers::getModulePath()).parent_path() / "logs" / (_jobId + "-Output.log")).string();
HttpLogPath = (fs::path(Helpers::getModulePath()).parent_path() / "logs" / (_jobId + "-Http.log")).string();
OutputLogPath = (fs::path(Helpers::getModulePath()).parent_path() / "logs" / (_jobId + "-Output.log")).string();
HttpLogPath = (fs::path(Helpers::getModulePath()).parent_path() / "logs" / (_jobId + "-Http.log")).string(); OutputLog.open(OutputLogPath, std::ios::out);
HttpLog.open(HttpLogPath, std::ios::out);
OutputLog.open(OutputLogPath, std::ios::out);
HttpLog.open(HttpLogPath, std::ios::out); OutputLog << signature << " - StandardOut" << std::endl << std::endl;
HttpLog << signature << " - Http" << std::endl << std::endl;
OutputLog << signature << " - StandardOut" << std::endl << std::endl;
HttpLog << signature << " - Http" << std::endl << std::endl; OutputLog.close();
HttpLog.close();
OutputLog.close(); }
HttpLog.close();
} void Server::Log::Output(const LogSeverity severity, const std::string message)
{
void Server::Log::Output(const LogSeverity severity, const std::string message) std::string type;
{ std::string time = Helpers::getISOTimestamp();
std::string type;
std::string time = Helpers::getISOTimestamp(); switch (severity)
{
switch (severity) case LogSeverity::Output:
{ SetConsoleTextAttribute(Server::Handle, FOREGROUND_BLUE | FOREGROUND_INTENSITY);
case LogSeverity::Output: type = "out";
SetConsoleTextAttribute(Server::Handle, FOREGROUND_BLUE | FOREGROUND_INTENSITY); break;
type = "out"; case LogSeverity::Information:
break; SetConsoleTextAttribute(Server::Handle, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
case LogSeverity::Information: type = "info";
SetConsoleTextAttribute(Server::Handle, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE); break;
type = "info"; case LogSeverity::Warning:
break; SetConsoleTextAttribute(Server::Handle, FOREGROUND_RED | FOREGROUND_GREEN);
case LogSeverity::Warning: type = "warn";
SetConsoleTextAttribute(Server::Handle, FOREGROUND_RED | FOREGROUND_GREEN); break;
type = "warn"; case LogSeverity::Error:
break; type = "err";
case LogSeverity::Error: SetConsoleTextAttribute(Server::Handle, FOREGROUND_RED | FOREGROUND_INTENSITY);
type = "err"; break;
SetConsoleTextAttribute(Server::Handle, FOREGROUND_RED | FOREGROUND_INTENSITY); }
break;
} printf("%s\n", message.c_str());
SetConsoleTextAttribute(Server::Handle, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
printf("%s\n", message.c_str());
SetConsoleTextAttribute(Server::Handle, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE); OutputLog.open(OutputLogPath, std::ios::out);
OutputLog << "[" << time << "] [" << type << "] " << message << std::endl;
OutputLog.open(OutputLogPath, std::ios::out); OutputLog.close();
OutputLog << "[" << time << "] [" << type << "] " << message << std::endl; }
OutputLog.close();
} void Server::Log::Http(const RequestType request, const std::string url)
{
void Server::Log::Http(const RequestType request, const std::string url) std::string type;
{ std::string time = Helpers::getISOTimestamp();
std::string type;
std::string time = Helpers::getISOTimestamp(); type = (request == RequestType::GET ? "GET" : "POST");
type = (request == RequestType::GET ? "GET" : "POST"); HttpLog.open(HttpLogPath, std::ios::out);
HttpLog << "[" << time << "] [" << type << "] " << "'" << url << "'" << std::endl;
HttpLog.open(HttpLogPath, std::ios::out); HttpLog.close();
HttpLog << "[" << time << "] [" << type << "] " << "'" << url << "'" << std::endl; }
HttpLog.close();
} void Server::Cleanup()
{
void Server::Cleanup() CloseHandle(Server::Handle);
{ OutputLog.close();
CloseHandle(Server::Handle); HttpLog.close();
OutputLog.close(); }
HttpLog.close();
}
#endif #endif

View File

@ -1,101 +1,100 @@
#include "pch.h"
#include "Configuration.hpp"
#include "Configuration.h" #include "Patches.hpp"
#include "Patches.h"
#ifdef PLAYER
#ifndef SERVER #include "Discord.hpp"
#include "Discord.h" #endif
#endif
#ifdef SERVER
#ifdef SERVER #include "Server.hpp"
#include "Server.h" #endif
#endif
#include "Hooks/Http.hpp"
#include "Hooks/Http.h" #include "Hooks/Crypt.hpp"
#include "Hooks/Crypt.h" #include "Hooks/CRoblox.hpp"
#include "Hooks/CRoblox.h"
#ifdef _DEBUG
#ifdef _DEBUG #include "Hooks/Context.hpp"
#include "Hooks/Context.h" #endif
#endif
#ifdef SERVER
#ifdef SERVER #include "Hooks/DataModel.hpp"
#include "Hooks/DataModel.h" #include "Hooks/StandardOut.hpp"
#include "Hooks/StandardOut.h" #include "Hooks/ServerReplicator.hpp"
#include "Hooks/ServerReplicator.h" #endif
#endif
START_PATCH_LIST()
START_PATCH_LIST()
ADD_PATCH(Http__httpGetPostWinInet, Http__httpGetPostWinInet_hook)
ADD_PATCH(Http__httpGetPostWinInet, Http__httpGetPostWinInet_hook) ADD_PATCH(Http__trustCheck, Http__trustCheck_hook)
ADD_PATCH(Http__trustCheck, Http__trustCheck_hook)
ADD_PATCH(Crypt__verifySignatureBase64, Crypt__verifySignatureBase64_hook)
ADD_PATCH(Crypt__verifySignatureBase64, Crypt__verifySignatureBase64_hook)
ADD_PATCH(CRobloxApp__InitInstance, CRobloxApp__InitInstance_hook)
ADD_PATCH(CRobloxApp__InitInstance, CRobloxApp__InitInstance_hook) ADD_PATCH(CRobloxCommandLineInfo__ParseParam, CRobloxCommandLineInfo__ParseParam_hook)
ADD_PATCH(CRobloxCommandLineInfo__ParseParam, CRobloxCommandLineInfo__ParseParam_hook)
#ifdef _DEBUG
#ifdef _DEBUG ADD_PATCH(Context__requirePermission, Context__requirePermission_hook)
ADD_PATCH(Context__requirePermission, Context__requirePermission_hook) #endif
#endif
#ifdef SERVER
#ifdef SERVER ADD_PATCH(DataModel__getJobId, DataModel__getJobId_hook)
ADD_PATCH(DataModel__getJobId, DataModel__getJobId_hook)
ADD_PATCH(StandardOut__print, StandardOut__print_hook)
ADD_PATCH(StandardOut__print, StandardOut__print_hook)
ADD_PATCH(ServerReplicator__sendTop, ServerReplicator__sendTop_hook)
ADD_PATCH(ServerReplicator__sendTop, ServerReplicator__sendTop_hook) ADD_PATCH(ServerReplicator__processTicket, ServerReplicator__processTicket_hook)
ADD_PATCH(ServerReplicator__processTicket, ServerReplicator__processTicket_hook) #endif
#endif
END_PATCH_LIST()
END_PATCH_LIST()
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
{ if (ul_reason_for_call == DLL_PROCESS_ATTACH)
if (ul_reason_for_call == DLL_PROCESS_ATTACH) {
{ LONG patchesError = Patches::Apply();
LONG patchesError = Patches::Apply(); if (patchesError != NO_ERROR)
if (patchesError != NO_ERROR) {
{ #ifdef _DEBUG
#ifdef _DEBUG std::string message = "Patches::Apply returned " + std::to_string(patchesError);
std::string message = "Patches::Apply returned " + std::to_string(patchesError); MessageBoxA(nullptr, message.c_str(), nullptr, MB_ICONERROR);
MessageBoxA(nullptr, message.c_str(), nullptr, MB_ICONERROR); #endif
#endif
ExitProcess(EXIT_FAILURE);
ExitProcess(EXIT_FAILURE); }
}
CURLcode curlError = curl_global_init(CURL_GLOBAL_DEFAULT);
CURLcode curlError = curl_global_init(CURL_GLOBAL_DEFAULT); if (curlError != CURLE_OK)
if (curlError != CURLE_OK) {
{ #ifdef _DEBUG
#ifdef _DEBUG std::string message = "curl_global_init returned " + std::to_string(curlError);
std::string message = "curl_global_init returned " + std::to_string(curlError); MessageBoxA(nullptr, message.c_str(), nullptr, MB_ICONERROR);
MessageBoxA(nullptr, message.c_str(), nullptr, MB_ICONERROR); #endif
#endif
ExitProcess(EXIT_FAILURE);
ExitProcess(EXIT_FAILURE); }
} }
}
if (ul_reason_for_call == DLL_PROCESS_DETACH)
if (ul_reason_for_call == DLL_PROCESS_DETACH) {
{ curl_global_cleanup();
curl_global_cleanup();
#ifdef PLAYER
#ifdef PLAYER Discord::Cleanup();
Discord::Cleanup(); #endif
#endif
#ifdef SERVER
#ifdef SERVER if (Server::Handle)
if (Server::Handle) {
{ Server::Cleanup();
Server::Cleanup(); }
} #endif
#endif }
}
return TRUE;
return TRUE; }
}
#ifdef SERVER
#ifdef SERVER void __declspec(dllexport) entrypoint() {}
void __declspec(dllexport) entrypoint() {}
#endif #endif

View File

@ -1 +0,0 @@
#include "pch.h"

View File

@ -1,5 +1,7 @@
# Kiseki.Patcher # Kiseki.Patcher
DLL used for extending client/server functionality Fork of [@lrre-foss/lure](https://github.com/lrre-foss/lure) with Kiseki-specific additions
# License # License
Copyright (c) Kiseki 2022-2023. All rights reserved. Not for public use. Copyright (c) Kiseki 2023. All rights reserved. Not for public use.
This project is a fork of [@lrre-foss/lure](https://github.com/lrre-foss/lure), a project licensed under the [Apache License v2.0](https://www.apache.org/licenses/LICENSE-2.0.txt).

View File

@ -6,6 +6,7 @@
"curl", "curl",
"detours", "detours",
"discord-rpc", "discord-rpc",
"rapidjson" "rapidjson",
"pugixml"
] ]
} }