#ifdef __APPLE__
#include <CommonCrypto/CommonDigest.h>
+
#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 <openssl/sha.h>
+
#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
namespace ldid {
+std::string Analyze(const void *data, size_t size) {
+ std::string entitlements;
+
+ FatHeader fat_header(const_cast<void *>(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<struct linkedit_data_command *>(load_command));
+ auto offset(mach_header.Swap(signature->dataoff));
+ auto pointer(reinterpret_cast<uint8_t *>(mach_header.GetBase()) + offset);
+ auto super(reinterpret_cast<struct SuperBlob *>(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<struct Blob *>(pointer + begin));
+ auto writ(Swap(blob->length) - sizeof(*blob));
+
+ if (entitlements.empty())
+ entitlements.assign(reinterpret_cast<char *>(blob + 1), writ);
+ else
+ _assert(entitlements.compare(0, entitlements.size(), reinterpret_cast<char *>(blob + 1), writ) == 0);
+ }
+ }
+
+ return entitlements;
+}
+
static void Allocate(const void *idata, size_t isize, std::streambuf &output, const Functor<size_t (const MachHeader &, size_t)> &allocate, const Functor<size_t (const MachHeader &, std::streambuf &output, size_t, const std::string &, const char *)> &save) {
FatHeader source(const_cast<void *>(idata), isize);
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_;
}
}
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<char *>(&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) {
}
};
+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<char>() const {
+ return {sha1_, sha1_ + sizeof(sha1_)};
+ }
+};
+
class HashBuffer :
public std::streambuf
{
private:
- std::vector<char> &hash_;
- LDID_SHA1_CTX context_;
+ Hash &hash_;
+
+ LDID_SHA1_CTX sha1_;
+ LDID_SHA256_CTX sha256_;
public:
- HashBuffer(std::vector<char> &hash) :
+ HashBuffer(Hash &hash) :
hash_(hash)
{
- LDID_SHA1_Init(&context_);
+ LDID_SHA1_Init(&sha1_);
+ LDID_SHA256_Init(&sha256_);
}
~HashBuffer() {
- hash_.resize(LDID_SHA1_DIGEST_LENGTH);
- LDID_SHA1_Final(reinterpret_cast<uint8_t *>(hash_.data()), &context_);
+ LDID_SHA1_Final(reinterpret_cast<uint8_t *>(hash_.sha1_), &sha1_);
+ LDID_SHA256_Final(reinterpret_cast<uint8_t *>(hash_.sha256_), &sha256_);
}
virtual std::streamsize xsputn(const char_type *data, std::streamsize size) {
- LDID_SHA1_Update(&context_, data, size);
+ LDID_SHA1_Update(&sha1_, data, size);
+ LDID_SHA256_Update(&sha256_, data, size);
return size;
}
std::streambuf &buffer_;
public:
- HashProxy(std::vector<char> &hash, std::streambuf &buffer) :
+ HashProxy(Hash &hash, std::streambuf &buffer) :
HashBuffer(hash),
buffer_(buffer)
{
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) {
+std::vector<char> 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<char> hash(LDID_SHA1_DIGEST_LENGTH);
+
std::string team;
#ifndef LDID_NOSMIME
}
#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));
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);
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)
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);
}
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<Digest> 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<const Blob *>(&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) {
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
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
Commit(commit.first, commit.second);
}
-void DiskFolder::Find(const std::string &root, const std::string &base, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)>&code) {
+#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<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {
std::string path(Path(root) + base);
DIR *dir(opendir(path.c_str()));
#ifdef __WIN32__
struct stat info;
- _syscall(stat(path.c_str(), &info));
+ _syscall(stat((path + name).c_str(), &info));
if (false);
else if (S_ISDIR(info.st_mode))
directory = true;
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);
+ Find(root, base + name + "/", code, link);
else
code(base + name, fun([&](const Functor<void (std::streambuf &, std::streambuf &)> &code) {
std::string access(root + base + name);
- _assert_(Open(access, fun([&](std::streambuf &data, const void *flag) {
- NullBuffer save;
+ 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(save);
}
-bool DiskFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {
+bool DiskFolder::Look(const std::string &path) {
+ return _syscall(access(Path(path).c_str(), R_OK), ENOENT) == 0;
+}
+
+void DiskFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &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);
+ _assert_(result == &data, "DiskFolder::Open(%s)", path.c_str());
code(data, NULL);
- return true;
}
-void DiskFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)>&code) {
- Find(path, "", code);
+void DiskFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {
+ Find(path, "", code, link);
}
#endif
return parent_.Save(path_ + path, flag, code);
}
-bool SubFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {
+bool SubFolder::Look(const std::string &path) {
+ return parent_.Look(path_ + path);
+}
+
+void SubFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {
return parent_.Open(path_ + path, code);
}
-void SubFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code) {
- return parent_.Find(path_ + path, code);
+void SubFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {
+ return parent_.Find(path_ + path, code, link);
}
std::string UnionFolder::Map(const std::string &path) {
return parent_.Save(Map(path), flag, code);
}
-bool UnionFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {
+bool UnionFolder::Look(const std::string &path) {
+ 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<void (std::streambuf &, const void *)> &code) {
auto file(resets_.find(path));
if (file == resets_.end())
return parent_.Open(Map(path), code);
auto &data(entry.first);
data.pubseekpos(0, std::ios::in);
code(data, entry.second);
- return true;
}
-void UnionFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code) {
+void UnionFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {
parent_.Find(path, fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &save) {
if (deletes_.find(path + name) == deletes_.end())
code(name, save);
+ }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
+ if (deletes_.find(path + name) == deletes_.end())
+ link(name, read);
}));
for (auto &reset : resets_)
class Expression {
private:
regex_t regex_;
+ std::vector<std::string> 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 {
};
#ifndef LDID_NOPLIST
-static void Sign(const uint8_t *prefix, size_t size, std::streambuf &buffer, std::vector<char> &hash, std::streambuf &save, const std::string &identifier, const std::string &entitlements, const std::string &key, const Slots &slots) {
+static std::vector<char> 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, 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::map<std::string, std::vector<char>> &remote, const std::string &entitlements) {
+Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std::map<std::string, Hash> &remote, const std::string &requirement, const Functor<std::string (const std::string &, const std::string &)> &alter) {
std::string executable;
std::string identifier;
- static const std::string info("Info.plist");
+ bool mac(false);
- _assert_(folder.Open(info, fun([&](std::streambuf &buffer, const void *flag) {
+ 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"));
}));
- })), "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");
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<std::string, std::vector<char>> local;
+ std::map<std::string, Hash> 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<std::string, Bundle> bundles;
folder.Find("", fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &code) {
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<const Functor<std::string (const std::string &, const std::string &)> &>(fun([&](const std::string &, const std::string &entitlements) -> std::string { return entitlements; })));
+ }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
}));
- folder.Find("", fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &code) {
+ std::set<std::string> 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<std::string, std::string> links;
+
+ folder.Find("", fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &code) {
+ if (exclude(name))
return;
- auto &hash(local[name]);
- if (!hash.empty())
+ if (local.find(name) != local.end())
return;
+ auto &hash(local[name]);
code(fun([&](std::streambuf &data, std::streambuf &save) {
union {
} 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
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);
+ Sign(header.bytes, size, data, hash, save, identifier, "", "", key, slots);
return;
}
put(proxy, header.bytes, size);
copy(data, proxy);
}));
+ }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
+ if (exclude(name))
+ return;
- _assert(hash.size() == LDID_SHA1_DIGEST_LENGTH);
+ links[name] = read();
}));
auto plist(plist_new_dict());
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 (rule.mode_ == NoMode)
- plist_dict_set_item(files, hash.first.c_str(), plist_new_data(hash.second.data(), hash.second.size()));
- else if (rule.mode_ == OptionalMode) {
+ 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.data(), hash.second.size()));
- plist_dict_set_item(entry, "optional", plist_new_bool(true));
+ 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) {
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) {
Slots slots;
slots[1] = local.at(info);
slots[3] = local.at(signature);
- Sign(NULL, 0, buffer, local[executable], save, identifier, entitlements, key, slots);
+ bundle.hash = Sign(NULL, 0, buffer, local[executable], save, identifier, entitlements, requirement, key, slots);
}));
}));
- for (const auto &hash : local)
- remote[root + hash.first] = hash.second;
+ for (const auto &entry : local)
+ remote[root + entry.first] = entry.second;
+
+ return bundle;
+}
- return executable;
+Bundle Sign(const std::string &root, Folder &folder, const std::string &key, const std::string &requirement, const Functor<std::string (const std::string &, const std::string &)> &alter) {
+ std::map<std::string, Hash> local;
+ return Sign(root, folder, key, local, requirement, alter);
}
#endif
bool flag_r(false);
bool flag_e(false);
+ bool flag_q(false);
#ifndef LDID_NOFLAGT
bool flag_T(false);
#endif
Map entitlements;
+ Map requirement;
Map key;
ldid::Slots slots;
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;
case 'a': flag_a = true; break;
#ifndef LDID_NOPLIST
_assert(!flag_r);
ldid::DiskFolder folder(path);
- std::map<std::string, std::vector<char>> hashes;
- path += "/" + Bundle("", folder, key, hashes, entitlements);
+ path += "/" + Sign("", folder, key, requirement, ldid::fun([&](const std::string &, const std::string &) -> std::string { return entitlements; })).path;
#else
_assert(false);
#endif
ldid::Unsign(input.data(), input.size(), output);
else {
std::string identifier(flag_I ?: split.base.c_str());
- ldid::Sign(input.data(), input.size(), output, identifier, entitlements, key, slots);
+ ldid::Sign(input.data(), input.size(), output, identifier, entitlements, requirement, key, slots);
}
Commit(path, temp);
}
}
+ if (flag_q) {
+ _assert(signature != NULL);
+
+ uint32_t data = mach_header.Swap(signature->dataoff);
+
+ uint8_t *top = reinterpret_cast<uint8_t *>(mach_header.GetBase());
+ uint8_t *blob = top + data;
+ struct SuperBlob *super = reinterpret_cast<struct SuperBlob *>(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<struct Blob *>(blob + begin);
+ fwrite(requirement, 1, Swap(requirement->length), stdout);
+ }
+ }
+
if (flag_s) {
_assert(signature != NULL);
projects / ldid.git / blobdiff