Fix validating files with leading /

IB-8933

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

src/SignatureXAdES_B.cpp

@@ -154,10 +154,11 @@ int initXmlSecCallback()
                 return {};
             }
 
-            auto find = [name](auto files) -> const DataFile* {
+            string uriName = File::fromUriPath(name);
+            auto find = [&uriName](auto files) -> const DataFile* {
                 for(const DataFile *file: files)
                 {
-                    if(file->fileName() == name)
+                    if(file->fileName() == uriName)
                         return file;
                 }
                 return {};
@@ -506,10 +507,7 @@ void SignatureXAdES_B::validate(const string &policy) const
                 EXCEPTION_ADD(exception, "Reference '%.*s' ID  missing", int(uri.size()), uri.data());
             else
             {
-                string uriPath = File::fromUriPath(uri);
-                if(uriPath.front() == '/')
-                    uriPath.erase(0);
-                signatureref.emplace(uriPath, mimeinfo[string("#").append(ref["Id"])]);
+                signatureref.emplace(File::fromUriPath(uri), mimeinfo[string("#").append(ref["Id"])]);
             }
         }
         if(!signedInfoFound)

src/SignatureXAdES_LTA.cpp

@@ -54,9 +54,6 @@ void SignatureXAdES_LTA::calcArchiveDigest(const Digest &digest, string_view can
         }
 
         string uriPath = File::fromUriPath(uri);
-        if(uriPath.front() == '/')
-            uriPath.erase(0);
-
         auto files = bdoc->dataFiles();
         auto file = find_if(files.cbegin(), files.cend(), [&uriPath](DataFile *file) {
             return file->fileName() == uriPath;

src/util/File.cpp

@@ -336,6 +336,8 @@ constexpr bool fromHexChar(auto pos, auto end, auto &value)
 
 string File::fromUriPath(string_view path)
 {
+    if(!path.empty() && path.front() == '/')
+        path.remove_prefix(1);
     string ret;
     ret.reserve(path.size());
     uint8_t value = 0;

test/data/test-leading-slash-uri.asice

@@ -573,6 +573,18 @@ BOOST_AUTO_TEST_CASE(manifest_data_file_dot_and_empty_paths_are_rejected)
     BOOST_CHECK_THROW(Container::openPtr("dot.asice"), Exception);
     BOOST_CHECK_THROW(Container::openPtr("pt-empty.asice"), Exception);
 }
+
+BOOST_AUTO_TEST_CASE(LeadingSlashReferenceURI)
+{
+    // Container signed with URI="/test1.txt" (leading slash).
+    // Without the erase(0,1) fix the reference path is erased to "",
+    // failing to match the DataFile and throwing during validate().
+    auto d = Container::openPtr("test-leading-slash-uri.asice");
+    BOOST_REQUIRE_EQUAL(d->dataFiles().size(), 1U);
+    BOOST_REQUIRE_EQUAL(d->signatures().size(), 1U);
+    BOOST_CHECK_EQUAL(d->dataFiles().front()->fileName(), "test1.txt");
+    BOOST_CHECK_NO_THROW(d->signatures().front()->validate());
+}
 BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE(ASiCSTestSuite)