[GR-41981] Use canonical resource path in resource registration

PullRequest: graal/18518

Author: dnestoro

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ResourceConfiguration.java

@@ -48,6 +48,7 @@
 import com.oracle.svm.core.configure.ConfigurationParser;
 import com.oracle.svm.core.configure.ResourceConfigurationParser;
 import com.oracle.svm.core.configure.ResourcesRegistry;
+import com.oracle.svm.core.jdk.Resources;
 import com.oracle.svm.core.jdk.resources.CompressedGlobTrie.GlobUtils;
 import com.oracle.svm.core.util.VMError;
 
@@ -210,7 +211,12 @@ public void addResourcePattern(UnresolvedConfigurationCondition condition, Strin
     }
 
     public void addGlobPattern(UnresolvedConfigurationCondition condition, String pattern, String module) {
-        ResourceEntry element = new ResourceEntry(escapePossibleGlobWildcards(pattern), module);
+        /*
+         * prevent patterns discovered by the agent to be written in the non-canonical form. Example
+         * canonical path: foo/1.txt; non-canonical path: foo/bar/../1.txt
+         */
+        String canonicalPattern = Resources.toCanonicalForm(pattern);
+        ResourceEntry element = new ResourceEntry(escapePossibleGlobWildcards(canonicalPattern), module);
         addedGlobs.add(new ConditionalElement<>(condition, element));
     }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java

@@ -190,7 +190,8 @@ public void addResources(ConfigurationCondition condition, String pattern) {
 
         @Override
         public void addGlob(ConfigurationCondition condition, String module, String glob) {
-            String resolvedGlob = GlobUtils.transformToTriePath(glob, module);
+            String canonicalGlob = Resources.toCanonicalForm(glob);
+            String resolvedGlob = GlobUtils.transformToTriePath(canonicalGlob, module);
             globWorkSet.add(new ConditionalPattern(condition, resolvedGlob));
         }