Support separate provisioning for bundled plugins.

[ldid.git] / ldid.cpp

diff --git a/ldid.cpp b/ldid.cpp
index d7fdf7a0e121242cc4a097af82b953e26ba38c62..1eacfb760e0a433ba7bfec8b92b05a5a28c40373 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -1381,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];


@@ -1652,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) {


@@ -1669,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());


@@ -2056,7 +2061,7 @@ static std::vector<char> Sign(const uint8_t *prefix, size_t size, std::streambuf
     return Sign(data.data(), data.size(), proxy, identifier, entitlements, requirement, key, slots);
 }
 
     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;
 


@@ -2080,6 +2085,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");
 


@@ -2128,7 +2144,9 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std
         auto bundle(root + Split(name).dir);
         bundle.resize(bundle.size() - resources.size());
         SubFolder subfolder(folder, bundle);
         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) {
     }));
 


@@ -2315,9 +2333,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
 


@@ -2494,7 +2512,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