X-Git-Url: https://git.saurik.com/ldid.git/blobdiff_plain/51ced02370cf602774155b38b0c54830dae100ea..66f2305d57b04ba04018f98f91494cd4dabd1249:/ldid.cpp diff --git a/ldid.cpp b/ldid.cpp index 21e8863..2b755f4 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -982,6 +982,34 @@ class Map { namespace ldid { +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); @@ -1171,6 +1199,8 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co 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_; } } @@ -1184,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) { @@ -1349,6 +1381,11 @@ class NullBuffer : } }; +class Digest { + public: + uint8_t sha1_[LDID_SHA1_DIGEST_LENGTH]; +}; + class Hash { public: char sha1_[LDID_SHA1_DIGEST_LENGTH]; @@ -1474,7 +1511,9 @@ static void Commit(const std::string &path, const std::string &temp) { namespace ldid { -void 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 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 @@ -1494,6 +1533,9 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st } #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)); @@ -1501,7 +1543,7 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st special = std::max(special, CSSLOT_REQUIREMENTS); alloc += sizeof(struct BlobIndex); - if (!requirement.empty()) + if (requirement.empty()) alloc += 0xc; else alloc += requirement.size(); @@ -1525,8 +1567,7 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st 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) @@ -1613,16 +1654,17 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st put(data, &directory, sizeof(directory)); put(data, identifier.c_str(), identifier.size() + 1); - put(data, team.c_str(), team.size() + 1); + if (!team.empty()) + put(data, team.c_str(), team.size() + 1); - uint8_t storage[special + normal][LDID_SHA1_DIGEST_LENGTH]; - uint8_t (*hashes)[LDID_SHA1_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, posts) { @@ -1632,13 +1674,14 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st 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 @@ -1654,12 +1697,15 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st 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 @@ -1671,7 +1717,7 @@ static void Unsign(void *idata, size_t isize, std::streambuf &output) { })); } -std::string DiskFolder::Path(const std::string &path) { +std::string DiskFolder::Path(const std::string &path) const { return path_ + "/" + path; } @@ -1702,7 +1748,7 @@ std::string readlink(const std::string &path) { } #endif -void DiskFolder::Find(const std::string &root, const std::string &base, const Functor &)> &)> &code, const Functor &)> &link) { +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())); @@ -1747,36 +1793,35 @@ void DiskFolder::Find(const std::string &root, const std::string &base, const Fu if (directory) Find(root, base + name + "/", code, link); else - code(base + name, fun([&](const Functor &code) { - std::string access(root + base + name); - _assert_(Open(access, fun([&](std::streambuf &data, const void *flag) { - auto from(path + name); - std::filebuf save; - commit_[from] = Temporary(save, from); - code(data, save); - })), "open(): %s", access.c_str()); - })); + 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); } } -void DiskFolder::Save(const std::string &path, const void *flag, const Functor &code) { - 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; } -bool DiskFolder::Open(const std::string &path, const Functor &code) { +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)); - if (result == NULL) - return false; - _assert(result == &data); + _assert_(result == &data, "DiskFolder::Open(%s)", path.c_str()); code(data, NULL); - return true; } -void DiskFolder::Find(const std::string &path, const Functor &)> &)> &code, const Functor &)> &link) { +void DiskFolder::Find(const std::string &path, const Functor &code, const Functor &)> &link) const { Find(path, "", code, link); } #endif @@ -1787,34 +1832,32 @@ SubFolder::SubFolder(Folder &parent, const std::string &path) : { } -void SubFolder::Save(const std::string &path, const void *flag, const Functor &code) { - return parent_.Save(path_ + path, flag, code); +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::Open(const std::string &path, const Functor &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) { +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) { +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) { +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()), fun([&](const Functor &code) { - save(fun([&](std::streambuf &data, const void *flag) { - parent_.Save(file, flag, fun([&](std::streambuf &save) { - code(data, save); - })); - })); - })); + code(file.substr(path.size())); } UnionFolder::UnionFolder(Folder &parent) : @@ -1822,11 +1865,18 @@ UnionFolder::UnionFolder(Folder &parent) : { } -void UnionFolder::Save(const std::string &path, const void *flag, const Functor &code) { - return parent_.Save(Map(path), flag, code); +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)); } -bool UnionFolder::Open(const std::string &path, const Functor &code) { +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); @@ -1835,18 +1885,9 @@ bool UnionFolder::Open(const std::string &path, const Functor &)> &)> &code, const Functor &)> &link) { - parent_.Find(path, fun([&](const std::string &name, const Functor &)> &save) { - if (deletes_.find(path + name) == deletes_.end()) - code(name, save); - }), fun([&](const std::string &name, const Functor &read) { - if (deletes_.find(path + name) == deletes_.end()) - link(name, read); - })); - +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); @@ -1860,6 +1901,14 @@ void UnionFolder::Find(const std::string &path, const Functor &read) { + if (deletes_.find(path + name) == deletes_.end()) + link(name, read); + })); } #ifndef LDID_NOTOOLS @@ -1917,23 +1966,32 @@ enum Mode { class Expression { private: regex_t regex_; + std::vector matches_; public: Expression(const std::string &code) { - _assert_(regcomp(®ex_, code.c_str(), REG_EXTENDED | REG_NOSUB) == 0, "regcomp()"); + _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) const { - auto value(regexec(®ex_, data.c_str(), 0, NULL, 0)); + 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 { @@ -1982,29 +2040,53 @@ struct RuleCode { }; #ifndef LDID_NOPLIST -static void 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) { +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); - copy(buffer, temp); + size += copy(buffer, temp); + // XXX: this is a stupid hack + pad(temp, 0x10 - (size & 0xf)); auto data(temp.str()); HashProxy proxy(hash, save); - Sign(data.data(), data.size(), proxy, identifier, entitlements, requirement, key, slots); + return Sign(data.data(), data.size(), proxy, identifier, entitlements, requirement, key, slots); } -std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::set &remote, const std::string &entitlements, const std::string &requirement) { +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; - static const std::string info("Info.plist"); + bool mac(false); + + std::string info("Info.plist"); + if (!folder.Look(info) && folder.Look("Resources/" + info)) { + mac = true; + info = "Resources/" + info; + } - _assert_(folder.Open(info, fun([&](std::streambuf &buffer, const void *flag) { + 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")); })); - })), "open(): Info.plist"); + })); + + 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"); @@ -2014,66 +2096,79 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k auto &rules1(versions[""]); auto &rules2(versions["2"]); - folder.Open(signature, fun([&](std::streambuf &buffer, const void *) { - plist_d(buffer, fun([&](plist_t node) { - // XXX: maybe attempt to preserve existing rules - })); - })); + const std::string resources(mac ? "Resources/" : ""); 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, "^" + 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, "^"}); + rules2.insert(Rule{20, NoMode, "^" + resources}); 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)$"}); + 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, "^.*\\.lproj/"}); - rules2.insert(Rule{1100, OmitMode, "^.*\\.lproj/locversion.plist$"}); + 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$"}); - rules2.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"}); + 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 hashes; - std::set local; + std::map local; - static Expression nested("^PlugIns/[^/]*\\.appex/Info\\.plist$"); + 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, const Functor &)> &code) { + 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); - Bundle(bundle, subfolder, key, local, "", ""); + + 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::map links; + std::set excludes; - folder.Find("", fun([&](const std::string &name, const Functor &)> &code) { + 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; - local.insert(name); - - auto &hash(hashes[name]); + auto &hash(local[name]); - code(fun([&](std::streambuf &data, std::streambuf &save) { + folder.Open(name, fun([&](std::streambuf &data, const void *flag) { union { struct { uint32_t magic; @@ -2084,7 +2179,8 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k } header; auto size(most(data, &header.bytes, sizeof(header.bytes))); - if (size == sizeof(header.bytes)) + + if (name != "_WatchKitStub/WK" && size == sizeof(header.bytes)) switch (Swap(header.magic)) { case FAT_MAGIC: // Java class file format @@ -2093,18 +2189,24 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k case FAT_CIGAM: case MH_MAGIC: case MH_MAGIC_64: case MH_CIGAM: case MH_CIGAM_64: - Slots slots; - Sign(header.bytes, size, data, hash, save, identifier, "", "", key, slots); + folder.Save(name, true, flag, fun([&](std::streambuf &save) { + Slots slots; + Sign(header.bytes, size, data, hash, save, identifier, "", "", key, slots); + })); return; } - HashProxy proxy(hash, save); - put(proxy, header.bytes, size); - copy(data, proxy); + 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(); - local.insert(name); })); auto plist(plist_new_dict()); @@ -2119,12 +2221,11 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k bool old(&version.second == &rules1); - for (const auto &hash : hashes) + for (const auto &hash : local) for (const auto &rule : version.second) if (rule(hash.first)) { - if (rule.mode_ == NestedMode) { - // XXX: implement - } else if (rule.mode_ == NoMode && old) + 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()); @@ -2142,9 +2243,7 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k for (const auto &link : links) for (const auto &rule : version.second) if (rule(link.first)) { - if (rule.mode_ == NestedMode) { - // XXX: implement - } else if (rule.mode_ != OmitMode) { + 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) @@ -2154,6 +2253,14 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k 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) { @@ -2195,8 +2302,8 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k } } - folder.Save(signature, NULL, fun([&](std::streambuf &save) { - HashProxy proxy(hashes[signature], save); + 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); @@ -2204,27 +2311,27 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k put(proxy, xml, size); })); + Bundle bundle; + bundle.path = executable; + folder.Open(executable, fun([&](std::streambuf &buffer, const void *flag) { - folder.Save(executable, flag, fun([&](std::streambuf &save) { + folder.Save(executable, true, flag, fun([&](std::streambuf &save) { Slots slots; - slots[1] = hashes.at(info); - slots[3] = hashes.at(signature); - Sign(NULL, 0, buffer, hashes[executable], save, identifier, entitlements, requirement, key, 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); })); })); - local.insert(signature); - local.insert(executable); - - for (const auto &name : local) - remote.insert(root + name); + for (const auto &entry : local) + remote[root + entry.first] = entry.second; - return executable; + return bundle; } -std::string Bundle(const std::string &root, Folder &folder, const std::string &key, const std::string &entitlements, const std::string &requirement) { - std::set local; - return Bundle(root, folder, key, local, entitlements, requirement); +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 @@ -2401,7 +2508,7 @@ int main(int argc, char *argv[]) { #ifndef LDID_NOPLIST _assert(!flag_r); ldid::DiskFolder folder(path); - path += "/" + Bundle("", folder, key, entitlements, requirement); + path += "/" + Sign("", folder, key, requirement, ldid::fun([&](const std::string &, const std::string &) -> std::string { return entitlements; })).path; #else _assert(false); #endif