X-Git-Url: https://git.saurik.com/ldid.git/blobdiff_plain/f65c321bfadb8724b54387923206862bd52e5460..23c11ee8bcbc98bcaa3bc3682ab123f8a44d0b01:/ldid.cpp diff --git a/ldid.cpp b/ldid.cpp index bf82805..374dfcd 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -23,19 +23,23 @@ #include #include #include -#include +#include +#include #include #include #include #include #include +#include +#include #include #include #include #include #include +#include #include #include @@ -43,33 +47,36 @@ #include #include -#include +#include + +#include "ldid.hpp" #define _assert___(line) \ #line #define _assert__(line) \ _assert___(line) -#define _assert_(e) \ - throw __FILE__ "(" _assert__(__LINE__) "): _assert(" e ")" -#define _assert(expr) \ +#define _assert_(expr, format, ...) \ do if (!(expr)) { \ - fprintf(stderr, "%s(%u): _assert(%s); errno=%u\n", __FILE__, __LINE__, #expr, errno); \ - _assert_(#expr); \ + fprintf(stderr, "%s(%u): _assert(): " format "\n", __FILE__, __LINE__, ## __VA_ARGS__); \ + throw __FILE__ "(" _assert__(__LINE__) "): _assert(" #expr ")"; \ } while (false) -#define _syscall(expr) ({ \ - __typeof__(expr) _value; \ - do if ((long) (_value = (expr)) != -1) \ - break; \ - else switch (errno) { \ - case EINTR: \ - continue; \ - default: \ - _assert(false); \ - } while (true); \ - _value; \ -}) +#define _assert(expr) \ + _assert_(expr, "%s", #expr) + +#define _syscall(expr, ...) [&] { for (;;) { \ + auto _value(expr); \ + if ((long) _value != -1) \ + return _value; \ + int error(errno); \ + if (error == EINTR) \ + continue; \ + for (auto success : (long[]) {__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__) @@ -92,6 +99,40 @@ 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) + struct fat_header { uint32_t magic; uint32_t nfat_arch; @@ -376,6 +417,9 @@ Type_ Align(Type_ value, size_t align) { return value; } +static const uint8_t PageShift_(0x0c); +static const uint32_t PageSize_(1 << PageShift_); + static inline uint16_t Swap_(uint16_t value) { return ((value >> 8) & 0x00ff) | @@ -836,7 +880,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 { @@ -865,13 +909,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); @@ -881,20 +925,24 @@ class Map { clear(); } - void open(const char *path, int oflag, int pflag, int mflag) { + bool empty() const { + return data_ == NULL; + } + + 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 @@ -914,50 +962,10 @@ class Map { } }; -// I wish Apple cared about providing quality toolchains :/ - -template -class Functor; - -template -class Functor { - public: - virtual Type_ operator ()(Args_... args) const = 0; -}; - -template -class FunctorImpl; - -template -class FunctorImpl : - public Functor -{ - private: - const Value_ *value_; - - public: - FunctorImpl() : - value_(NULL) - { - } - - FunctorImpl(const Value_ &value) : - value_(&value) - { - } - - virtual Type_ operator ()(Args_... args) const { - return (*value_)(args...); - } -}; - -template -FunctorImpl fun(const Function_ &value) { - return value; -} +namespace ldid { -static void resign(void *idata, size_t isize, std::streambuf &output, const Functor &allocate, const Functor &save) { - FatHeader source(idata, isize); +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()) @@ -1004,7 +1012,7 @@ static void resign(void *idata, size_t isize, std::streambuf &output, const Func allocations.push_back(CodesignAllocation(mach_header, offset, size, limit, alloc, align)); offset += size + alloc; - offset = Align(offset, 16); + offset = Align(offset, 0x10); } size_t position(0); @@ -1052,7 +1060,7 @@ static void resign(void *idata, size_t isize, std::streambuf &output, const Func 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, 0x1000); + segment_command->vmsize = Align(size, PageSize_); } break; case LC_SEGMENT_64: { @@ -1061,7 +1069,7 @@ static void resign(void *idata, size_t isize, std::streambuf &output, const Func 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, 0x1000); + segment_command->vmsize = Align(size, PageSize_); } break; } @@ -1130,6 +1138,8 @@ static void resign(void *idata, size_t isize, std::streambuf &output, const Func } } +} + typedef std::map Blobs; static void insert(Blobs &blobs, uint32_t slot, const std::stringbuf &buffer) { @@ -1287,11 +1297,125 @@ class Signature { } }; -void resign(void *idata, size_t isize, std::streambuf &output, const std::string &name, const std::string &entitlements, const std::string &key) { - uint8_t pageshift(0x0c); - uint32_t pagesize(1 << pageshift); +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 HashBuffer : + public std::streambuf +{ + private: + std::vector &hash_; + SHA_CTX context_; + + public: + HashBuffer(std::vector &hash) : + hash_(hash) + { + SHA1_Init(&context_); + } - resign(idata, isize, output, fun([&](size_t size) -> size_t { + ~HashBuffer() { + hash_.resize(SHA_DIGEST_LENGTH); + SHA1_Final(reinterpret_cast(hash_.data()), &context_); + } + + virtual std::streamsize xsputn(const char_type *data, std::streamsize size) { + SHA1_Update(&context_, 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(std::vector &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); + } +}; + +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; + if (_syscall(mkdir(path.c_str(), 0755), EEXIST) == -EEXIST) + return; + 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())); +} + +namespace ldid { + +void Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &key, const Slots &slots) { + Allocate(idata, isize, output, fun([&](size_t size) -> size_t { size_t alloc(sizeof(struct SuperBlob)); uint32_t special(0); @@ -1311,7 +1435,7 @@ void resign(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 (!key.empty()) { alloc += sizeof(struct BlobIndex); @@ -1320,7 +1444,10 @@ void resign(void *idata, size_t isize, std::streambuf &output, const std::string alloc += 0x3000; } - uint32_t normal((size + pagesize - 1) / pagesize); + _foreach (slot, slots) + special = std::max(special, slot.first); + + uint32_t normal((size + PageSize_ - 1) / PageSize_); alloc = Align(alloc + (special + normal) * SHA_DIGEST_LENGTH, 16); return alloc; }), fun([&](std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t { @@ -1347,12 +1474,14 @@ void resign(void *idata, size_t isize, std::streambuf &output, const std::string uint32_t special(0); _foreach (blob, blobs) special = std::max(special, blob.first); - uint32_t normal((limit + pagesize - 1) / pagesize); + _foreach (slot, slots) + special = std::max(special, slot.first); + uint32_t normal((limit + PageSize_ - 1) / PageSize_); CodeDirectory directory; directory.version = Swap(uint32_t(0x00020001)); directory.flags = Swap(uint32_t(0)); - directory.hashOffset = Swap(uint32_t(sizeof(Blob) + sizeof(CodeDirectory) + name.size() + 1 + SHA_DIGEST_LENGTH * special)); + directory.hashOffset = Swap(uint32_t(sizeof(Blob) + sizeof(CodeDirectory) + identifier.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)); @@ -1360,11 +1489,11 @@ void resign(void *idata, size_t isize, std::streambuf &output, const std::string directory.hashSize = SHA_DIGEST_LENGTH; directory.hashType = CS_HASHTYPE_SHA1; directory.spare1 = 0x00; - directory.pageSize = pageshift; + directory.pageSize = PageShift_; directory.spare2 = Swap(uint32_t(0)); put(data, &directory, sizeof(directory)); - put(data, name.c_str(), name.size() + 1); + put(data, identifier.c_str(), identifier.size() + 1); uint8_t storage[special + normal][SHA_DIGEST_LENGTH]; uint8_t (*hashes)[SHA_DIGEST_LENGTH] = storage + special; @@ -1376,11 +1505,16 @@ void resign(void *idata, size_t isize, std::streambuf &output, const std::string sha1((uint8_t *) (hashes - blob.first), local, Swap(local->length)); } + _foreach (slot, slots) { + _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], (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], top + PageSize_ * (normal - 1), ((limit - 1) % PageSize_) + 1); put(data, storage, sizeof(storage)); @@ -1406,14 +1540,392 @@ void resign(void *idata, size_t isize, std::streambuf &output, const std::string })); } -static void resign(void *idata, size_t isize, std::streambuf &output) { - resign(idata, isize, output, fun([](size_t size) -> size_t { +static void Unsign(void *idata, size_t isize, std::streambuf &output) { + Allocate(idata, isize, output, fun([](size_t size) -> size_t { return 0; }), fun([](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) { + 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); +} + +void DiskFolder::Save(const std::string &path, const Functor &code) { + std::filebuf save; + auto from(Path(path)); + commit_[from] = Temporary(save, from); + code(save); +} + +bool DiskFolder::Open(const std::string &path, const Functor &code) { + std::filebuf data; + auto result(data.open(Path(path).c_str(), std::ios::binary | std::ios::in)); + if (result == NULL) + return false; + _assert(result == &data); + code(data); + return true; +} + +void DiskFolder::Find(const std::string &path, const Functor &)> &)>&code) { + auto root(Path(path)); + + FTS *fts(fts_open((char *[]) {const_cast(root.c_str()), NULL}, FTS_PHYSICAL | FTS_NOCHDIR, NULL)); + _assert(fts != NULL); + _scope({ fts_close(fts); }); + + while (FTSENT *entry = fts_read(fts)) { + _assert(entry->fts_pathlen >= root.size()); + _assert(strncmp(entry->fts_path, root.c_str(), root.size()) == 0); + if (entry->fts_pathlen == root.size()) + continue; + + _assert(entry->fts_path[root.size()] == '/'); + std::string name(entry->fts_path + root.size() + 1); + + if (Starts(Split(name).base, ".ldid.")) + continue; + + switch (auto info = entry->fts_info) { + case FTS_D: + case FTS_DP: + break; + + case FTS_F: { + code(name, fun([&](const Functor &code) { + std::string access(path + name); + _assert_(Open(access, fun([&](std::streambuf &data) { + NullBuffer save; + code(data, save); + })), "open(): %s", access.c_str()); + })); + } break; + + default: + _assert_(false, "fts_info=%u", info); + } + } +} + +SubFolder::SubFolder(Folder *parent, const std::string &path) : + parent_(parent), + path_(path) +{ +} + +void SubFolder::Save(const std::string &path, const Functor &code) { + return parent_->Save(path_ + path, code); +} + +bool SubFolder::Open(const std::string &path, const Functor &code) { + return parent_->Open(path_ + path, code); +} + +void SubFolder::Find(const std::string &path, const Functor &)> &)> &code) { + return parent_->Find(path_ + path, code); +} + +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; +} + +static PList::Structure *plist(const std::string &data) { + if (!Starts(data, "bplist00")) + return PList::Structure::FromXml(data); + std::vector bytes(data.data(), data.data() + data.size()); + return PList::Structure::FromBin(bytes); +} + +static void plist_d(std::streambuf &buffer, const Functor &code) { + std::stringbuf data; + copy(buffer, data); + PList::Structure *structure(plist(data.str())); + _scope({ delete structure; }); + auto dictionary(dynamic_cast(structure)); + _assert(dictionary != NULL); + code(dictionary); +} + +static std::string plist_s(PList::Node *node) { + auto value(dynamic_cast(node)); + _assert(value != NULL); + return value->GetValue(); +} + +enum Mode { + NoMode, + OptionalMode, + OmitMode, + NestedMode, + TopMode, +}; + +class Expression { + private: + regex_t regex_; + + public: + Expression(const std::string &code) { + _assert_(regcomp(®ex_, code.c_str(), REG_EXTENDED | REG_NOSUB) == 0, "regcomp()"); + } + + ~Expression() { + regfree(®ex_); + } + + bool operator ()(const std::string &data) const { + auto value(regexec(®ex_, data.c_str(), 0, NULL, 0)); + if (value == REG_NOMATCH) + return false; + _assert_(value == 0, "regexec()"); + return true; + } +}; + +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_; + } +}; + +std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::map> &remote) { + std::string executable; + std::string identifier; + + static const std::string info("Info.plist"); + + _assert_(folder.Open(info, fun([&](std::streambuf &buffer) { + plist_d(buffer, fun([&](PList::Dictionary *dictionary) { + executable = plist_s(((*dictionary)["CFBundleExecutable"])); + identifier = plist_s(((*dictionary)["CFBundleIdentifier"])); + })); + })), "open(): Info.plist"); + + std::map> versions; + + auto &rules1(versions[""]); + auto &rules2(versions["2"]); + + static const std::string signature("_CodeSignature/CodeResources"); + + folder.Open(signature, fun([&](std::streambuf &buffer) { + plist_d(buffer, fun([&](PList::Dictionary *dictionary) { + // XXX: maybe attempt to preserve existing rules + })); + })); + + if (true) { + rules1.insert(Rule{1, NoMode, "^"}); + rules1.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"}); + rules1.insert(Rule{1000, OptionalMode, "^.*\\.lproj/"}); + rules1.insert(Rule{1100, OmitMode, "^.*\\.lproj/locversion.plist$"}); + 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, "^"}); + rules2.insert(Rule{2000, OmitMode, "^(.*/)?\\.DS_Store$"}); + 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, "^.*\\.lproj/"}); + rules2.insert(Rule{1100, OmitMode, "^.*\\.lproj/locversion.plist$"}); + rules2.insert(Rule{20, OmitMode, "^Info\\.plist$"}); + rules2.insert(Rule{20, OmitMode, "^PkgInfo$"}); + 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; + + static Expression nested("^PlugIns/[^/]*\\.appex/Info\\.plist$"); + + folder.Find("", fun([&](const std::string &name, const Functor &)> &code) { + if (!nested(name)) + return; + auto bundle(root + Split(name).dir); + SubFolder subfolder(&folder, bundle); + Bundle(bundle, subfolder, key, local); + })); + + folder.Find("", fun([&](const std::string &name, const Functor &)> &code) { + if (name == executable || name == signature) + return; + + auto &hash(local[name]); + if (!hash.empty()) + return; + + code(fun([&](std::streambuf &data, std::streambuf &save) { + HashProxy proxy(hash, save); + copy(data, proxy); + })); + + _assert(hash.size() == SHA_DIGEST_LENGTH); + })); + + PList::Dictionary plist; + + for (const auto &version : versions) { + PList::Dictionary files; + + for (const auto &rule : version.second) + rule.Compile(); + + for (const auto &hash : local) + for (const auto &rule : version.second) + if (rule(hash.first)) { + if (rule.mode_ == NoMode) + files.Set(hash.first, PList::Data(hash.second)); + else if (rule.mode_ == OptionalMode) { + PList::Dictionary entry; + entry.Set("hash", PList::Data(hash.second)); + entry.Set("optional", PList::Boolean(true)); + files.Set(hash.first, entry); + } + + break; + } + + plist.Set("files" + version.first, files); + } + + for (const auto &version : versions) { + PList::Dictionary 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) + rules.Set(rule->code_, PList::Boolean(true)); + else { + PList::Dictionary entry; + + switch (rule->mode_) { + case NoMode: + break; + case OmitMode: + entry.Set("omit", PList::Boolean(true)); + break; + case OptionalMode: + entry.Set("optional", PList::Boolean(true)); + break; + case NestedMode: + entry.Set("nested", PList::Boolean(true)); + break; + case TopMode: + entry.Set("top", PList::Boolean(true)); + break; + } + + if (rule->weight_ >= 10000) + entry.Set("weight", PList::Integer(rule->weight_)); + else if (rule->weight_ != 1) + entry.Set("weight", PList::Real(rule->weight_)); + + rules.Set(rule->code_, entry); + } + + plist.Set("rules" + version.first, rules); + } + + folder.Save(signature, fun([&](std::streambuf &save) { + HashProxy proxy(local[signature], save); + auto xml(plist.ToXml()); + put(proxy, xml.data(), xml.size()); + })); + + folder.Open(executable, fun([&](std::streambuf &buffer) { + // XXX: this is a miserable fail + std::stringbuf temp; + copy(buffer, temp); + auto data(temp.str()); + + folder.Save(executable, fun([&](std::streambuf &save) { + Slots slots; + slots[1] = local.at(info); + slots[3] = local.at(signature); + + HashProxy proxy(local[executable], save); + Sign(data.data(), data.size(), proxy, identifier, "", key, slots); + })); + })); + + for (const auto &hash : local) + remote[root + hash.first] = hash.second; + + return executable; +} + +} + int main(int argc, char *argv[]) { OpenSSL_add_all_algorithms(); @@ -1447,6 +1959,7 @@ int main(int argc, char *argv[]) { Map entitlements; Map key; + ldid::Slots slots; std::vector files; @@ -1462,14 +1975,33 @@ int main(int argc, char *argv[]) { if (argv[argi][0] != '-') files.push_back(argv[argi]); else switch (argv[argi][1]) { - case 'r': flag_r = true; break; + case 'r': + _assert(!flag_s); + _assert(!flag_S); + flag_r = true; + break; + case 'e': flag_e = true; break; + case 'E': { + const char *slot = argv[argi] + 2; + const char *colon = strchr(slot, ':'); + _assert(colon != NULL); + Map file(colon + 1, O_RDONLY, PROT_READ, MAP_PRIVATE); + char *arge; + unsigned number(strtoul(slot, &arge, 0)); + _assert(arge == colon); + std::vector &hash(slots[number]); + hash.resize(SHA_DIGEST_LENGTH); + sha1(reinterpret_cast(hash.data()), file.data(), file.size()); + } break; + case 'D': flag_D = true; break; case 'a': flag_a = true; break; case 'A': + _assert(!flag_A); flag_A = true; if (argv[argi][2] != '\0') { const char *cpu = argv[argi] + 2; @@ -1484,11 +2016,13 @@ int main(int argc, char *argv[]) { break; case 's': + _assert(!flag_r); _assert(!flag_S); flag_s = true; break; case 'S': + _assert(!flag_r); _assert(!flag_s); flag_S = true; if (argv[argi][2] != '\0') { @@ -1521,7 +2055,8 @@ int main(int argc, char *argv[]) { break; } - _assert(!flag_S || !flag_r); + _assert(flag_S || key.empty()); + _assert(flag_S || flag_I == NULL); if (files.empty()) usage: { exit(0); @@ -1529,33 +2064,34 @@ int main(int argc, char *argv[]) { size_t filei(0), filee(0); _foreach (file, files) try { - const char *path(file.c_str()); - const char *base = strrchr(path, '/'); + std::string path(file); - std::string dir; - if (base != NULL) - dir.assign(path, base++ - path + 1); - else - base = path; - - const char *name(flag_I ?: base); - std::string temp; + struct stat info; + _syscall(stat(path.c_str(), &info)); - if (flag_S || flag_r) { + if (S_ISDIR(info.st_mode)) { + _assert(!flag_r); + ldid::DiskFolder folder(path); + std::map> hashes; + path += "/" + Bundle("", folder, key, hashes); + } else if (flag_S || flag_r) { Map input(path, O_RDONLY, PROT_READ, MAP_PRIVATE); - 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) - resign(input.data(), input.size(), output); + ldid::Unsign(input.data(), input.size(), output); else { - resign(input.data(), input.size(), output, name, entitlements, key); + std::string identifier(flag_I ?: split.base.c_str()); + ldid::Sign(input.data(), input.size(), output, identifier, entitlements, key, slots); } + + Commit(path, temp); } - Map mapping(!temp.empty() ? temp.c_str() : path, flag_T || flag_s); + Map mapping(path, flag_T || flag_s); FatHeader fat_header(mapping.data(), mapping.size()); _foreach (mach_header, fat_header.GetMachHeaders()) { @@ -1616,7 +2152,7 @@ int main(int argc, char *argv[]) { if (Swap(super->index[index].type) == CSSLOT_ENTITLEMENTS) { uint32_t begin = Swap(super->index[index].offset); struct Blob *entitlements = reinterpret_cast(blob + begin); - fwrite(entitlements + 1, 1, Swap(entitlements->length) - sizeof(struct Blob), stdout); + fwrite(entitlements + 1, 1, Swap(entitlements->length) - sizeof(*entitlements), stdout); } } @@ -1639,24 +2175,13 @@ int main(int argc, char *argv[]) { if (pages != 1) for (size_t i = 0; i != pages - 1; ++i) - sha1(hashes[i], top + 0x1000 * i, 0x1000); + sha1(hashes[i], top + PageSize_ * i, PageSize_); if (pages != 0) - sha1(hashes[pages - 1], top + 0x1000 * (pages - 1), ((data - 1) % 0x1000) + 1); + sha1(hashes[pages - 1], top + PageSize_ * (pages - 1), ((data - 1) % PageSize_) + 1); } } } - if (!temp.empty()) { - 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)); - } - ++filei; } catch (const char *) { ++filee;