switch to normalize path

lucee · Dec 20, 2024 · 605ef60 · 605ef60
1 parent e105141
commit 605ef60
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 39 deletions.
diff --git a/core/src/main/java/lucee/commons/io/FileUtil.java b/core/src/main/java/lucee/commons/io/FileUtil.java
@@ -234,4 +234,12 @@ public static void move(File src, File dest) throws IOException {
 		}
 	}
 
+	public static String getNormalizedPath(File file) {
+		return file.toPath().normalize().toString();
+	}
+
+	public static File getNormalizedFile(File file) {
+		return file.toPath().normalize().toFile();
+	}
+
 }
diff --git a/core/src/main/java/lucee/commons/io/res/type/file/FileResource.java b/core/src/main/java/lucee/commons/io/res/type/file/FileResource.java
@@ -130,29 +130,29 @@ public void copyTo(Resource res, boolean append) throws IOException {
 
 	}
 
+	public Resource getNormalizedResource() {
+		return new FileResource(provider, getNormalizedPath());
+	}
+
+	public String getNormalizedPath() {
+		return toPath().normalize().toString();
+	}
+
 	@Override
 	public Resource getAbsoluteResource() {
 		return new FileResource(provider, getAbsolutePath());
 	}
 
+	@Deprecated // use getNormalizedResource instead
 	@Override
 	public Resource getCanonicalResource() throws IOException {
-		return new FileResource(provider, getCanonicalPath());
+		return new FileResource(provider, getNormalizedPath());
 	}
 
+	@Deprecated // use getNormalizedPath instead
+	@Override
 	public String getCanonicalPath() {
-		try {
-			// java 12 performance regression LDEV-5218
-			if (SystemUtil.JAVA_VERSION > SystemUtil.JAVA_VERSION_11 )
-				return Path.of(getPath()).toAbsolutePath().normalize().toString();
-			return super.getCanonicalPath();
-		}
-		catch (IOException e) {
-			return getAbsolutePath();
-		}
-		catch (java.nio.file.InvalidPathException ipe) {
-			return getPath();
-		}
+		return toPath().normalize().toString();
 	}
 
 	@Override

diff --git a/core/src/main/java/lucee/commons/io/res/util/ResourceUtil.java b/core/src/main/java/lucee/commons/io/res/util/ResourceUtil.java
@@ -737,7 +737,9 @@ else if (path.endsWith("..")) {
 	 *         pathname
 	 *
 	 * @throws SecurityException If a required system property value cannot be accessed.
+	 * @deprecated use instead getNormalizedPathEL
 	 */
+	@Deprecated
 	public static String getCanonicalPathEL(Resource res) {
 		try {
 			return res.getCanonicalPath();
@@ -756,7 +758,9 @@ public static String getCanonicalPathEL(Resource res) {
 	 *         pathname
 	 *
 	 * @throws SecurityException If a required system property value cannot be accessed.
+	 * @deprecated use instead getNormalizedPathEL
 	 */
+	@Deprecated
 	public static Resource getCanonicalResourceEL(Resource res) {
 		if (res == null) return res;
 		try {
@@ -767,18 +771,31 @@ public static Resource getCanonicalResourceEL(Resource res) {
 		}
 	}
 
-	public static File getCanonicalFileEL(File file) {
-		if (file == null) return file;
+	public static String getNormalizedPathEL(Resource res) {
+		try {
+			if (res instanceof FileResource) return ((FileResource) res).getNormalizedPath();
+			return res.getCanonicalPath();
+		}
+		catch (IOException e) {
+			return res.toString();
+		}
+	}
+
+	public static Resource getNormalizedResourceEL(Resource res) {
 		try {
-			if (SystemUtil.JAVA_VERSION > SystemUtil.JAVA_VERSION_11 )
-				return file.getAbsoluteFile();
-			return file.getCanonicalFile();
+			if (res instanceof FileResource) return ((FileResource) res).getNormalizedResource();
+			return res.getCanonicalResource();
 		}
 		catch (IOException e) {
-			return file.getAbsoluteFile();
+			return res.getAbsoluteResource();
 		}
 	}
 
+	public static File getCanonicalFileEL(File file) {
+		if (file == null) return file;
+		return file.toPath().normalize().toFile();
+	}
+
 	/**
 	 * creates a new File
 	 * 

diff --git a/core/src/main/java/lucee/commons/lang/ClassUtil.java b/core/src/main/java/lucee/commons/lang/ClassUtil.java
@@ -634,12 +634,7 @@ public static String[] getClassPath(Config config) {
 			int len = arr.size();
 			for (int i = 1; i <= len; i++) {
 				File file = FileUtil.toFile(Caster.toString(arr.get(i, ""), "").trim());
-				if (file.exists()) try {
-					pathes.put(file.getCanonicalPath(), "");
-				}
-				catch (IOException e) {
-					LogUtil.warn("class-util", e);
-				}
+				pathes.put(FileUtil.getNormalizedPath(file), "");
 			}
 		}
 
@@ -669,12 +664,7 @@ private static void _getClassPathesFromLoader(URLClassLoader ucl, Map pathes) {
 
 		for (int i = 0; i < urls.length; i++) {
 			File file = FileUtil.toFile(urls[i].getPath());
-			if (file.exists()) try {
-				pathes.put(file.getCanonicalPath(), "");
-			}
-			catch (IOException e) {
-				LogUtil.warn("class-util", e);
-			}
+			if (file.exists()) pathes.put(FileUtil.getNormalizedPath(file), "");
 		}
 	}
 

diff --git a/core/src/main/java/lucee/runtime/instrumentation/unix/UNIXSocketAddress.java b/core/src/main/java/lucee/runtime/instrumentation/unix/UNIXSocketAddress.java
@@ -4,6 +4,8 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
+import lucee.commons.io.FileUtil;
+
 /**
  * Describes an {@link InetSocketAddress} that actually uses AF_UNIX sockets instead of AF_INET.
  * 
@@ -37,7 +39,7 @@ public UNIXSocketAddress(final File socketFile, int port) throws IOException {
 		if (port != 0) {
 			NativeUnixSocket.setPort1(this, port);
 		}
-		this.socketFile = socketFile.getCanonicalPath();
+		this.socketFile = FileUtil.getNormalizedPath(socketFile);
 	}
 
 	/**

diff --git a/core/src/main/java/lucee/runtime/net/http/ReqRspUtil.java b/core/src/main/java/lucee/runtime/net/http/ReqRspUtil.java
@@ -47,6 +47,7 @@
 import org.xml.sax.InputSource;
 
 import lucee.commons.io.CharsetUtil;
+import lucee.commons.io.FileUtil;
 import lucee.commons.io.IOUtil;
 import lucee.commons.io.SystemUtil;
 import lucee.commons.lang.ExceptionUtil;
@@ -552,11 +553,7 @@ public static String getRootPath(ServletContext sc) {
 		if (root == null) throw new RuntimeException("cannot determinate webcontext root, the ServletContext from class [" + sc.getClass().getName()
 				+ "] is returning null for the method call sc.getRealPath(\"/\"), possibly due to configuration problem.");
 
-		try {
-			root = new File(root).getCanonicalPath();
-		}
-		catch (IOException e) {
-		}
+		root = FileUtil.getNormalizedPath(new File(root));
 		rootPathes.put(id, root);
 		return root;
 	}

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.0.236-SNAPSHOT"/>
+  <property name="version" value="6.2.0.237-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.0.236-SNAPSHOT</version>
+  <version>6.2.0.237-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>