mirror of
https://github.com/aydencharles/onionHEN.git
synced 2026-10-23 04:12:37 -05:00
HexwellandClaude Fable 5
971296f174
source/include mixed libhijacker's private implementation headers (util.hpp with its hand-rolled UniquePtr/String/Vector, plus kernel/, elf/, dbg/, hijacker/) with genuinely cross-module contracts, and the whole directory was pulled in as -isystem, so any module could reach libhijacker internals and every warning in those headers was suppressed. Move the libhijacker-private headers to source/libhijacker/include and expose it as a PUBLIC include directory, so the two modules that actually use it — util for hijacker.hpp, shellui for SHA-1 — now declare that dependency. Split sha1.hpp: the public-domain SHA-1 goes to third_party/sha1, while NID_KEY, Sha1 and genSha1 (which needed libhijacker's StringView) move into the nid.hpp that uses them. shellui only ever wanted the plain digest. Drop source/include's SYSTEM marker now that it holds only first-party contracts. That surfaced problems -isystem had been hiding: * 68 format-string mismatches in dbg.hpp, printing uintptr_t with %llx * freebsd-helper.h redefining PROT_* and TRACEBUF over the SDK's * ini.h's header-only helpers declared static rather than static inline The GNU extensions that TYPE_BEGIN/TYPE_FIELD rely on are now silenced per header instead of by the blanket -isystem. Also drop three redundant util.hpp includes (bootstrapper, shellui) that referenced none of its symbols, and fix backtrace.hpp being included through relative ../include paths. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
41 lines
1.0 KiB
C++
41 lines
1.0 KiB
C++
#pragma once
|
|
|
|
#include "hijacker.hpp"
|
|
#include "hijacker/hijacker.hpp"
|
|
#include "hijacker/spawner.hpp"
|
|
#include "memory.hpp"
|
|
#include "util.hpp"
|
|
#include <unistd.h>
|
|
|
|
extern "C" {
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
}
|
|
|
|
class Spawner {
|
|
dbg::IdArray pids;
|
|
uintptr_t nanosleepOffset;
|
|
int pid;
|
|
|
|
static inline constexpr Nid _nanosleep{"NhpspxdjEKU"};
|
|
|
|
static uintptr_t getNanosleepOffset(const Hijacker &hijacker) {
|
|
uintptr_t addr = hijacker.getLibKernelFunctionAddress(_nanosleep);
|
|
return addr - hijacker.getLibKernelBase();
|
|
}
|
|
|
|
static uintptr_t getNanosleepOffset() {
|
|
auto hijacker = Hijacker::getHijacker(getpid());
|
|
if (hijacker == nullptr) [[unlikely]] {
|
|
return 0;
|
|
}
|
|
return getNanosleepOffset(*hijacker);
|
|
}
|
|
|
|
public:
|
|
explicit Spawner() : pids(dbg::getAllPids()), nanosleepOffset(getNanosleepOffset()), pid(getpid()) {}
|
|
Spawner(const Hijacker &ptr) : pids(dbg::getAllPids()), nanosleepOffset(getNanosleepOffset(ptr)), pid(ptr.getPid()) {}
|
|
UniquePtr<Hijacker> bootstrap(Hijacker &hijacker);
|
|
UniquePtr<Hijacker> spawn();
|
|
};
|