Merge pull request #6913 from luiseufrasio/FISH-9186-doc-root-not-wor…

…king-on-dfsn-win-server-19-p6

FISH-9186 : Use the LinkOption.NOFOLLOW_LINKS option

appserver/web/web-naming/src/main/java/org/apache/naming/resources/FileDirContext.java

@@ -59,6 +59,7 @@
 
 package org.apache.naming.resources;
 
+import java.nio.file.LinkOption;
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.logging.Logger;
@@ -927,7 +928,7 @@ private File validate(File baseFile, String name, String keyName, Map<String, Fi
             // Check that this file belongs to our root path
             String canPath = null;
             try {
-                canPath = normalize(file.toPath().toRealPath().toString());
+                canPath = normalize(file.toPath().toRealPath(LinkOption.NOFOLLOW_LINKS).toString());
             } catch (IOException e) {
             }
             if (canPath == null || (!canPath.startsWith(canonicalBase) && !allowLinking)) {