Kiseki
/
patcher
mirror of https://github.com/kiseki-lol/patcher.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

basically everything else

This commit is contained in:
lightbulblighter 2022-08-02 14:01:30 -07:00
parent dce47e283a
commit dfa2267d65
No known key found for this signature in database
GPG Key ID: 58D6EDC2C38C9B3B
17 changed files with 162 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
Tadah.DLL/Helpers.cpp Normal file
View File

@ -0,0 +1,107 @@
#include "pch.h"
#include "Helpers.h"
#ifdef _DEBUG
const std::vector<BYTE> Helpers::publicKey = Helpers::base64Decode(PUBLIC_KEY);
#else
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::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)
{
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)
{
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)
{
// table from '+' to 'z'
const uint8_t lookup[] = {
62, 255, 62, 255, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 255,
255, 0, 255, 255, 255, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
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);
std::vector<unsigned char> out;
int val = 0, valb = -8;
for (uint8_t c : data)
{
if (c < '+' || c > 'z')
{
break;
}
c -= '+';
if (lookup[c] >= 64)
{
break;
}
val = (val << 6) + lookup[c];
valb += 6;
if (valb >= 0)
{
out.push_back(char((val >> valb) & 0xFF));
valb -= 8;
}
}
return out;
}
// https://stackoverflow.com/a/28269049
std::map<std::string, std::string> Helpers::parseQueryString(std::string query)
{
std::istringstream stream(query);
std::map<std::string, std::string> parsed;
std::string pair, key, value;
while (std::getline(stream, pair, '&')) // split each term
{
std::istringstream term(pair);
if (std::getline(std::getline(term, key, '='), value))
{
parsed[key] = value;
}
}
return parsed;
}
std::string Helpers::joinQueryString(std::map<std::string, std::string> query)
{
std::stringstream stream;
stream << "?";
for (auto const& pair : query)
{
stream << pair.first << "=" << pair.second << "&";
}
std::string result = stream.str();
result.pop_back(); // remove ending ampersand
return result;
}

2
Tadah.DLL/Hooks/Context.cpp
View File

@ -1,6 +1,6 @@
#include "pch.h"
#include "Util.h"
#include "Helpers.h"
#include "Hooks/Context.h"
#ifdef _DEBUG

16
Tadah.DLL/Hooks/Crypt.cpp
View File

@ -1,7 +1,7 @@
#include "pch.h"
#include "Patches.h"
#include "Util.h"
#include "Helpers.h"
#include "Hooks/Crypt.h"
Crypt::Crypt()
@ -23,16 +23,10 @@ Crypt::Crypt()
try
{
#ifdef _DEBUG
std::vector<BYTE> publicKey = Util::base64Decode(Util::publicKey);
#else
std::vector<BYTE> publicKey = Util::publicKey;
#endif
BYTE* blob = new BYTE[Helpers::publicKey.size()];
std::copy(Helpers::publicKey.begin(), Helpers::publicKey.end(), blob);
BYTE* blob = new BYTE[publicKey.size()];
std::copy(publicKey.begin(), publicKey.end(), blob);
if (!CryptImportKey(context, blob, publicKey.size(), 0, 0, &key))
if (!CryptImportKey(context, blob, Helpers::publicKey.size(), 0, 0, &key))
{
throw std::runtime_error("");
}
@ -75,7 +69,7 @@ bool Crypt::verifySignatureBase64(std::string message, std::string signatureBase
return false;
}
std::vector<BYTE> signature = Util::base64Decode(signatureBase64);
std::vector<BYTE> signature = Helpers::base64Decode(signatureBase64);
/*
The native cryptography API uses little-endian byte order

29
Tadah.DLL/Hooks/Http.cpp
View File

@ -1,6 +1,6 @@
#include "pch.h"
#include "Util.h"
#include "Helpers.h"
#include "Hooks/Http.h"
#define CHECK(condition, code) \
@ -39,7 +39,7 @@ void __fastcall Http__httpGetPostWinInet_hook(Http* _this, void*, bool isPost, i
if (path != NULL && host != NULL && query != NULL)
{
std::string _path = Util::toLower(std::string(path));
std::string _path = Helpers::toLower(std::string(path));
std::string _host = std::string(host);
std::string _query = std::string(query);
@ -70,7 +70,7 @@ void __fastcall Http__httpGetPostWinInet_hook(Http* _this, void*, bool isPost, i
std::string api = "https://www.roblox.com/" + std::string(_path == "/thumbs/asset.ashx" ? "asset" : "avatar") + "/request-thumbnail-fix";
std::map<std::string, std::string> source = Util::parseQueryString(query);
std::map<std::string, std::string> source = Helpers::parseQueryString(query);
std::map<std::string, std::string> fixed = {
{ _path == "/thumbs/asset.ashx" ? "overrideModeration" : "dummy", "false" },
{ "thumbnailFormatId", "0" }
@ -80,7 +80,7 @@ void __fastcall Http__httpGetPostWinInet_hook(Http* _this, void*, bool isPost, i
// thus, we are able to do this :-)
for (auto& pair : source)
{
fixed[Util::toLower(pair.first)] = pair.second;
fixed[Helpers::toLower(pair.first)] = pair.second;
}
if (fixed.find("id") != fixed.end())
@ -91,7 +91,7 @@ void __fastcall Http__httpGetPostWinInet_hook(Http* _this, void*, bool isPost, i
fixed.insert(std::move(handler));
}
api += Util::joinQueryString(fixed);
api += Helpers::joinQueryString(fixed);
// get the api response
CURL* curl = curl_easy_init();
@ -151,7 +151,7 @@ void __fastcall Http__httpGetPostWinInet_hook(Http* _this, void*, bool isPost, i
bool __fastcall Http__trustCheck_hook(const char* url)
{
if (strlen(url) == 7 && !Util::isASCII(url))
if (strlen(url) == 7 && !Helpers::isASCII(url))
{
// so the client does this really fucking stupid thing where if it opens an ie window,
// it passes a char**, and not a char*
@ -171,7 +171,7 @@ bool __fastcall Http__trustCheck_hook(const char* url)
return true;
}
for (std::string allowedEmbeddedScheme : Util::allowedEmbeddedSchemes)
for (std::string allowedEmbeddedScheme : Helpers::allowedEmbeddedSchemes)
{
if (_url.rfind(allowedEmbeddedScheme + ":", 0) == 0)
{
@ -194,9 +194,20 @@ bool __fastcall Http__trustCheck_hook(const char* url)
curl_url_get(curl, CURLUPART_HOST, &host, 0);
curl_url_cleanup(curl);
if (std::find(Util::allowedSchemes.begin(), Util::allowedSchemes.end(), std::string(scheme)) != Util::allowedSchemes.end())
if (std::find(Helpers::allowedSchemes.begin(), Helpers::allowedSchemes.end(), std::string(scheme)) != Helpers::allowedSchemes.end())
{
return std::find(Util::allowedHosts.begin(), Util::allowedHosts.end(), std::string(host)) != Util::allowedHosts.end();
std::string _host = std::string(host);
// this is crude and inefficient but I don't care
for (std::string wildcard : Helpers::allowedWildcardDomains)
{
if (_host.size() >= wildcard.size() && 0 == wildcard.compare(_host.size() - wildcard.size(), wildcard.size(), wildcard))
{
return true;
}
}
return std::find(Helpers::allowedDomains.begin(), Helpers::allowedDomains.end(), _host) != Helpers::allowedDomains.end();
}
return false;

1
Tadah.DLL/Hooks/StandardOut.cpp
View File

@ -13,6 +13,7 @@ void InitializeOutput()
SetStdHandle(STD_OUTPUT_HANDLE, outputHandle);
printf("Tadah.DLL v1.0.0\n");
#ifdef _DEBUG
SetConsoleTextAttribute(outputHandle, FOREGROUND_RED | FOREGROUND_GREEN);
printf("Compiled as Debug\n\n");

11
Tadah.DLL/Include/Config.h → Tadah.DLL/Include/Configuration.h
View File

@ -1,5 +1,16 @@
#pragma once
#define ALLOWED_WILDCARD_DOMAINS "tadah.rocks", "rbxcdn.com", "roblox.com"
#define ALLOWED_DOMAINS
#define ALLOWED_SCHEMES "http", "https"
#define ALLOWED_EMBEDDED_SCHEMES "javascript", "jscript", "res"
#ifdef _DEBUG
#define PUBLIC_KEY ""
#else
#define PUBLIC_KEY 0x0
#endif
#define PLAYERBUILD
// #define ARBITERBUILD

12
Tadah.DLL/Include/Util.h → Tadah.DLL/Include/Helpers.h
View File

@ -1,19 +1,15 @@
#pragma once
#include <string_view>
#include "Configuration.h"
class Util
class Helpers
{
public:
#ifdef _DEBUG
static const std::string publicKey;
#else
static const std::vector<BYTE> publicKey;
#endif
static const std::vector<std::string> allowedHosts;
static const std::vector<std::string> allowedWildcardDomains;
static const std::vector<std::string> allowedDomains;
static const std::vector<std::string> allowedSchemes;
static const std::vector<std::string> allowedEmbeddedSchemes;
static std::map<std::string, std::string> parseArgs(std::string args);
static bool isASCII(const std::string& s);
static std::string toLower(std::string s);
static std::vector<BYTE> base64Decode(const std::string_view data);

2
Tadah.DLL/Include/Hooks/CRoblox.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "Config.h"
#include "Configuration.h"
class CWorkspace;

2
Tadah.DLL/Include/Hooks/Context.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "Config.h"
#include "Configuration.h"
#ifdef _DEBUG

2
Tadah.DLL/Include/Hooks/Crypt.h
View File

@ -2,7 +2,7 @@
#include <wincrypt.h>
#include "Config.h"
#include "Configuration.h"
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);

2
Tadah.DLL/Include/Hooks/Http.h
View File

@ -3,7 +3,7 @@
#include <curl/curl.h>
#include <rapidjson/document.h>
#include "Config.h"
#include "Configuration.h"
struct Http
{

2
Tadah.DLL/Include/Hooks/ServerReplicator.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "Config.h"
#include "Configuration.h"
#if defined(ARBITERBUILD)

2
Tadah.DLL/Include/Hooks/StandardOut.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "Config.h"
#include "Configuration.h"
void InitializeOutput();

6
Tadah.DLL/Tadah.DLL.vcxproj
View File

@ -123,7 +123,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="Include\Config.h" />
<ClInclude Include="Include\Configuration.h" />
<ClInclude Include="Include\Hooks\Context.h" />
<ClInclude Include="Include\Hooks\CRoblox.h" />
<ClInclude Include="Include\Hooks\StandardOut.h" />
@ -131,7 +131,7 @@
<ClInclude Include="Include\Hooks\Http.h" />
<ClInclude Include="Include\Patches.h" />
<ClInclude Include="Include\pch.h" />
<ClInclude Include="Include\Util.h" />
<ClInclude Include="Include\Helpers.h" />
<ClInclude Include="Include\Hooks\Crypt.h" />
<ClInclude Include="Include\resource.h" />
</ItemGroup>
@ -147,7 +147,7 @@
<ClCompile Include="Hooks\StandardOut.cpp" />
<ClCompile Include="Hooks\ServerReplicator.cpp" />
<ClCompile Include="Hooks\Http.cpp" />
<ClCompile Include="Util.cpp" />
<ClCompile Include="Helpers.cpp" />
<ClCompile Include="Hooks\Crypt.cpp" />
</ItemGroup>
<ItemGroup>

6
Tadah.DLL/Tadah.DLL.vcxproj.filters
View File

@ -27,10 +27,10 @@
<ClInclude Include="Include\Patches.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Include\Config.h">
<ClInclude Include="Include\Configuration.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Include\Util.h">
<ClInclude Include="Include\Helpers.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Include\Hooks\Crypt.h">
@ -65,7 +65,7 @@
<ClCompile Include="Patches.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Util.cpp">
<ClCompile Include="Helpers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Hooks\Crypt.cpp">

197
Tadah.DLL/Util.cpp
View File

@ -1,197 +0,0 @@
#include "pch.h"
#include "Util.h"
// this is ifdef guarded so that the public key cannot easily be replaced
// the std::vector variant is the base64 blob decoded into its byte form (https://cryptii.com/pipes/base64-to-hex)
// for ease of development, the string is retained to easily swap keys
// currently the key is the Project Polygon key
#ifdef _DEBUG
const std::string Util::publicKey =
"BgIAAACkAABSU0ExAAQAAAEAAQABmKy9m0NxBRoXTuQPZU8BeM"
"fwBisHcYBy93KSlQB3emeiW/pEMj9YWn2k7JkHiqcjuH+XE5PW"
"K+q9s8oLQsnXTdTYa2l+1BhypP5jefgq0ZHITTIMBfE7rTI39p"
"pzs0ayXKINQMIsBzXaJm25v5gP+vlz4cupJPq+jy9De+kcyw==";
#else
const std::vector<BYTE> Util::publicKey = {
0x06, 0x02, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x52, 0x53, 0x41, 0x31, 0x00, 0x04, 0x00,
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x98, 0xac, 0xbd, 0x9b, 0x43, 0x71, 0x05, 0x1a, 0x17,
0x4e, 0xe4, 0x0f, 0x65, 0x4f, 0x01, 0x78, 0xc7, 0xf0, 0x06, 0x2b, 0x07, 0x71, 0x80, 0x72,
0xf7, 0x72, 0x92, 0x95, 0x00, 0x77, 0x7a, 0x67, 0xa2, 0x5b, 0xfa, 0x44, 0x32, 0x3f, 0x58,
0x5a, 0x7d, 0xa4, 0xec, 0x99, 0x07, 0x8a, 0xa7, 0x23, 0xb8, 0x7f, 0x97, 0x13, 0x93, 0xd6,
0x2b, 0xea, 0xbd, 0xb3, 0xca, 0x0b, 0x42, 0xc9, 0xd7, 0x4d, 0xd4, 0xd8, 0x6b, 0x69, 0x7e,
0xd4, 0x18, 0x72, 0xa4, 0xfe, 0x63, 0x79, 0xf8, 0x2a, 0xd1, 0x91, 0xc8, 0x4d, 0x32, 0x0c,
0x05, 0xf1, 0x3b, 0xad, 0x32, 0x37, 0xf6, 0x9a, 0x73, 0xb3, 0x46, 0xb2, 0x5c, 0xa2, 0x0d,
0x40, 0xc2, 0x2c, 0x07, 0x35, 0xda, 0x26, 0x6d, 0xb9, 0xbf, 0x98, 0x0f, 0xfa, 0xf9, 0x73,
0xe1, 0xcb, 0xa9, 0x24, 0xfa, 0xbe, 0x8f, 0x2f, 0x43, 0x7b, 0xe9, 0x1c, 0xcb
};
#endif
const std::vector<std::string> Util::allowedHosts
{
"polygon.pizzaboxer.xyz",
"polygondev.pizzaboxer.xyz",
"polygonapi.pizzaboxer.xyz",
"clientsettingsapi.pizzaboxer.xyz",
"roblox.com",
"www.roblox.com",
"api.roblox.com",
"assetdelivery.roblox.com",
"assetgame.roblox.com",
"rbxcdn.com",
"www.rbxcdn.com",
"tr.rbxcdn.com",
"t0.rbxcdn.com",
"t1.rbxcdn.com",
"t2.rbxcdn.com",
"t3.rbxcdn.com",
"t4.rbxcdn.com",
"t5.rbxcdn.com",
"t6.rbxcdn.com",
"t7.rbxcdn.com",
"t8.rbxcdn.com",
"t9.rbxcdn.com",
"tadah.rocks",
"www.tadah.rocks"
};
const std::vector<std::string> Util::allowedSchemes
{
"http",
"https",
"ftp"
};
const std::vector<std::string> Util::allowedEmbeddedSchemes
{
"javascript",
"jscript",
"res"
};
std::map<std::string, std::string> Util::parseArgs(std::string args)
{
std::map<std::string, std::string> map;
std::string::size_type key_pos = 0;
std::string::size_type key_end;
std::string::size_type val_pos;
std::string::size_type val_end;
while ((key_end = args.find(' ', key_pos)) != std::string::npos)
{
if ((val_pos = args.find_first_not_of(" -", key_end)) == std::string::npos)
break;
val_end = args.find(" -", val_pos);
map.emplace(args.substr(key_pos, key_end - key_pos), args.substr(val_pos, val_end - val_pos));
key_pos = val_end;
if (key_pos != std::string::npos)
++key_pos;
}
return map;
}
// https://stackoverflow.com/questions/48212992/how-to-find-out-if-there-is-any-non-ascii-character-in-a-string-with-a-file-path
bool Util::isASCII(const std::string& s)
{
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 Util::toLower(std::string 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> Util::base64Decode(const std::string_view data)
{
// table from '+' to 'z'
const uint8_t lookup[] = {
62, 255, 62, 255, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 255,
255, 0, 255, 255, 255, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
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);
std::vector<unsigned char> out;
int val = 0, valb = -8;
for (uint8_t c : data)
{
if (c < '+' || c > 'z')
{
break;
}
c -= '+';
if (lookup[c] >= 64)
{
break;
}
val = (val << 6) + lookup[c];
valb += 6;
if (valb >= 0)
{
out.push_back(char((val >> valb) & 0xFF));
valb -= 8;
}
}
return out;
}
// https://stackoverflow.com/a/28269049
std::map<std::string, std::string> Util::parseQueryString(std::string query)
{
std::istringstream stream(query);
std::map<std::string, std::string> parsed;
std::string pair, key, value;
while (std::getline(stream, pair, '&')) // split each term
{
std::istringstream term(pair);
if (std::getline(std::getline(term, key, '='), value))
{
parsed[key] = value;
}
}
return parsed;
}
std::string Util::joinQueryString(std::map<std::string, std::string> query)
{
std::stringstream stream;
stream << "?";
for (auto const& pair : query)
{
stream << pair.first << "=" << pair.second << "&";
}
std::string result = stream.str();
result.pop_back(); // remove ending ampersand
return result;
}

2
Tadah.DLL/dllmain.cpp
View File

@ -1,5 +1,5 @@
#include "pch.h"
#include "Config.h"
#include "Configuration.h"
#include "Patches.h"
#include "Hooks/Http.h"