Avoid duplicate Find when remapped during iterate.

[ldid.git] / ldid.cpp

diff --git a/ldid.cpp b/ldid.cpp
index 20abec9fe69ad0293abfcd79631f9c59a49d8f23..2b755f4b9409db07dfb934a38a18564fdce5ce8b 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -982,6 +982,34 @@ class Map {
 
 namespace ldid {
 
 
 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);
 
 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);
 


@@ -1353,6 +1381,11 @@ class NullBuffer :
     }
 };
 
     }
 };
 

+class Digest {
+  public:
+    uint8_t sha1_[LDID_SHA1_DIGEST_LENGTH];
+};
+

 class Hash {
   public:
     char sha1_[LDID_SHA1_DIGEST_LENGTH];
 class Hash {
   public:
     char sha1_[LDID_SHA1_DIGEST_LENGTH];


@@ -1624,14 +1657,14 @@ std::vector<char> Sign(const void *idata, size_t isize, std::streambuf &output,
             if (!team.empty())
                 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]));
 
             _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) {
             }
 
             _foreach (slot, posts) {


@@ -1641,11 +1674,11 @@ std::vector<char> Sign(const void *idata, size_t isize, std::streambuf &output,
 
             if (normal != 1)
                 for (size_t i = 0; i != normal - 1; ++i)
 
             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)
             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());

 
             const auto &save(insert(blobs, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY, data));
             sha1(hash, save.data(), save.size());
 
             const auto &save(insert(blobs, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY, data));
             sha1(hash, save.data(), save.size());


@@ -1684,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;
 }
 
     return path_ + "/" + path;
 }
 


@@ -1715,7 +1748,7 @@ std::string readlink(const std::string &path) {
 }
 #endif
 
 }
 #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) {
+void DiskFolder::Find(const std::string &root, const std::string &base, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const {

     std::string path(Path(root) + base);
 
     DIR *dir(opendir(path.c_str()));
     std::string path(Path(root) + base);
 
     DIR *dir(opendir(path.c_str()));


@@ -1760,37 +1793,35 @@ void DiskFolder::Find(const std::string &root, const std::string &base, const Fu
         if (directory)
             Find(root, base + name + "/", code, link);
         else
         if (directory)
             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);
-                Open(access, fun([&](std::streambuf &data, const void *flag) {
-                    auto from(path + name);
-                    std::filebuf save;
-                    commit_[from] = Temporary(save, from);
-                    code(data, save);
-                }));
-            }));
+            code(base + name);

     }
 }
 
     }
 }
 

-void DiskFolder::Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code) {
-    std::filebuf save;
-    auto from(Path(path));
-    commit_[from] = Temporary(save, from);
-    code(save);
+void DiskFolder::Save(const std::string &path, bool edit, const void *flag, const Functor<void (std::streambuf &)> &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) {
+bool DiskFolder::Look(const std::string &path) const {

     return _syscall(access(Path(path).c_str(), R_OK), ENOENT) == 0;
 }
 
     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) {
+void DiskFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &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);
 }
 
     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<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) {
+void DiskFolder::Find(const std::string &path, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const {

     Find(path, "", code, link);
 }
 #endif
     Find(path, "", code, link);
 }
 #endif


@@ -1801,38 +1832,32 @@ SubFolder::SubFolder(Folder &parent, const std::string &path) :
 {
 }
 
 {
 }
 

-void SubFolder::Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code) {
-    return parent_.Save(path_ + path, flag, code);
+void SubFolder::Save(const std::string &path, bool edit, const void *flag, const Functor<void (std::streambuf &)> &code) {
+    return parent_.Save(path_ + path, edit, flag, code);

 }
 
 }
 

-bool SubFolder::Look(const std::string &path) {
+bool SubFolder::Look(const std::string &path) const {

     return parent_.Look(path_ + path);
 }
 
     return parent_.Look(path_ + path);
 }
 

-void SubFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {
+void SubFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) const {

     return parent_.Open(path_ + path, 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, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {
+void SubFolder::Find(const std::string &path, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const {

     return parent_.Find(path_ + path, code, link);
 }
 
     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;
 }
 
     auto remap(remaps_.find(path));
     if (remap == remaps_.end())
         return path;
     return remap->second;
 }
 

-void UnionFolder::Map(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const std::string &file, const Functor<void (const Functor<void (std::streambuf &, const void *)> &)> &save) {
+void UnionFolder::Map(const std::string &path, const Functor<void (const std::string &)> &code, const std::string &file, const Functor<void (const Functor<void (std::streambuf &, const void *)> &)> &save) const {

     if (file.size() >= path.size() && file.substr(0, path.size()) == path)
     if (file.size() >= path.size() && file.substr(0, path.size()) == path)

-        code(file.substr(path.size()), fun([&](const Functor<void (std::streambuf &, std::streambuf &)> &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) :
 }
 
 UnionFolder::UnionFolder(Folder &parent) :


@@ -1840,18 +1865,18 @@ UnionFolder::UnionFolder(Folder &parent) :
 {
 }
 
 {
 }
 

-void UnionFolder::Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code) {
-    return parent_.Save(Map(path), flag, code);
+void UnionFolder::Save(const std::string &path, bool edit, const void *flag, const Functor<void (std::streambuf &)> &code) {
+    return parent_.Save(Map(path), edit, flag, code);

 }
 
 }
 

-bool UnionFolder::Look(const std::string &path) {
+bool UnionFolder::Look(const std::string &path) const {

     auto file(resets_.find(path));
     if (file != resets_.end())
         return true;
     return parent_.Look(Map(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) {
+void UnionFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) const {

     auto file(resets_.find(path));
     if (file == resets_.end())
         return parent_.Open(Map(path), code);
     auto file(resets_.find(path));
     if (file == resets_.end())
         return parent_.Open(Map(path), code);


@@ -1862,15 +1887,7 @@ void UnionFolder::Open(const std::string &path, const Functor<void (std::streamb
     code(data, entry.second);
 }
 
     code(data, entry.second);
 }
 

-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);
-    }));
-
+void UnionFolder::Find(const std::string &path, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const {

     for (auto &reset : resets_)
         Map(path, code, reset.first, fun([&](const Functor<void (std::streambuf &, const void *)> &code) {
             auto &entry(reset.second);
     for (auto &reset : resets_)
         Map(path, code, reset.first, fun([&](const Functor<void (std::streambuf &, const void *)> &code) {
             auto &entry(reset.second);


@@ -1884,6 +1901,14 @@ void UnionFolder::Find(const std::string &path, const Functor<void (const std::s
                 code(data, 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<std::string ()> &read) {
+        if (deletes_.find(path + name) == deletes_.end())
+            link(name, read);
+    }));

 }
 
 #ifndef LDID_NOTOOLS
 }
 
 #ifndef LDID_NOTOOLS


@@ -2019,14 +2044,16 @@ static std::vector<char> Sign(const uint8_t *prefix, size_t size, std::streambuf
     // XXX: this is a miserable fail
     std::stringbuf temp;
     put(temp, prefix, size);
     // 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);
     return Sign(data.data(), data.size(), proxy, identifier, entitlements, requirement, key, slots);
 }
 
     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<std::string, Hash> &remote, const std::string &entitlements, const std::string &requirement) {
+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;
 
     std::string executable;
     std::string identifier;
 


@@ -2050,6 +2077,17 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std
         mac = true;
     }
 
         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");
 
     static const std::string directory("_CodeSignature/");
     static const std::string signature(directory + "CodeResources");
 


@@ -2092,13 +2130,15 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std
     Expression nested("^(Frameworks/[^/]*\\.framework|PlugIns/[^/]*\\.appex(()|/[^/]*.app))/(" + failure + ")Info\\.plist$");
     std::map<std::string, Bundle> bundles;
 
     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) {
+    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);
         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, "", "");
+
+        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) {
     }));
 
     }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
     }));
 


@@ -2120,7 +2160,7 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std
 
     std::map<std::string, std::string> links;
 
 
     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) {
+    folder.Find("", fun([&](const std::string &name) {

         if (exclude(name))
             return;
 
         if (exclude(name))
             return;
 


@@ -2128,7 +2168,7 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std
             return;
         auto &hash(local[name]);
 
             return;
         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;
             union {
                 struct {
                     uint32_t magic;


@@ -2149,14 +2189,18 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std
                     case FAT_CIGAM:
                     case MH_MAGIC: case MH_MAGIC_64:
                     case MH_CIGAM: case MH_CIGAM_64:
                     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;
                 }
 
                         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<std::string ()> &read) {
         if (exclude(name))
         }));
     }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
         if (exclude(name))


@@ -2258,7 +2302,7 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std
             }
     }
 
             }
     }
 

-    folder.Save(signature, NULL, fun([&](std::streambuf &save) {
+    folder.Save(signature, true, NULL, fun([&](std::streambuf &save) {

         HashProxy proxy(local[signature], save);
         char *xml(NULL);
         uint32_t size;
         HashProxy proxy(local[signature], save);
         char *xml(NULL);
         uint32_t size;


@@ -2271,7 +2315,7 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std
     bundle.path = executable;
 
     folder.Open(executable, fun([&](std::streambuf &buffer, const void *flag) {
     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] = local.at(info);
             slots[3] = local.at(signature);
             Slots slots;
             slots[1] = local.at(info);
             slots[3] = local.at(signature);


@@ -2285,9 +2329,9 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std
     return bundle;
 }
 
     return bundle;
 }
 

-Bundle Sign(const std::string &root, Folder &folder, const std::string &key, const std::string &entitlements, const std::string &requirement) {
+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;
     std::map<std::string, Hash> local;

-    return Sign(root, folder, key, local, entitlements, requirement);
+    return Sign(root, folder, key, local, requirement, alter);

 }
 #endif
 
 }
 #endif
 


@@ -2464,7 +2508,7 @@ int main(int argc, char *argv[]) {
 #ifndef LDID_NOPLIST
             _assert(!flag_r);
             ldid::DiskFolder folder(path);
 #ifndef LDID_NOPLIST
             _assert(!flag_r);
             ldid::DiskFolder folder(path);

-            path += "/" + Sign("", folder, key, entitlements, requirement).path;
+            path += "/" + Sign("", folder, key, requirement, ldid::fun([&](const std::string &, const std::string &) -> std::string { return entitlements; })).path;

 #else
             _assert(false);
 #endif
 #else
             _assert(false);
 #endif