Fix validating files with leading /

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 {};
@@ -505,10 +506,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

@@ -349,6 +349,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;