Support signing DiskFolders with nested resources.

[ldid.git] / ldid.hpp

diff --git a/ldid.hpp b/ldid.hpp
index 4320befef7c3ffde2a2a637997c5e9ff0da733f2..3ca939cce8024f204c90fb44015c3034e02351f9 100644 (file)
--- a/ldid.hpp
+++ b/ldid.hpp
@@ -3,8 +3,10 @@
 
 #include <cstdlib>
 #include <map>
 
 #include <cstdlib>
 #include <map>

+#include <sstream>

 #include <streambuf>
 #include <string>
 #include <streambuf>
 #include <string>

+#include <vector>

 
 namespace ldid {
 
 
 namespace ldid {
 


@@ -47,8 +49,8 @@ FunctorImpl<decltype(&Function_::operator())> fun(const Function_ &value) {
 
 class Folder {
   public:
 
 class Folder {
   public:

-    virtual void Save(const std::string &path, const Functor<void (std::streambuf &)> &code) = 0;
-    virtual bool Open(const std::string &path, const Functor<void (std::streambuf &)> &code) = 0;
+    virtual void Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code) = 0;
+    virtual bool Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) = 0;

     virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code) = 0;
 };
 
     virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code) = 0;
 };
 


@@ -67,8 +69,8 @@ class DiskFolder :
     DiskFolder(const std::string &path);
     ~DiskFolder();
 
     DiskFolder(const std::string &path);
     ~DiskFolder();
 

-    virtual void Save(const std::string &path, const Functor<void (std::streambuf &)> &code);
-    virtual bool Open(const std::string &path, const Functor<void (std::streambuf &)> &code);
+    virtual void Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code);
+    virtual bool Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code);

     virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code);
 };
 
     virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code);
 };
 


@@ -82,16 +84,66 @@ class SubFolder :
   public:
     SubFolder(Folder &parent, const std::string &path);
 
   public:
     SubFolder(Folder &parent, const std::string &path);
 

-    virtual void Save(const std::string &path, const Functor<void (std::streambuf &)> &code);
-    virtual bool Open(const std::string &path, const Functor<void (std::streambuf &)> &code);
+    virtual void Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code);
+    virtual bool Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code);

     virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code);
 };
 
     virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code);
 };
 

-std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::map<std::string, std::vector<char>> &remote);
+class UnionFolder :
+    public Folder
+{
+  private:
+    class StringBuffer :
+        public std::stringbuf
+    {
+      public:
+        StringBuffer() {
+        }
+
+        StringBuffer(const StringBuffer &rhs) :
+            std::stringbuf(rhs.str())
+        {
+        }
+    };
+
+    Folder &parent_;
+    std::set<std::string> deletes_;
+
+    std::map<std::string, std::string> remaps_;
+    std::map<std::string, std::pair<StringBuffer, const void *>> resets_;
+
+    std::string Map(const std::string &path);
+    void 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);
+
+  public:
+    UnionFolder(Folder &parent);
+
+    virtual void Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code);
+    virtual bool Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code);
+    virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code);
+
+    void operator ()(const std::string &from) {
+        deletes_.insert(from);
+    }
+
+    void operator ()(const std::string &from, const std::string &to) {
+        operator ()(from);
+        remaps_[to] = from;
+    }
+
+    std::stringbuf &operator ()(const std::string &from, const void *flag) {
+        operator ()(from);
+        auto &reset(resets_[from]);
+        reset.second = flag;
+        return reset.first;
+    }
+};
+
+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, const std::string &requirement);

 
 typedef std::map<uint32_t, std::vector<char>> Slots;
 
 
 typedef std::map<uint32_t, std::vector<char>> Slots;
 

-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);
+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);

 
 }
 
 
 }