Store previous signature in memory (#591)

* Store previous signature in memory IB-8030 Signed-off-by: Raul Metsma <[email protected]> * Update unittest data IB-8010 Signed-off-by: Raul Metsma <[email protected]> --------- Signed-off-by: Raul Metsma <[email protected]>
open-eid · May 6, 2024 · d2ce45d · d2ce45d
1 parent e67faa5
commit d2ce45d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/SignatureXAdES_B.cpp b/src/SignatureXAdES_B.cpp
@@ -128,7 +128,9 @@ Signatures::Signatures(istream &data, ASiContainer *container)
     properties.schema_location(URI_ID_DSIG, File::fullPathUrl(xsdPath + "/xmldsig-core-schema.xsd"));
     properties.schema_location(ASIC_NAMESPACE, File::fullPathUrl(xsdPath + "/en_31916201v010101.xsd"));
     properties.schema_location(OPENDOCUMENT_NAMESPACE, File::fullPathUrl(xsdPath + "/OpenDocument_dsig.xsd"));
-    parseDOM(data, properties.schema_location());
+    copy << data.rdbuf();
+
+    parseDOM(copy, properties.schema_location());
 
     try
     {
@@ -208,12 +210,20 @@ void Signatures::reloadDOM()
     // Save to file an parse it again, to make XML Canonicalization work
     // correctly as expected by the Canonical XML 1.0 specification.
     // Hope, the next Canonical XMl specification fixes the white spaces preserving "bug".
-    stringstream ofs;
-    save(ofs);
-    parseDOM(ofs);
+    copy.str({});
+    copy.clear();
+    saveXML(copy);
+    parseDOM(copy);
 }
 
 void Signatures::save(ostream &os) const
+{
+    if(copy.str().empty())
+        return saveXML(os);
+    os << copy.str();
+}
+
+void Signatures::saveXML(ostream &os) const
 {
     try
     {

diff --git a/src/SignatureXAdES_B.h b/src/SignatureXAdES_B.h
@@ -25,6 +25,7 @@
 
 #include <map>
 #include <memory>
+#include <sstream>
 
 namespace digidoc
 {
@@ -57,8 +58,10 @@ namespace digidoc
 
     private:
         void parseDOM(std::istream &data, const std::string &schema_location = {});
+        void saveXML(std::ostream &os) const;
 
         std::unique_ptr<xercesc::DOMDocument> doc;
+        std::stringstream copy;
     };
 
     class SignatureXAdES_B : public Signature