X-Git-Url: https://git.saurik.com/ldid.git/blobdiff_plain/eff987d296c6ad358f4c848f29a1891b3a25f345..66f2305d57b04ba04018f98f91494cd4dabd1249:/ldid.cpp diff --git a/ldid.cpp b/ldid.cpp index 8c03ef6..2b755f4 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -23,27 +23,69 @@ #include #include #include -#include +#include +#include +#include #include #include #include +#include #include #include +#include #include #include #include #include #include +#include +#ifndef LDID_NOSMIME #include #include #include #include +#endif + +#ifdef __APPLE__ +#include + +#define LDID_SHA1_DIGEST_LENGTH CC_SHA1_DIGEST_LENGTH +#define LDID_SHA1 CC_SHA1 +#define LDID_SHA1_CTX CC_SHA1_CTX +#define LDID_SHA1_Init CC_SHA1_Init +#define LDID_SHA1_Update CC_SHA1_Update +#define LDID_SHA1_Final CC_SHA1_Final + +#define LDID_SHA256_DIGEST_LENGTH CC_SHA256_DIGEST_LENGTH +#define LDID_SHA256 CC_SHA256 +#define LDID_SHA256_CTX CC_SHA256_CTX +#define LDID_SHA256_Init CC_SHA256_Init +#define LDID_SHA256_Update CC_SHA256_Update +#define LDID_SHA256_Final CC_SHA256_Final +#else #include +#define LDID_SHA1_DIGEST_LENGTH SHA_DIGEST_LENGTH +#define LDID_SHA1 SHA1 +#define LDID_SHA1_CTX SHA_CTX +#define LDID_SHA1_Init SHA1_Init +#define LDID_SHA1_Update SHA1_Update +#define LDID_SHA1_Final SHA1_Final + +#define LDID_SHA256_DIGEST_LENGTH SHA256_DIGEST_LENGTH +#define LDID_SHA256 SHA256 +#define LDID_SHA256_CTX SHA256_CTX +#define LDID_SHA256_Init SHA256_Init +#define LDID_SHA256_Update SHA256_Update +#define LDID_SHA256_Final SHA256_Final +#endif + +#ifndef LDID_NOPLIST #include +#endif #include "ldid.hpp" @@ -52,27 +94,37 @@ #define _assert__(line) \ _assert___(line) +#ifdef __EXCEPTIONS #define _assert_(expr, format, ...) \ do if (!(expr)) { \ fprintf(stderr, "%s(%u): _assert(): " format "\n", __FILE__, __LINE__, ## __VA_ARGS__); \ throw __FILE__ "(" _assert__(__LINE__) "): _assert(" #expr ")"; \ } while (false) +#else +// XXX: this is not acceptable +#define _assert_(expr, format, ...) \ + do if (!(expr)) { \ + fprintf(stderr, "%s(%u): _assert(): " format "\n", __FILE__, __LINE__, ## __VA_ARGS__); \ + exit(-1); \ + } while (false) +#endif #define _assert(expr) \ _assert_(expr, "%s", #expr) -#define _syscall(expr) ({ \ - __typeof__(expr) _value; \ - do if ((long) (_value = (expr)) != -1) \ - break; \ - else switch (errno) { \ - case EINTR: \ - continue; \ - default: \ - _assert_(false, "errno=%u", errno); \ - } while (true); \ - _value; \ -}) +#define _syscall(expr, ...) [&] { for (;;) { \ + auto _value(expr); \ + if ((long) _value != -1) \ + return _value; \ + int error(errno); \ + if (error == EINTR) \ + continue; \ + /* XXX: EINTR is included in this list to fix g++ */ \ + for (auto success : (long[]) {EINTR, __VA_ARGS__}) \ + if (error == success) \ + return (decltype(expr)) -success; \ + _assert_(false, "errno=%u", error); \ +} }() #define _trace() \ fprintf(stderr, "_trace(%s:%u): %s\n", __FILE__, __LINE__, __FUNCTION__) @@ -95,6 +147,61 @@ struct Iterator_ { for (bool _suck(true); _suck; _suck = false) \ for (const __typeof__(*_item) &item = *_item; _suck; _suck = false) +class _Scope { +}; + +template +class Scope : + public _Scope +{ + private: + Function_ function_; + + public: + Scope(const Function_ &function) : + function_(function) + { + } + + ~Scope() { + function_(); + } +}; + +template +Scope _scope(const Function_ &function) { + return Scope(function); +} + +#define _scope__(counter, function) \ + __attribute__((__unused__)) \ + const _Scope &_scope ## counter(_scope([&]function)) +#define _scope_(counter, function) \ + _scope__(counter, function) +#define _scope(function) \ + _scope_(__COUNTER__, function) + +#define CPU_ARCH_MASK uint32_t(0xff000000) +#define CPU_ARCH_ABI64 uint32_t(0x01000000) + +#define CPU_TYPE_ANY uint32_t(-1) +#define CPU_TYPE_VAX uint32_t( 1) +#define CPU_TYPE_MC680x0 uint32_t( 6) +#define CPU_TYPE_X86 uint32_t( 7) +#define CPU_TYPE_MC98000 uint32_t(10) +#define CPU_TYPE_HPPA uint32_t(11) +#define CPU_TYPE_ARM uint32_t(12) +#define CPU_TYPE_MC88000 uint32_t(13) +#define CPU_TYPE_SPARC uint32_t(14) +#define CPU_TYPE_I860 uint32_t(15) +#define CPU_TYPE_POWERPC uint32_t(18) + +#define CPU_TYPE_I386 CPU_TYPE_X86 + +#define CPU_TYPE_ARM64 (CPU_ARCH_ABI64 | CPU_TYPE_ARM) +#define CPU_TYPE_POWERPC64 (CPU_ARCH_ABI64 | CPU_TYPE_POWERPC) +#define CPU_TYPE_X86_64 (CPU_ARCH_ABI64 | CPU_TYPE_X86) + struct fat_header { uint32_t magic; uint32_t nfat_arch; @@ -157,6 +264,16 @@ struct load_command { #define LC_DYLD_INFO_ONLY uint32_t(0x22 | LC_REQ_DYLD) #define LC_ENCRYPTION_INFO_64 uint32_t(0x2c) +union Version { + struct { + uint8_t patch; + uint8_t minor; + uint16_t major; + } _packed; + + uint32_t value; +}; + struct dylib { uint32_t name; uint32_t timestamp; @@ -324,6 +441,7 @@ struct section_64 { uint32_t flags; uint32_t reserved1; uint32_t reserved2; + uint32_t reserved3; } _packed; struct linkedit_data_command { @@ -357,15 +475,30 @@ struct encryption_info_command { #define BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED 0xb0 #define BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB 0xc0 -inline void get(std::streambuf &stream, void *data, size_t size) { - _assert(stream.sgetn(static_cast(data), size) == size); +static std::streamsize read(std::streambuf &stream, void *data, size_t size) { + auto writ(stream.sgetn(static_cast(data), size)); + _assert(writ >= 0); + return writ; +} + +static inline void get(std::streambuf &stream, void *data, size_t size) { + _assert(read(stream, data, size) == size); } -inline void put(std::streambuf &stream, const void *data, size_t size) { +static inline void put(std::streambuf &stream, const void *data, size_t size) { _assert(stream.sputn(static_cast(data), size) == size); } -inline void pad(std::streambuf &stream, size_t size) { +static size_t most(std::streambuf &stream, void *data, size_t size) { + size_t total(size); + while (size > 0) + if (auto writ = read(stream, data, size)) + size -= writ; + else break; + return total - size; +} + +static inline void pad(std::streambuf &stream, size_t size) { char padding[size]; memset(padding, 0, size); put(stream, padding, size); @@ -441,9 +574,6 @@ static inline int64_t Swap(int64_t value) { return Swap(static_cast(value)); } -template -class Pointer; - class Swapped { protected: bool swapped_; @@ -568,85 +698,30 @@ class MachHeader : return load_commands; } - std::vector GetSegments(const char *segment_name) const { - std::vector segment_commands; - - _foreach (load_command, GetLoadCommands()) { - if (Swap(load_command->cmd) == LC_SEGMENT) { - segment_command *segment_command = reinterpret_cast(load_command); - if (strncmp(segment_command->segname, segment_name, 16) == 0) - segment_commands.push_back(segment_command); - } - } - - return segment_commands; - } - - std::vector GetSegments64(const char *segment_name) const { - std::vector segment_commands; - - _foreach (load_command, GetLoadCommands()) { - if (Swap(load_command->cmd) == LC_SEGMENT_64) { - segment_command_64 *segment_command = reinterpret_cast(load_command); - if (strncmp(segment_command->segname, segment_name, 16) == 0) - segment_commands.push_back(segment_command); - } - } - - return segment_commands; - } - - std::vector
GetSections(const char *segment_name, const char *section_name) const { - std::vector
sections; - - _foreach (segment, GetSegments(segment_name)) { - section *section = (struct section *) (segment + 1); - - uint32_t sect; - for (sect = 0; sect != Swap(segment->nsects); ++sect) { - if (strncmp(section->sectname, section_name, 16) == 0) - sections.push_back(section); - ++section; - } - } - - return sections; - } + void ForSection(const ldid::Functor &code) const { + _foreach (load_command, GetLoadCommands()) + switch (Swap(load_command->cmd)) { + case LC_SEGMENT: { + auto segment(reinterpret_cast(load_command)); + code(segment->segname, NULL, GetOffset(segment->fileoff), segment->filesize); + auto section(reinterpret_cast(segment + 1)); + for (uint32_t i(0), e(Swap(segment->nsects)); i != e; ++i, ++section) + code(segment->segname, section->sectname, GetOffset(segment->fileoff + section->offset), section->size); + } break; - template - Pointer GetPointer(uint32_t address, const char *segment_name = NULL) const { - load_command *load_command = (struct load_command *) (mach_header_ + 1); - uint32_t cmd; - - for (cmd = 0; cmd != Swap(mach_header_->ncmds); ++cmd) { - if (Swap(load_command->cmd) == LC_SEGMENT) { - segment_command *segment_command = (struct segment_command *) load_command; - if (segment_name != NULL && strncmp(segment_command->segname, segment_name, 16) != 0) - goto next_command; - - section *sections = (struct section *) (segment_command + 1); - - uint32_t sect; - for (sect = 0; sect != Swap(segment_command->nsects); ++sect) { - section *section = §ions[sect]; - //printf("%s %u %p %p %u\n", segment_command->segname, sect, address, section->addr, section->size); - if (address >= Swap(section->addr) && address < Swap(section->addr) + Swap(section->size)) { - //printf("0x%.8x %s\n", address, segment_command->segname); - return Pointer(this, reinterpret_cast(address - Swap(section->addr) + Swap(section->offset) + (char *) mach_header_)); - } - } + case LC_SEGMENT_64: { + auto segment(reinterpret_cast(load_command)); + code(segment->segname, NULL, GetOffset(segment->fileoff), segment->filesize); + auto section(reinterpret_cast(segment + 1)); + for (uint32_t i(0), e(Swap(segment->nsects)); i != e; ++i, ++section) + code(segment->segname, section->sectname, GetOffset(segment->fileoff + section->offset), section->size); + } break; } - - next_command: - load_command = (struct load_command *) ((char *) load_command + Swap(load_command->cmdsize)); - } - - return Pointer(this); } template - Pointer GetOffset(uint32_t offset) { - return Pointer(this, reinterpret_cast(offset + (uint8_t *) mach_header_)); + Target_ *GetOffset(uint32_t offset) const { + return reinterpret_cast(offset + (uint8_t *) mach_header_); } }; @@ -717,38 +792,6 @@ class FatHeader : } }; -template -class Pointer { - private: - const MachHeader *framework_; - const Target_ *pointer_; - - public: - Pointer(const MachHeader *framework = NULL, const Target_ *pointer = NULL) : - framework_(framework), - pointer_(pointer) - { - } - - operator const Target_ *() const { - return pointer_; - } - - const Target_ *operator ->() const { - return pointer_; - } - - Pointer &operator ++() { - ++pointer_; - return *this; - } - - template - Value_ Swap(Value_ value) { - return framework_->Swap(value); - } -}; - #define CSMAGIC_REQUIREMENT uint32_t(0xfade0c00) #define CSMAGIC_REQUIREMENTS uint32_t(0xfade0c01) #define CSMAGIC_CODEDIRECTORY uint32_t(0xfade0c02) @@ -798,12 +841,23 @@ struct CodeDirectory { uint8_t spare1; uint8_t pageSize; uint32_t spare2; + uint32_t scatterOffset; + uint32_t teamIDOffset; + uint32_t spare3; + uint64_t codeLimit64; } _packed; +#ifndef LDID_NOFLAGT extern "C" uint32_t hash(uint8_t *k, uint32_t length, uint32_t initval); +#endif static void sha1(uint8_t *hash, const void *data, size_t size) { - SHA1(static_cast(data), size, hash); + LDID_SHA1(static_cast(data), size, hash); +} + +static void sha1(std::vector &hash, const void *data, size_t size) { + hash.resize(LDID_SHA1_DIGEST_LENGTH); + sha1(reinterpret_cast(hash.data()), data, size); } struct CodesignAllocation { @@ -825,6 +879,7 @@ struct CodesignAllocation { } }; +#ifndef LDID_NOTOOLS class File { private: int file_; @@ -842,7 +897,7 @@ class File { void open(const char *path, int flags) { _assert(file_ == -1); - _syscall(file_ = ::open(path, flags)); + file_ = _syscall(::open(path, flags)); } int file() const { @@ -871,13 +926,13 @@ class Map { { } - Map(const char *path, int oflag, int pflag, int mflag) : + Map(const std::string &path, int oflag, int pflag, int mflag) : Map() { open(path, oflag, pflag, mflag); } - Map(const char *path, bool edit) : + Map(const std::string &path, bool edit) : Map() { open(path, edit); @@ -891,20 +946,20 @@ class Map { return data_ == NULL; } - void open(const char *path, int oflag, int pflag, int mflag) { + void open(const std::string &path, int oflag, int pflag, int mflag) { clear(); - file_.open(path, oflag); + file_.open(path.c_str(), oflag); int file(file_.file()); struct stat stat; _syscall(fstat(file, &stat)); size_ = stat.st_size; - _syscall(data_ = mmap(NULL, size_, pflag, mflag, file, 0)); + data_ = _syscall(mmap(NULL, size_, pflag, mflag, file, 0)); } - void open(const char *path, bool edit) { + void open(const std::string &path, bool edit) { if (edit) open(path, O_RDWR, PROT_READ | PROT_WRITE, MAP_SHARED); else @@ -923,11 +978,40 @@ class Map { return std::string(static_cast(data_), size_); } }; +#endif namespace ldid { -static void Allocate(void *idata, size_t isize, std::streambuf &output, const Functor &allocate, const Functor &save) { - FatHeader source(idata, isize); +std::string Analyze(const void *data, size_t size) { + std::string entitlements; + + FatHeader fat_header(const_cast(data), size); + _foreach (mach_header, fat_header.GetMachHeaders()) + _foreach (load_command, mach_header.GetLoadCommands()) + if (mach_header.Swap(load_command->cmd) == LC_CODE_SIGNATURE) { + auto signature(reinterpret_cast(load_command)); + auto offset(mach_header.Swap(signature->dataoff)); + auto pointer(reinterpret_cast(mach_header.GetBase()) + offset); + auto super(reinterpret_cast(pointer)); + + for (size_t index(0); index != Swap(super->count); ++index) + if (Swap(super->index[index].type) == CSSLOT_ENTITLEMENTS) { + auto begin(Swap(super->index[index].offset)); + auto blob(reinterpret_cast(pointer + begin)); + auto writ(Swap(blob->length) - sizeof(*blob)); + + if (entitlements.empty()) + entitlements.assign(reinterpret_cast(blob + 1), writ); + else + _assert(entitlements.compare(0, entitlements.size(), reinterpret_cast(blob + 1), writ) == 0); + } + } + + return entitlements; +} + +static void Allocate(const void *idata, size_t isize, std::streambuf &output, const Functor &allocate, const Functor &save) { + FatHeader source(const_cast(idata), isize); size_t offset(0); if (source.IsFat()) @@ -962,10 +1046,29 @@ static void Allocate(void *idata, size_t isize, std::streambuf &output, const Fu size = end; } - size_t alloc(allocate(size)); + size_t alloc(allocate(mach_header, size)); auto *fat_arch(mach_header.GetFatArch()); - uint32_t align(fat_arch == NULL ? 0 : source.Swap(fat_arch->align)); + uint32_t align; + + if (fat_arch != NULL) + align = source.Swap(fat_arch->align); + else switch (mach_header.GetCPUType()) { + case CPU_TYPE_POWERPC: + case CPU_TYPE_POWERPC64: + case CPU_TYPE_X86: + case CPU_TYPE_X86_64: + align = 0xc; + break; + case CPU_TYPE_ARM: + case CPU_TYPE_ARM64: + align = 0xe; + break; + default: + align = 0x0; + break; + } + offset = Align(offset, 1 << align); uint32_t limit(size); @@ -1022,7 +1125,7 @@ static void Allocate(void *idata, size_t isize, std::streambuf &output, const Fu break; size_t size(mach_header.Swap(allocation.limit_ + allocation.alloc_ - mach_header.Swap(segment_command->fileoff))); segment_command->filesize = size; - segment_command->vmsize = Align(size, PageSize_); + segment_command->vmsize = Align(size, 1 << allocation.align_); } break; case LC_SEGMENT_64: { @@ -1031,7 +1134,7 @@ static void Allocate(void *idata, size_t isize, std::streambuf &output, const Fu break; size_t size(mach_header.Swap(allocation.limit_ + allocation.alloc_ - mach_header.Swap(segment_command->fileoff))); segment_command->filesize = size; - segment_command->vmsize = Align(size, PageSize_); + segment_command->vmsize = Align(size, 1 << allocation.align_); } break; } @@ -1093,9 +1196,11 @@ static void Allocate(void *idata, size_t isize, std::streambuf &output, const Fu pad(output, allocation.limit_ - allocation.size_); position += allocation.limit_ - allocation.size_; - size_t saved(save(output, allocation.limit_, overlap, top)); + size_t saved(save(mach_header, output, allocation.limit_, overlap, top)); if (allocation.alloc_ > saved) pad(output, allocation.alloc_ - saved); + else + _assert(allocation.alloc_ == saved); position += allocation.alloc_; } } @@ -1109,13 +1214,15 @@ static void insert(Blobs &blobs, uint32_t slot, const std::stringbuf &buffer) { std::swap(blobs[slot], value); } -static void insert(Blobs &blobs, uint32_t slot, uint32_t magic, const std::stringbuf &buffer) { +static const std::string &insert(Blobs &blobs, uint32_t slot, uint32_t magic, const std::stringbuf &buffer) { auto value(buffer.str()); Blob blob; blob.magic = Swap(magic); blob.length = Swap(uint32_t(sizeof(blob) + value.size())); value.insert(0, reinterpret_cast(&blob), sizeof(blob)); - std::swap(blobs[slot], value); + auto &save(blobs[slot]); + std::swap(save, value); + return save; } static size_t put(std::streambuf &output, uint32_t magic, const Blobs &blobs) { @@ -1145,6 +1252,7 @@ static size_t put(std::streambuf &output, uint32_t magic, const Blobs &blobs) { return offset; } +#ifndef LDID_NOSMIME class Buffer { private: BIO *bio_; @@ -1258,18 +1366,187 @@ class Signature { return value_; } }; +#endif + +class NullBuffer : + public std::streambuf +{ + public: + virtual std::streamsize xsputn(const char_type *data, std::streamsize size) { + return size; + } + + virtual int_type overflow(int_type next) { + return next; + } +}; + +class Digest { + public: + uint8_t sha1_[LDID_SHA1_DIGEST_LENGTH]; +}; + +class Hash { + public: + char sha1_[LDID_SHA1_DIGEST_LENGTH]; + char sha256_[LDID_SHA256_DIGEST_LENGTH]; + + operator std::vector() const { + return {sha1_, sha1_ + sizeof(sha1_)}; + } +}; + +class HashBuffer : + public std::streambuf +{ + private: + Hash &hash_; + + LDID_SHA1_CTX sha1_; + LDID_SHA256_CTX sha256_; + + public: + HashBuffer(Hash &hash) : + hash_(hash) + { + LDID_SHA1_Init(&sha1_); + LDID_SHA256_Init(&sha256_); + } + + ~HashBuffer() { + LDID_SHA1_Final(reinterpret_cast(hash_.sha1_), &sha1_); + LDID_SHA256_Final(reinterpret_cast(hash_.sha256_), &sha256_); + } + + virtual std::streamsize xsputn(const char_type *data, std::streamsize size) { + LDID_SHA1_Update(&sha1_, data, size); + LDID_SHA256_Update(&sha256_, data, size); + return size; + } + + virtual int_type overflow(int_type next) { + if (next == traits_type::eof()) + return sync(); + char value(next); + xsputn(&value, 1); + return next; + } +}; + +class HashProxy : + public HashBuffer +{ + private: + std::streambuf &buffer_; + + public: + HashProxy(Hash &hash, std::streambuf &buffer) : + HashBuffer(hash), + buffer_(buffer) + { + } + + virtual std::streamsize xsputn(const char_type *data, std::streamsize size) { + _assert(HashBuffer::xsputn(data, size) == size); + return buffer_.sputn(data, size); + } +}; + +#ifndef LDID_NOTOOLS +static bool Starts(const std::string &lhs, const std::string &rhs) { + return lhs.size() >= rhs.size() && lhs.compare(0, rhs.size(), rhs) == 0; +} + +class Split { + public: + std::string dir; + std::string base; + + Split(const std::string &path) { + size_t slash(path.rfind('/')); + if (slash == std::string::npos) + base = path; + else { + dir = path.substr(0, slash + 1); + base = path.substr(slash + 1); + } + } +}; + +static void mkdir_p(const std::string &path) { + if (path.empty()) + return; +#ifdef __WIN32__ + if (_syscall(mkdir(path.c_str()), EEXIST) == -EEXIST) + return; +#else + if (_syscall(mkdir(path.c_str(), 0755), EEXIST) == -EEXIST) + return; +#endif + auto slash(path.rfind('/', path.size() - 1)); + if (slash == std::string::npos) + return; + mkdir_p(path.substr(0, slash)); +} + +static std::string Temporary(std::filebuf &file, const Split &split) { + std::string temp(split.dir + ".ldid." + split.base); + mkdir_p(split.dir); + _assert_(file.open(temp.c_str(), std::ios::out | std::ios::trunc | std::ios::binary) == &file, "open(): %s", temp.c_str()); + return temp; +} + +static void Commit(const std::string &path, const std::string &temp) { + struct stat info; + if (_syscall(stat(path.c_str(), &info), ENOENT) == 0) { +#ifndef __WIN32__ + _syscall(chown(temp.c_str(), info.st_uid, info.st_gid)); +#endif + _syscall(chmod(temp.c_str(), info.st_mode)); + } + + _syscall(rename(temp.c_str(), path.c_str())); +} +#endif namespace ldid { -void Sign(void *idata, size_t isize, std::streambuf &output, const std::string &name, const std::string &entitlements, const std::string &key, const Slots &slots) { - Allocate(idata, isize, output, fun([&](size_t size) -> size_t { +std::vector Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &requirement, const std::string &key, const Slots &slots) { + std::vector hash(LDID_SHA1_DIGEST_LENGTH); + + std::string team; + +#ifndef LDID_NOSMIME + if (!key.empty()) { + Stuff stuff(key); + auto name(X509_get_subject_name(stuff)); + _assert(name != NULL); + auto index(X509_NAME_get_index_by_NID(name, NID_organizationalUnitName, -1)); + _assert(index >= 0); + auto next(X509_NAME_get_index_by_NID(name, NID_organizationalUnitName, index)); + _assert(next == -1); + auto entry(X509_NAME_get_entry(name, index)); + _assert(entry != NULL); + auto asn(X509_NAME_ENTRY_get_data(entry)); + _assert(asn != NULL); + team.assign(reinterpret_cast(ASN1_STRING_data(asn)), ASN1_STRING_length(asn)); + } +#endif + + // XXX: this is just a "sufficiently large number" + size_t certificate(0x3000); + + Allocate(idata, isize, output, fun([&](const MachHeader &mach_header, size_t size) -> size_t { size_t alloc(sizeof(struct SuperBlob)); uint32_t special(0); special = std::max(special, CSSLOT_REQUIREMENTS); alloc += sizeof(struct BlobIndex); - alloc += 0xc; + if (requirement.empty()) + alloc += 0xc; + else + alloc += requirement.size(); if (!entitlements.empty()) { special = std::max(special, CSSLOT_ENTITLEMENTS); @@ -1282,29 +1559,40 @@ void Sign(void *idata, size_t isize, std::streambuf &output, const std::string & alloc += sizeof(struct BlobIndex); alloc += sizeof(struct Blob); alloc += sizeof(struct CodeDirectory); - alloc += name.size() + 1; + alloc += identifier.size() + 1; + + if (!team.empty()) + alloc += team.size() + 1; if (!key.empty()) { alloc += sizeof(struct BlobIndex); alloc += sizeof(struct Blob); - // XXX: this is just a "sufficiently large number" - alloc += 0x3000; + alloc += certificate; } _foreach (slot, slots) special = std::max(special, slot.first); + mach_header.ForSection(fun([&](const char *segment, const char *section, void *data, size_t size) { + if (strcmp(segment, "__TEXT") == 0 && section != NULL && strcmp(section, "__info_plist") == 0) + special = std::max(special, CSSLOT_INFOSLOT); + })); + uint32_t normal((size + PageSize_ - 1) / PageSize_); - alloc = Align(alloc + (special + normal) * SHA_DIGEST_LENGTH, 16); + alloc = Align(alloc + (special + normal) * LDID_SHA1_DIGEST_LENGTH, 16); return alloc; - }), fun([&](std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t { + }), fun([&](const MachHeader &mach_header, std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t { Blobs blobs; if (true) { std::stringbuf data; - Blobs requirements; - put(data, CSMAGIC_REQUIREMENTS, requirements); + if (requirement.empty()) { + Blobs requirements; + put(data, CSMAGIC_REQUIREMENTS, requirements); + } else { + put(data, requirement.data(), requirement.size()); + } insert(blobs, CSSLOT_REQUIREMENTS, data); } @@ -1318,56 +1606,85 @@ void Sign(void *idata, size_t isize, std::streambuf &output, const std::string & if (true) { std::stringbuf data; + Slots posts(slots); + + mach_header.ForSection(fun([&](const char *segment, const char *section, void *data, size_t size) { + if (strcmp(segment, "__TEXT") == 0 && section != NULL && strcmp(section, "__info_plist") == 0) + sha1(posts[CSSLOT_INFOSLOT], data, size); + })); + uint32_t special(0); _foreach (blob, blobs) special = std::max(special, blob.first); - _foreach (slot, slots) + _foreach (slot, posts) special = std::max(special, slot.first); uint32_t normal((limit + PageSize_ - 1) / PageSize_); CodeDirectory directory; - directory.version = Swap(uint32_t(0x00020001)); + directory.version = Swap(uint32_t(0x00020200)); directory.flags = Swap(uint32_t(0)); - directory.hashOffset = Swap(uint32_t(sizeof(Blob) + sizeof(CodeDirectory) + name.size() + 1 + SHA_DIGEST_LENGTH * special)); - directory.identOffset = Swap(uint32_t(sizeof(Blob) + sizeof(CodeDirectory))); directory.nSpecialSlots = Swap(special); directory.codeLimit = Swap(uint32_t(limit)); directory.nCodeSlots = Swap(normal); - directory.hashSize = SHA_DIGEST_LENGTH; + directory.hashSize = LDID_SHA1_DIGEST_LENGTH; directory.hashType = CS_HASHTYPE_SHA1; directory.spare1 = 0x00; directory.pageSize = PageShift_; directory.spare2 = Swap(uint32_t(0)); + directory.scatterOffset = Swap(uint32_t(0)); + directory.spare3 = Swap(uint32_t(0)); + directory.codeLimit64 = Swap(uint64_t(0)); + + uint32_t offset(sizeof(Blob) + sizeof(CodeDirectory)); + + directory.identOffset = Swap(uint32_t(offset)); + offset += identifier.size() + 1; + + if (team.empty()) + directory.teamIDOffset = Swap(uint32_t(0)); + else { + directory.teamIDOffset = Swap(uint32_t(offset)); + offset += team.size() + 1; + } + + offset += LDID_SHA1_DIGEST_LENGTH * special; + directory.hashOffset = Swap(uint32_t(offset)); + offset += LDID_SHA1_DIGEST_LENGTH * normal; + put(data, &directory, sizeof(directory)); - put(data, name.c_str(), name.size() + 1); + put(data, identifier.c_str(), identifier.size() + 1); + if (!team.empty()) + put(data, team.c_str(), team.size() + 1); - uint8_t storage[special + normal][SHA_DIGEST_LENGTH]; - uint8_t (*hashes)[SHA_DIGEST_LENGTH] = storage + special; + std::vector storage(special + normal); + auto *hashes(&storage[special]); - memset(storage, 0, sizeof(*storage) * special); + memset(storage.data(), 0, sizeof(Digest) * special); _foreach (blob, blobs) { auto local(reinterpret_cast(&blob.second[0])); - sha1((uint8_t *) (hashes - blob.first), local, Swap(local->length)); + sha1((hashes - blob.first)->sha1_, local, Swap(local->length)); } - _foreach (slot, slots) { + _foreach (slot, posts) { _assert(sizeof(*hashes) == slot.second.size()); memcpy(hashes - slot.first, slot.second.data(), slot.second.size()); } if (normal != 1) for (size_t i = 0; i != normal - 1; ++i) - sha1(hashes[i], (PageSize_ * i < overlap.size() ? overlap.data() : top) + PageSize_ * i, PageSize_); + sha1(hashes[i].sha1_, (PageSize_ * i < overlap.size() ? overlap.data() : top) + PageSize_ * i, PageSize_); if (normal != 0) - sha1(hashes[normal - 1], top + PageSize_ * (normal - 1), ((limit - 1) % PageSize_) + 1); + sha1(hashes[normal - 1].sha1_, top + PageSize_ * (normal - 1), ((limit - 1) % PageSize_) + 1); - put(data, storage, sizeof(storage)); + put(data, storage.data(), sizeof(Digest) * storage.size()); - insert(blobs, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY, data); + const auto &save(insert(blobs, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY, data)); + sha1(hash, save.data(), save.size()); } +#ifndef LDID_NOSMIME if (!key.empty()) { std::stringbuf data; const std::string &sign(blobs[CSSLOT_CODEDIRECTORY]); @@ -1380,25 +1697,652 @@ void Sign(void *idata, size_t isize, std::streambuf &output, const std::string & std::string value(result); put(data, value.data(), value.size()); - insert(blobs, CSSLOT_SIGNATURESLOT, CSMAGIC_BLOBWRAPPER, data); + const auto &save(insert(blobs, CSSLOT_SIGNATURESLOT, CSMAGIC_BLOBWRAPPER, data)); + _assert(save.size() <= certificate); } +#endif return put(output, CSMAGIC_EMBEDDED_SIGNATURE, blobs); })); + + return hash; } +#ifndef LDID_NOTOOLS static void Unsign(void *idata, size_t isize, std::streambuf &output) { - Allocate(idata, isize, output, fun([](size_t size) -> size_t { + Allocate(idata, isize, output, fun([](const MachHeader &mach_header, size_t size) -> size_t { return 0; - }), fun([](std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t { + }), fun([](const MachHeader &mach_header, std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t { return 0; })); } +std::string DiskFolder::Path(const std::string &path) const { + return path_ + "/" + path; +} + +DiskFolder::DiskFolder(const std::string &path) : + path_(path) +{ +} + +DiskFolder::~DiskFolder() { + if (!std::uncaught_exception()) + for (const auto &commit : commit_) + Commit(commit.first, commit.second); +} + +#ifndef __WIN32__ +std::string readlink(const std::string &path) { + for (size_t size(1024); ; size *= 2) { + std::string data; + data.resize(size); + + int writ(_syscall(::readlink(path.c_str(), &data[0], data.size()))); + if (size_t(writ) >= size) + continue; + + data.resize(writ); + return data; + } +} +#endif + +void DiskFolder::Find(const std::string &root, const std::string &base, const Functor &code, const Functor &)> &link) const { + std::string path(Path(root) + base); + + DIR *dir(opendir(path.c_str())); + _assert(dir != NULL); + _scope({ _syscall(closedir(dir)); }); + + while (auto child = readdir(dir)) { + std::string name(child->d_name); + if (name == "." || name == "..") + continue; + if (Starts(name, ".ldid.")) + continue; + + bool directory; + +#ifdef __WIN32__ + struct stat info; + _syscall(stat((path + name).c_str(), &info)); + if (false); + else if (S_ISDIR(info.st_mode)) + directory = true; + else if (S_ISREG(info.st_mode)) + directory = false; + else + _assert_(false, "st_mode=%x", info.st_mode); +#else + switch (child->d_type) { + case DT_DIR: + directory = true; + break; + case DT_REG: + directory = false; + break; + case DT_LNK: + link(base + name, fun([&]() { return readlink(path + name); })); + continue; + default: + _assert_(false, "d_type=%u", child->d_type); + } +#endif + + if (directory) + Find(root, base + name + "/", code, link); + else + code(base + name); + } } +void DiskFolder::Save(const std::string &path, bool edit, const void *flag, const Functor &code) { + if (!edit) { + // XXX: use nullbuf + std::stringbuf save; + code(save); + } else { + std::filebuf save; + auto from(Path(path)); + commit_[from] = Temporary(save, from); + code(save); + } +} + +bool DiskFolder::Look(const std::string &path) const { + return _syscall(access(Path(path).c_str(), R_OK), ENOENT) == 0; +} + +void DiskFolder::Open(const std::string &path, const Functor &code) const { + std::filebuf data; + auto result(data.open(Path(path).c_str(), std::ios::binary | std::ios::in)); + _assert_(result == &data, "DiskFolder::Open(%s)", path.c_str()); + code(data, NULL); +} + +void DiskFolder::Find(const std::string &path, const Functor &code, const Functor &)> &link) const { + Find(path, "", code, link); +} +#endif + +SubFolder::SubFolder(Folder &parent, const std::string &path) : + parent_(parent), + path_(path) +{ +} + +void SubFolder::Save(const std::string &path, bool edit, const void *flag, const Functor &code) { + return parent_.Save(path_ + path, edit, flag, code); +} + +bool SubFolder::Look(const std::string &path) const { + return parent_.Look(path_ + path); +} + +void SubFolder::Open(const std::string &path, const Functor &code) const { + return parent_.Open(path_ + path, code); +} + +void SubFolder::Find(const std::string &path, const Functor &code, const Functor &)> &link) const { + return parent_.Find(path_ + path, code, link); +} + +std::string UnionFolder::Map(const std::string &path) const { + auto remap(remaps_.find(path)); + if (remap == remaps_.end()) + return path; + return remap->second; +} + +void UnionFolder::Map(const std::string &path, const Functor &code, const std::string &file, const Functor &)> &save) const { + if (file.size() >= path.size() && file.substr(0, path.size()) == path) + code(file.substr(path.size())); +} + +UnionFolder::UnionFolder(Folder &parent) : + parent_(parent) +{ +} + +void UnionFolder::Save(const std::string &path, bool edit, const void *flag, const Functor &code) { + return parent_.Save(Map(path), edit, flag, code); +} + +bool UnionFolder::Look(const std::string &path) const { + auto file(resets_.find(path)); + if (file != resets_.end()) + return true; + return parent_.Look(Map(path)); +} + +void UnionFolder::Open(const std::string &path, const Functor &code) const { + auto file(resets_.find(path)); + if (file == resets_.end()) + return parent_.Open(Map(path), code); + auto &entry(file->second); + + auto &data(entry.first); + data.pubseekpos(0, std::ios::in); + code(data, entry.second); +} + +void UnionFolder::Find(const std::string &path, const Functor &code, const Functor &)> &link) const { + for (auto &reset : resets_) + Map(path, code, reset.first, fun([&](const Functor &code) { + auto &entry(reset.second); + entry.first.pubseekpos(0, std::ios::in); + code(entry.first, entry.second); + })); + + for (auto &remap : remaps_) + Map(path, code, remap.first, fun([&](const Functor &code) { + parent_.Open(remap.second, fun([&](std::streambuf &data, const void *flag) { + code(data, flag); + })); + })); + + parent_.Find(path, fun([&](const std::string &name) { + if (deletes_.find(path + name) == deletes_.end()) + code(name); + }), fun([&](const std::string &name, const Functor &read) { + if (deletes_.find(path + name) == deletes_.end()) + link(name, read); + })); +} + +#ifndef LDID_NOTOOLS +static size_t copy(std::streambuf &source, std::streambuf &target) { + size_t total(0); + for (;;) { + char data[4096]; + size_t writ(source.sgetn(data, sizeof(data))); + if (writ == 0) + break; + _assert(target.sputn(data, writ) == writ); + total += writ; + } + return total; +} + +#ifndef LDID_NOPLIST +static plist_t plist(const std::string &data) { + plist_t plist(NULL); + if (Starts(data, "bplist00")) + plist_from_bin(data.data(), data.size(), &plist); + else + plist_from_xml(data.data(), data.size(), &plist); + _assert(plist != NULL); + return plist; +} + +static void plist_d(std::streambuf &buffer, const Functor &code) { + std::stringbuf data; + copy(buffer, data); + auto node(plist(data.str())); + _scope({ plist_free(node); }); + _assert(plist_get_node_type(node) == PLIST_DICT); + code(node); +} + +static std::string plist_s(plist_t node) { + _assert(node != NULL); + _assert(plist_get_node_type(node) == PLIST_STRING); + char *data; + plist_get_string_val(node, &data); + _scope({ free(data); }); + return data; +} +#endif + +enum Mode { + NoMode, + OptionalMode, + OmitMode, + NestedMode, + TopMode, +}; + +class Expression { + private: + regex_t regex_; + std::vector matches_; + + public: + Expression(const std::string &code) { + _assert_(regcomp(®ex_, code.c_str(), REG_EXTENDED) == 0, "regcomp()"); + matches_.resize(regex_.re_nsub + 1); + } + + ~Expression() { + regfree(®ex_); + } + + bool operator ()(const std::string &data) { + regmatch_t matches[matches_.size()]; + auto value(regexec(®ex_, data.c_str(), matches_.size(), matches, 0)); + if (value == REG_NOMATCH) + return false; + _assert_(value == 0, "regexec()"); + for (size_t i(0); i != matches_.size(); ++i) + matches_[i].assign(data.data() + matches[i].rm_so, matches[i].rm_eo - matches[i].rm_so); + return true; + } + + const std::string &operator [](size_t index) const { + return matches_[index]; + } +}; + +struct Rule { + unsigned weight_; + Mode mode_; + std::string code_; + + mutable std::auto_ptr regex_; + + Rule(unsigned weight, Mode mode, const std::string &code) : + weight_(weight), + mode_(mode), + code_(code) + { + } + + Rule(const Rule &rhs) : + weight_(rhs.weight_), + mode_(rhs.mode_), + code_(rhs.code_) + { + } + + void Compile() const { + regex_.reset(new Expression(code_)); + } + + bool operator ()(const std::string &data) const { + _assert(regex_.get() != NULL); + return (*regex_)(data); + } + + bool operator <(const Rule &rhs) const { + if (weight_ > rhs.weight_) + return true; + if (weight_ < rhs.weight_) + return false; + return mode_ > rhs.mode_; + } +}; + +struct RuleCode { + bool operator ()(const Rule *lhs, const Rule *rhs) const { + return lhs->code_ < rhs->code_; + } +}; + +#ifndef LDID_NOPLIST +static std::vector Sign(const uint8_t *prefix, size_t size, std::streambuf &buffer, Hash &hash, std::streambuf &save, const std::string &identifier, const std::string &entitlements, const std::string &requirement, const std::string &key, const Slots &slots) { + // XXX: this is a miserable fail + std::stringbuf temp; + put(temp, prefix, size); + size += copy(buffer, temp); + // XXX: this is a stupid hack + pad(temp, 0x10 - (size & 0xf)); + auto data(temp.str()); + + HashProxy proxy(hash, save); + return Sign(data.data(), data.size(), proxy, identifier, entitlements, requirement, key, slots); +} + +Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std::map &remote, const std::string &requirement, const Functor &alter) { + std::string executable; + std::string identifier; + + bool mac(false); + + std::string info("Info.plist"); + if (!folder.Look(info) && folder.Look("Resources/" + info)) { + mac = true; + info = "Resources/" + info; + } + + folder.Open(info, fun([&](std::streambuf &buffer, const void *flag) { + plist_d(buffer, fun([&](plist_t node) { + executable = plist_s(plist_dict_get_item(node, "CFBundleExecutable")); + identifier = plist_s(plist_dict_get_item(node, "CFBundleIdentifier")); + })); + })); + + if (!mac && folder.Look("MacOS/" + executable)) { + executable = "MacOS/" + executable; + mac = true; + } + + std::string entitlements; + folder.Open(executable, fun([&](std::streambuf &buffer, const void *flag) { + // XXX: this is a miserable fail + std::stringbuf temp; + auto size(copy(buffer, temp)); + // XXX: this is a stupid hack + pad(temp, 0x10 - (size & 0xf)); + auto data(temp.str()); + entitlements = alter(root, Analyze(data.data(), data.size())); + })); + + static const std::string directory("_CodeSignature/"); + static const std::string signature(directory + "CodeResources"); + + std::map> versions; + + auto &rules1(versions[""]); + auto &rules2(versions["2"]); + + const std::string resources(mac ? "Resources/" : ""); + + if (true) { + rules1.insert(Rule{1, NoMode, "^" + resources}); + if (!mac) rules1.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"}); + rules1.insert(Rule{1000, OptionalMode, "^" + resources + ".*\\.lproj/"}); + rules1.insert(Rule{1100, OmitMode, "^" + resources + ".*\\.lproj/locversion.plist$"}); + if (!mac) rules1.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"}); + rules1.insert(Rule{1, NoMode, "^version.plist$"}); + } + + if (true) { + rules2.insert(Rule{11, NoMode, ".*\\.dSYM($|/)"}); + rules2.insert(Rule{20, NoMode, "^" + resources}); + rules2.insert(Rule{2000, OmitMode, "^(.*/)?\\.DS_Store$"}); + if (!mac) rules2.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"}); + rules2.insert(Rule{10, NestedMode, "^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/"}); + rules2.insert(Rule{1, NoMode, "^.*"}); + rules2.insert(Rule{1000, OptionalMode, "^" + resources + ".*\\.lproj/"}); + rules2.insert(Rule{1100, OmitMode, "^" + resources + ".*\\.lproj/locversion.plist$"}); + rules2.insert(Rule{20, OmitMode, "^Info\\.plist$"}); + rules2.insert(Rule{20, OmitMode, "^PkgInfo$"}); + if (!mac) rules2.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"}); + rules2.insert(Rule{10, NestedMode, "^[^/]+$"}); + rules2.insert(Rule{20, NoMode, "^embedded\\.provisionprofile$"}); + rules2.insert(Rule{20, NoMode, "^version\\.plist$"}); + } + + std::map local; + + std::string failure(mac ? "Contents/|Versions/[^/]*/Resources/" : ""); + Expression nested("^(Frameworks/[^/]*\\.framework|PlugIns/[^/]*\\.appex(()|/[^/]*.app))/(" + failure + ")Info\\.plist$"); + std::map bundles; + + folder.Find("", fun([&](const std::string &name) { + if (!nested(name)) + return; + auto bundle(root + Split(name).dir); + bundle.resize(bundle.size() - resources.size()); + SubFolder subfolder(folder, bundle); + + bundles[nested[1]] = Sign(bundle, subfolder, key, local, "", Starts(name, "PlugIns/") ? alter : + static_cast &>(fun([&](const std::string &, const std::string &entitlements) -> std::string { return entitlements; }))); + }), fun([&](const std::string &name, const Functor &read) { + })); + + std::set excludes; + + auto exclude([&](const std::string &name) { + // BundleDiskRep::adjustResources -> builder.addExclusion + if (name == executable || Starts(name, directory) || Starts(name, "_MASReceipt/") || name == "CodeResources") + return true; + + for (const auto &bundle : bundles) + if (Starts(name, bundle.first + "/")) { + excludes.insert(name); + return true; + } + + return false; + }); + + std::map links; + + folder.Find("", fun([&](const std::string &name) { + if (exclude(name)) + return; + + if (local.find(name) != local.end()) + return; + auto &hash(local[name]); + + folder.Open(name, fun([&](std::streambuf &data, const void *flag) { + union { + struct { + uint32_t magic; + uint32_t count; + }; + + uint8_t bytes[8]; + } header; + + auto size(most(data, &header.bytes, sizeof(header.bytes))); + + if (name != "_WatchKitStub/WK" && size == sizeof(header.bytes)) + switch (Swap(header.magic)) { + case FAT_MAGIC: + // Java class file format + if (Swap(header.count) >= 40) + break; + case FAT_CIGAM: + case MH_MAGIC: case MH_MAGIC_64: + case MH_CIGAM: case MH_CIGAM_64: + folder.Save(name, true, flag, fun([&](std::streambuf &save) { + Slots slots; + Sign(header.bytes, size, data, hash, save, identifier, "", "", key, slots); + })); + return; + } + + folder.Save(name, false, flag, fun([&](std::streambuf &save) { + HashProxy proxy(hash, save); + put(proxy, header.bytes, size); + copy(data, proxy); + })); + })); + }), fun([&](const std::string &name, const Functor &read) { + if (exclude(name)) + return; + + links[name] = read(); + })); + + auto plist(plist_new_dict()); + _scope({ plist_free(plist); }); + + for (const auto &version : versions) { + auto files(plist_new_dict()); + plist_dict_set_item(plist, ("files" + version.first).c_str(), files); + + for (const auto &rule : version.second) + rule.Compile(); + + bool old(&version.second == &rules1); + + for (const auto &hash : local) + for (const auto &rule : version.second) + if (rule(hash.first)) { + if (!old && mac && excludes.find(hash.first) != excludes.end()); + else if (old && rule.mode_ == NoMode) + plist_dict_set_item(files, hash.first.c_str(), plist_new_data(hash.second.sha1_, sizeof(hash.second.sha1_))); + else if (rule.mode_ != OmitMode) { + auto entry(plist_new_dict()); + plist_dict_set_item(entry, "hash", plist_new_data(hash.second.sha1_, sizeof(hash.second.sha1_))); + if (!old) + plist_dict_set_item(entry, "hash2", plist_new_data(hash.second.sha256_, sizeof(hash.second.sha256_))); + if (rule.mode_ == OptionalMode) + plist_dict_set_item(entry, "optional", plist_new_bool(true)); + plist_dict_set_item(files, hash.first.c_str(), entry); + } + + break; + } + + for (const auto &link : links) + for (const auto &rule : version.second) + if (rule(link.first)) { + if (rule.mode_ != OmitMode) { + auto entry(plist_new_dict()); + plist_dict_set_item(entry, "symlink", plist_new_string(link.second.c_str())); + if (rule.mode_ == OptionalMode) + plist_dict_set_item(entry, "optional", plist_new_bool(true)); + plist_dict_set_item(files, link.first.c_str(), entry); + } + + break; + } + + if (!old && mac) + for (const auto &bundle : bundles) { + auto entry(plist_new_dict()); + plist_dict_set_item(entry, "cdhash", plist_new_data(bundle.second.hash.data(), bundle.second.hash.size())); + plist_dict_set_item(entry, "requirement", plist_new_string("anchor apple generic")); + plist_dict_set_item(files, bundle.first.c_str(), entry); + } + } + + for (const auto &version : versions) { + auto rules(plist_new_dict()); + plist_dict_set_item(plist, ("rules" + version.first).c_str(), rules); + + std::multiset ordered; + for (const auto &rule : version.second) + ordered.insert(&rule); + + for (const auto &rule : ordered) + if (rule->weight_ == 1 && rule->mode_ == NoMode) + plist_dict_set_item(rules, rule->code_.c_str(), plist_new_bool(true)); + else { + auto entry(plist_new_dict()); + plist_dict_set_item(rules, rule->code_.c_str(), entry); + + switch (rule->mode_) { + case NoMode: + break; + case OmitMode: + plist_dict_set_item(entry, "omit", plist_new_bool(true)); + break; + case OptionalMode: + plist_dict_set_item(entry, "optional", plist_new_bool(true)); + break; + case NestedMode: + plist_dict_set_item(entry, "nested", plist_new_bool(true)); + break; + case TopMode: + plist_dict_set_item(entry, "top", plist_new_bool(true)); + break; + } + + if (rule->weight_ >= 10000) + plist_dict_set_item(entry, "weight", plist_new_uint(rule->weight_)); + else if (rule->weight_ != 1) + plist_dict_set_item(entry, "weight", plist_new_real(rule->weight_)); + } + } + + folder.Save(signature, true, NULL, fun([&](std::streambuf &save) { + HashProxy proxy(local[signature], save); + char *xml(NULL); + uint32_t size; + plist_to_xml(plist, &xml, &size); + _scope({ free(xml); }); + put(proxy, xml, size); + })); + + Bundle bundle; + bundle.path = executable; + + folder.Open(executable, fun([&](std::streambuf &buffer, const void *flag) { + folder.Save(executable, true, flag, fun([&](std::streambuf &save) { + Slots slots; + slots[1] = local.at(info); + slots[3] = local.at(signature); + bundle.hash = Sign(NULL, 0, buffer, local[executable], save, identifier, entitlements, requirement, key, slots); + })); + })); + + for (const auto &entry : local) + remote[root + entry.first] = entry.second; + + return bundle; +} + +Bundle Sign(const std::string &root, Folder &folder, const std::string &key, const std::string &requirement, const Functor &alter) { + std::map local; + return Sign(root, folder, key, local, requirement, alter); +} +#endif + +#endif +} + +#ifndef LDID_NOTOOLS int main(int argc, char *argv[]) { +#ifndef LDID_NOSMIME OpenSSL_add_all_algorithms(); +#endif union { uint16_t word; @@ -1409,8 +2353,11 @@ int main(int argc, char *argv[]) { bool flag_r(false); bool flag_e(false); + bool flag_q(false); +#ifndef LDID_NOFLAGT bool flag_T(false); +#endif bool flag_S(false); bool flag_s(false); @@ -1420,15 +2367,20 @@ int main(int argc, char *argv[]) { bool flag_A(false); bool flag_a(false); + bool flag_u(false); + uint32_t flag_CPUType(_not(uint32_t)); uint32_t flag_CPUSubtype(_not(uint32_t)); const char *flag_I(NULL); +#ifndef LDID_NOFLAGT bool timeh(false); uint32_t timev(0); +#endif Map entitlements; + Map requirement; Map key; ldid::Slots slots; @@ -1462,9 +2414,14 @@ int main(int argc, char *argv[]) { char *arge; unsigned number(strtoul(slot, &arge, 0)); _assert(arge == colon); - std::string &hash(slots[number]); - hash.resize(SHA_DIGEST_LENGTH); - sha1(reinterpret_cast(&hash[0]), file.data(), file.size()); + sha1(slots[number], file.data(), file.size()); + } break; + + case 'q': flag_q = true; break; + + case 'Q': { + const char *xml = argv[argi] + 2; + requirement.open(xml, O_RDONLY, PROT_READ, MAP_PRIVATE); } break; case 'D': flag_D = true; break; @@ -1503,9 +2460,11 @@ int main(int argc, char *argv[]) { break; case 'K': - key.open(argv[argi] + 2, O_RDONLY, PROT_READ, MAP_PRIVATE); + if (argv[argi][2] != '\0') + key.open(argv[argi] + 2, O_RDONLY, PROT_READ, MAP_PRIVATE); break; +#ifndef LDID_NOFLAGT case 'T': { flag_T = true; if (argv[argi][2] == '-') @@ -1516,6 +2475,11 @@ int main(int argc, char *argv[]) { _assert(arge == argv[argi] + strlen(argv[argi])); } } break; +#endif + + case 'u': { + flag_u = true; + } break; case 'I': { flag_I = argv[argi] + 2; @@ -1535,41 +2499,45 @@ int main(int argc, char *argv[]) { size_t filei(0), filee(0); _foreach (file, files) try { - const char *path(file.c_str()); - - if (flag_S || flag_r) { + std::string path(file); + + struct stat info; + _syscall(stat(path.c_str(), &info)); + + if (S_ISDIR(info.st_mode)) { +#ifndef LDID_NOPLIST + _assert(!flag_r); + ldid::DiskFolder folder(path); + path += "/" + Sign("", folder, key, requirement, ldid::fun([&](const std::string &, const std::string &) -> std::string { return entitlements; })).path; +#else + _assert(false); +#endif + } else if (flag_S || flag_r) { Map input(path, O_RDONLY, PROT_READ, MAP_PRIVATE); - std::string dir; - const char *base = strrchr(path, '/'); - - if (base != NULL) - dir.assign(path, base++ - path + 1); - else - base = path; - - std::string temp(dir + "." + base + ".cs"); std::filebuf output; - _assert(output.open(temp.c_str(), std::ios::out | std::ios::trunc | std::ios::binary) == &output); + Split split(path); + auto temp(Temporary(output, split)); if (flag_r) ldid::Unsign(input.data(), input.size(), output); else { - const char *name(flag_I ?: base); - ldid::Sign(input.data(), input.size(), output, name, entitlements, key, slots); + std::string identifier(flag_I ?: split.base.c_str()); + ldid::Sign(input.data(), input.size(), output, identifier, entitlements, requirement, key, slots); } - struct stat info; - _syscall(stat(path, &info)); -#ifndef __WIN32__ - _syscall(chown(temp.c_str(), info.st_uid, info.st_gid)); -#endif - _syscall(chmod(temp.c_str(), info.st_mode)); - _syscall(unlink(path)); - _syscall(rename(temp.c_str(), path)); + Commit(path, temp); } - Map mapping(path, flag_T || flag_s); + bool modify(false); +#ifndef LDID_NOFLAGT + if (flag_T) + modify = true; +#endif + if (flag_s) + modify = true; + + Map mapping(path, modify); FatHeader fat_header(mapping.data(), mapping.size()); _foreach (mach_header, fat_header.GetMachHeaders()) { @@ -1594,6 +2562,19 @@ int main(int argc, char *argv[]) { signature = reinterpret_cast(load_command); else if (cmd == LC_ENCRYPTION_INFO || cmd == LC_ENCRYPTION_INFO_64) encryption = reinterpret_cast(load_command); + else if (cmd == LC_LOAD_DYLIB) { + volatile struct dylib_command *dylib_command(reinterpret_cast(load_command)); + const char *name(reinterpret_cast(load_command) + mach_header.Swap(dylib_command->dylib.name)); + + if (strcmp(name, "/System/Library/Frameworks/UIKit.framework/UIKit") == 0) { + if (flag_u) { + Version version; + version.value = mach_header.Swap(dylib_command->dylib.current_version); + printf("uikit=%u.%u.%u\n", version.major, version.minor, version.patch); + } + } + } +#ifndef LDID_NOFLAGT else if (cmd == LC_ID_DYLIB) { volatile struct dylib_command *dylib_command(reinterpret_cast(load_command)); @@ -1610,6 +2591,7 @@ int main(int argc, char *argv[]) { dylib_command->dylib.timestamp = mach_header.Swap(timed); } } +#endif } if (flag_D) { @@ -1634,6 +2616,23 @@ int main(int argc, char *argv[]) { } } + if (flag_q) { + _assert(signature != NULL); + + uint32_t data = mach_header.Swap(signature->dataoff); + + uint8_t *top = reinterpret_cast(mach_header.GetBase()); + uint8_t *blob = top + data; + struct SuperBlob *super = reinterpret_cast(blob); + + for (size_t index(0); index != Swap(super->count); ++index) + if (Swap(super->index[index].type) == CSSLOT_REQUIREMENTS) { + uint32_t begin = Swap(super->index[index].offset); + struct Blob *requirement = reinterpret_cast(blob + begin); + fwrite(requirement, 1, Swap(requirement->length), stdout); + } + } + if (flag_s) { _assert(signature != NULL); @@ -1646,9 +2645,9 @@ int main(int argc, char *argv[]) { for (size_t index(0); index != Swap(super->count); ++index) if (Swap(super->index[index].type) == CSSLOT_CODEDIRECTORY) { uint32_t begin = Swap(super->index[index].offset); - struct CodeDirectory *directory = reinterpret_cast(blob + begin); + struct CodeDirectory *directory = reinterpret_cast(blob + begin + sizeof(Blob)); - uint8_t (*hashes)[SHA_DIGEST_LENGTH] = reinterpret_cast(blob + begin + Swap(directory->hashOffset)); + uint8_t (*hashes)[LDID_SHA1_DIGEST_LENGTH] = reinterpret_cast(blob + begin + Swap(directory->hashOffset)); uint32_t pages = Swap(directory->nCodeSlots); if (pages != 1) @@ -1668,3 +2667,4 @@ int main(int argc, char *argv[]) { return filee; } +#endif