[+] Initial untested implementation of the loadlibrary impl for the load module api
This commit is contained in:
parent
050f48f9dc
commit
d99c23d638
@ -27,6 +27,8 @@ namespace Aurora::Process
|
||||
static AuList<EModulePath> kUserOverloadableSearchPath = {EModulePath::eSpecified, EModulePath::eModulePathCWD, EModulePath::eProcessDirectory, EModulePath::eModulePathUserDir, EModulePath::eModulePathSystemDir};
|
||||
static AuList<EModulePath> kAdminOverloadableSearchPath = {EModulePath::eSpecified, EModulePath::eModulePathSystemDir, EModulePath::eProcessDirectory, EModulePath::eModulePathCWD, EModulePath::eModulePathUserDir};
|
||||
static AuList<EModulePath> kSpecifiedPath = {EModulePath::eSpecified};
|
||||
static AuList<EModulePath> kCWDPath = {EModulePath::eModulePathCWD};
|
||||
static AuList<EModulePath> kProcPath = {EModulePath::eProcessDirectory};
|
||||
|
||||
struct ModuleLoadRequest
|
||||
{
|
||||
|
||||
@ -9,10 +9,26 @@
|
||||
#include "Process.hpp"
|
||||
#if defined(AURORA_IS_POSIX_DERIVED)
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
#if defined(AURORA_PLATFORM_WIN32)
|
||||
#include <Softpub.h>
|
||||
#include <wincrypt.h>
|
||||
#include <wintrust.h>
|
||||
#pragma comment (lib, "wintrust")
|
||||
#endif
|
||||
|
||||
#include <Source/IO/FS/FS.hpp>
|
||||
#include <Source/IO/FS/Resources.hpp>
|
||||
|
||||
namespace Aurora::Process
|
||||
{
|
||||
static AuThreadPrimitives::SpinLock gSpinLock;
|
||||
static AuHashMap<AuString, void *> gModuleHandles;
|
||||
static const bool kIsMainSigned = false;
|
||||
|
||||
static constexpr const char *GetPlatformString(Build::EPlatform platform)
|
||||
{
|
||||
switch (platform)
|
||||
@ -98,15 +114,406 @@ namespace Aurora::Process
|
||||
return ret;
|
||||
}
|
||||
|
||||
#if defined(AURORA_PLATFORM_WIN32)
|
||||
bool VerifyEmbeddedSignature(const wchar_t *path, HANDLE handle)
|
||||
{
|
||||
LONG lStatus;
|
||||
DWORD dwLastError;
|
||||
|
||||
WINTRUST_FILE_INFO FileData;
|
||||
memset(&FileData, 0, sizeof(FileData));
|
||||
FileData.cbStruct = sizeof(WINTRUST_FILE_INFO);
|
||||
FileData.pcwszFilePath = path;
|
||||
FileData.hFile = handle;
|
||||
FileData.pgKnownSubject = NULL;
|
||||
|
||||
GUID WVTPolicyGUID = WINTRUST_ACTION_GENERIC_VERIFY_V2;
|
||||
WINTRUST_DATA WinTrustData;
|
||||
|
||||
// Initialize the WinVerifyTrust input data structure.
|
||||
|
||||
// Default all fields to 0.
|
||||
memset(&WinTrustData, 0, sizeof(WinTrustData));
|
||||
|
||||
WinTrustData.cbStruct = sizeof(WinTrustData);
|
||||
|
||||
// Use default code signing EKU.
|
||||
WinTrustData.pPolicyCallbackData = NULL;
|
||||
|
||||
// No data to pass to SIP.
|
||||
WinTrustData.pSIPClientData = NULL;
|
||||
|
||||
// Disable WVT UI.
|
||||
WinTrustData.dwUIChoice = WTD_UI_NONE;
|
||||
|
||||
// Revocation checking.
|
||||
WinTrustData.fdwRevocationChecks = WTD_REVOKE_WHOLECHAIN;
|
||||
|
||||
// Verify an embedded signature on a file.
|
||||
WinTrustData.dwUnionChoice = WTD_CHOICE_FILE;
|
||||
|
||||
// Verify action.
|
||||
WinTrustData.dwStateAction = WTD_STATEACTION_VERIFY;
|
||||
|
||||
// Verification sets this value.
|
||||
WinTrustData.hWVTStateData = NULL;
|
||||
|
||||
// Not used.
|
||||
WinTrustData.pwszURLReference = NULL;
|
||||
|
||||
// This is not applicable if there is no UI because it changes
|
||||
// the UI to accommodate running applications instead of
|
||||
// installing applications.
|
||||
WinTrustData.dwUIContext = 0;
|
||||
|
||||
// Set pFile.
|
||||
WinTrustData.pFile = &FileData;
|
||||
|
||||
// WinVerifyTrust verifies signatures as specified by the GUID
|
||||
// and Wintrust_Data.
|
||||
lStatus = WinVerifyTrust(
|
||||
NULL,
|
||||
&WVTPolicyGUID,
|
||||
&WinTrustData);
|
||||
|
||||
bool status {};
|
||||
|
||||
switch (lStatus)
|
||||
{
|
||||
case ERROR_SUCCESS:
|
||||
status = true;
|
||||
break;
|
||||
case TRUST_E_NOSIGNATURE:
|
||||
// The file was not signed or had a signature
|
||||
// that was not valid.
|
||||
|
||||
// Get the reason for no signature.
|
||||
dwLastError = GetLastError();
|
||||
if (TRUST_E_NOSIGNATURE == dwLastError ||
|
||||
TRUST_E_SUBJECT_FORM_UNKNOWN == dwLastError ||
|
||||
TRUST_E_PROVIDER_UNKNOWN == dwLastError)
|
||||
{
|
||||
SysPushErrorCrypt("The file is not signed.");
|
||||
}
|
||||
else
|
||||
{
|
||||
SysPushErrorCrypt("An unknown error occurred trying to verify the signature of the file.");
|
||||
}
|
||||
|
||||
break;
|
||||
case TRUST_E_EXPLICIT_DISTRUST:
|
||||
SysPushErrorCrypt("The signature is present, but specifically disallowed.");
|
||||
|
||||
break;
|
||||
case TRUST_E_SUBJECT_NOT_TRUSTED:
|
||||
SysPushErrorCrypt("The signature is present, but not trusted.");
|
||||
|
||||
break;
|
||||
case CRYPT_E_SECURITY_SETTINGS:
|
||||
SysPushErrorCrypt("CRYPT_E_SECURITY_SETTINGS - The hash "
|
||||
"representing the subject or the publisher wasn't "
|
||||
"explicitly trusted by the admin and admin policy "
|
||||
"has disabled user trust. No signature, publisher "
|
||||
"or timestamp errors.");
|
||||
|
||||
break;
|
||||
default:
|
||||
SysPushErrorCrypt("Dependency Injection Error");
|
||||
break;
|
||||
}
|
||||
|
||||
WinTrustData.dwStateAction = WTD_STATEACTION_CLOSE;
|
||||
|
||||
lStatus = WinVerifyTrust(
|
||||
NULL,
|
||||
&WVTPolicyGUID,
|
||||
&WinTrustData);
|
||||
|
||||
return status;
|
||||
}
|
||||
#endif
|
||||
|
||||
static bool LoadModule(const AuString &name, const AuString &path)
|
||||
{
|
||||
#if defined(AURORA_IS_MODERNNT_DERIVED)
|
||||
auto handle = LoadLibraryW(Locale::ConvertFromUTF8(path).c_str());
|
||||
if (handle == INVALID_HANDLE_VALUE)
|
||||
{
|
||||
SysPushErrorNested("Could't link dynamic library {}", handle);
|
||||
return {};
|
||||
}
|
||||
#else
|
||||
auto handle = dlopen(path, RTLD_DEEPBIND);
|
||||
if (handle != INVALID_HANDLE_VALUE)
|
||||
{
|
||||
SysPushErrorNested("Could't link dynamic library {}", handle);
|
||||
return {};
|
||||
}
|
||||
#endif
|
||||
|
||||
gModuleHandles.insert(AuMakePair(name, (void *)handle));
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool TryLoadModule(const AuString &path,
|
||||
#if defined(AURORA_IS_MODERNNT_DERIVED)
|
||||
const AuString &abs,
|
||||
#endif
|
||||
const ModuleLoadRequest &request,
|
||||
bool &fail
|
||||
)
|
||||
{
|
||||
fail = false;
|
||||
|
||||
auto pathNrml = IO::FS::NormalizePathRet(path);
|
||||
|
||||
#if defined(AURORA_IS_MODERNNT_DERIVED)
|
||||
auto widePath = Locale::ConvertFromUTF8(pathNrml);
|
||||
auto mitigateTimeOfUse = CreateFileW(widePath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
|
||||
|
||||
if (mitigateTimeOfUse == INVALID_HANDLE_VALUE)
|
||||
{
|
||||
SysPushErrorNested("Couldn't open existing file. Race exploit?");
|
||||
fail = true;
|
||||
return false;
|
||||
}
|
||||
|
||||
auto absPath = IO::FS::NormalizePathRet(abs);
|
||||
#endif
|
||||
|
||||
if (request.verify || (kIsMainSigned || request.enableMitigations))
|
||||
{
|
||||
#if defined(AURORA_PLATFORM_WIN32)
|
||||
if (!VerifyEmbeddedSignature(widePath.c_str(), mitigateTimeOfUse))
|
||||
{
|
||||
SysPushErrorNested("Couldn't verify file {}", path);
|
||||
fail = true;
|
||||
AuWin32CloseHandle(mitigateTimeOfUse);
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
LogWarn("Can't verify {} on this platform", path);
|
||||
#endif
|
||||
}
|
||||
|
||||
#if defined(AURORA_IS_POSIX_DERIVED)
|
||||
if (request.enableMitigations && request.unixCheckPlusX)
|
||||
{
|
||||
struct stat sb;
|
||||
|
||||
if (stat(pathNrml.data(), &sb) != 0)
|
||||
{
|
||||
SysPushErrorNested("Couldn't open existing file. Race exploit?");
|
||||
fail = true;
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((sb.st_mode & S_IXUSR) == 0)
|
||||
{
|
||||
fail = true;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(AURORA_IS_MODERNNT_DERIVED)
|
||||
auto returnValue = LoadModule(absPath);
|
||||
#else
|
||||
auto returnValue = LoadModule(pathNrml);
|
||||
#endif
|
||||
|
||||
#if defined(AURORA_IS_MODERNNT_DERIVED)
|
||||
AuWin32CloseHandle(mitigateTimeOfUse);
|
||||
#endif
|
||||
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
static bool TryLoadModule(const AuString &path, const AuString &auDll, const AuString &genericDll, const ModuleLoadRequest &request, bool &fail)
|
||||
{
|
||||
AuString a = path + "/" + auDll;
|
||||
AuString b = path + "/" + genericDll;
|
||||
|
||||
#if defined(AURORA_IS_MODERNNT_DERIVED)
|
||||
AuString aAbs = path + "/" + auDll + ".";
|
||||
AuString bAbs = path + "/" + genericDll + ".";
|
||||
#endif
|
||||
|
||||
if (Aurora::IO::FS::FileExists(a))
|
||||
{
|
||||
return TryLoadModule(a,
|
||||
#if defined(AURORA_IS_MODERNNT_DERIVED)
|
||||
aAbs,
|
||||
#endif
|
||||
request,
|
||||
fail
|
||||
);
|
||||
}
|
||||
|
||||
if (Aurora::IO::FS::FileExists(b))
|
||||
{
|
||||
return TryLoadModule(b,
|
||||
#if defined(AURORA_IS_MODERNNT_DERIVED)
|
||||
bAbs,
|
||||
#endif
|
||||
request,
|
||||
fail
|
||||
);
|
||||
}
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
static bool TryLoadModule(EModulePath path, const AuString &auDll, const AuString &genericDll, const ModuleLoadRequest &request)
|
||||
{
|
||||
AuString pathA, pathB;
|
||||
|
||||
switch (path)
|
||||
{
|
||||
case EModulePath::eModulePathCWD:
|
||||
if (!Process::GetWorkingDirectory(pathA)) return false;
|
||||
|
||||
break;
|
||||
case EModulePath::eProcessDirectory:
|
||||
if (!Process::GetProcPath(pathA)) return false;
|
||||
|
||||
break;
|
||||
case EModulePath::eModulePathSystemDir:
|
||||
pathA = IO::FS::GetSystemLibPath().value_or(AuString {});
|
||||
pathB = IO::FS::GetSystemLibPath2().value_or(AuString {});
|
||||
|
||||
if (pathA.empty()) return false;
|
||||
|
||||
break;
|
||||
case EModulePath::eModulePathUserDir:
|
||||
pathA = IO::FS::GetUserLibPath().value_or(AuString {});
|
||||
pathB = IO::FS::GetUserLibPath2().value_or(AuString {});
|
||||
|
||||
if (pathA.empty()) return false;
|
||||
|
||||
break;
|
||||
//case EModulePath::eOSSpecified:
|
||||
//
|
||||
// break;
|
||||
case EModulePath::eSpecified:
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
bool fail {};
|
||||
|
||||
if (pathA.size())
|
||||
{
|
||||
if (TryLoadModule(pathA, auDll, genericDll, request, fail))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (fail)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (pathB.size())
|
||||
{
|
||||
if (TryLoadModule(pathB, auDll, genericDll, request, fail))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (fail)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (path == EModulePath::eSpecified && request.specifiedSearchPaths)
|
||||
{
|
||||
for (const auto &val : *request.specifiedSearchPaths)
|
||||
{
|
||||
if (TryLoadModule(val, auDll, genericDll, request, fail))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (fail)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
AUKN_SYM bool LoadModule(const ModuleLoadRequest &request)
|
||||
{
|
||||
AU_LOCK_GUARD(gSpinLock);
|
||||
|
||||
auto h = gModuleHandles.find(request.mod);
|
||||
if (h != gModuleHandles.end())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
auto au = request.mod + ConstructAuDllSuffix();
|
||||
auto base = request.mod;
|
||||
auto ext = GetPlatformExt(Build::kCurrentPlatform);
|
||||
|
||||
if (ext && !Build::kIsNtDerived)
|
||||
{
|
||||
base += ext;
|
||||
}
|
||||
|
||||
if (request.version.size())
|
||||
{
|
||||
au += "." + request.version;
|
||||
base += "." + request.version;
|
||||
}
|
||||
|
||||
if (ext && Build::kIsNtDerived)
|
||||
{
|
||||
base += ext;
|
||||
}
|
||||
|
||||
auto searchPath = request.searchPath ? request.searchPath : &kUserOverloadableSearchPath;
|
||||
for (EModulePath path : *searchPath)
|
||||
{
|
||||
if (TryLoadModule(path, au, base, request))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
AUKN_SYM AuMach GetProcAddress(AuString mod, AuString symbol)
|
||||
{
|
||||
AU_LOCK_GUARD(gSpinLock);
|
||||
|
||||
auto h = gModuleHandles.find(mod);
|
||||
if (h == gModuleHandles.end())
|
||||
{
|
||||
SysPushErrorGen("Module {} is not loaded", mod);
|
||||
return {};
|
||||
}
|
||||
auto handle = h->second;
|
||||
|
||||
#if defined(AURORA_IS_MODERNNT_DERIVED)
|
||||
auto ret = reinterpret_cast<AuMach>(::GetProcAddress(reinterpret_cast<HMODULE>(handle), symbol.c_str()));
|
||||
#else
|
||||
auto ret = reinterpret_cast<AuMach>(dlsym(handle, symbol.c_str()));
|
||||
#endif
|
||||
|
||||
if (!ret)
|
||||
{
|
||||
SysPushErrorGen("Couldn't resolve symbol in module {} of mangled name '{}'", mod, symbol);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
AUKN_SYM void Exit(AuUInt32 exitcode)
|
||||
{
|
||||
@ -121,4 +528,7 @@ namespace Aurora::Process
|
||||
*(AuUInt32 *)0xFFFFFFFF = exitcode;
|
||||
#endif
|
||||
}
|
||||
|
||||
// TODO (reece): init, deinit
|
||||
// TODO (reece): test if self is signed
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user