Merge branch 'path-sym-links' into 'main'

robertpatrick · robertpatrick · commit e8efbf931fc2 · 2024-11-18T20:24:13.000Z
Change path resolution to avoid getCanonicalFile so that symbolic links are...

See merge request weblogic-cloud/weblogic-deploy-tooling!1750
diff --git a/core/src/main/java/oracle/weblogic/deploy/util/FileUtils.java b/core/src/main/java/oracle/weblogic/deploy/util/FileUtils.java
@@ -104,9 +104,9 @@ public static File getCanonicalFile(File f) {
         File canonicalFile = null;
         if (f != null) {
             try {
-                canonicalFile = f.getCanonicalFile();
-            } catch (IOException ioe) {
-                LOGGER.warning("WLSDPLY-01100", ioe, f.getPath(), ioe.getLocalizedMessage());
+                canonicalFile = f.toPath().toAbsolutePath().normalize().toFile();
+            } catch (Exception ex) {
+                LOGGER.warning("WLSDPLY-01100", ex, f.getPath(), ex.getLocalizedMessage());
                 canonicalFile = f.getAbsoluteFile();
             }
         }
@@ -683,7 +683,7 @@ static Set<PosixFilePermission> getPermissions(int octals) {
     }
 
     private static File validatePathNameInternal(String pathName, String emptyErrorKey) {
-        final String METHOD = "validatePathyNameInternal";
+        final String METHOD = "validatePathNameInternal";
 
         LOGGER.entering(CLASS, METHOD, pathName, emptyErrorKey);
         if (StringUtils.isEmpty(pathName)) {

Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,9 @@ public static File getCanonicalFile(File f) {`
`104`	`104`	`File canonicalFile = null;`
`105`	`105`	`if (f != null) {`
`106`	`106`	`try {`
`107`		`- canonicalFile = f.getCanonicalFile();`
`108`		`- } catch (IOException ioe) {`
`109`		`- LOGGER.warning("WLSDPLY-01100", ioe, f.getPath(), ioe.getLocalizedMessage());`
	`107`	`+ canonicalFile = f.toPath().toAbsolutePath().normalize().toFile();`
	`108`	`+ } catch (Exception ex) {`
	`109`	`+ LOGGER.warning("WLSDPLY-01100", ex, f.getPath(), ex.getLocalizedMessage());`
`110`	`110`	`canonicalFile = f.getAbsoluteFile();`
`111`	`111`	`}`
`112`	`112`	`}`
`@@ -683,7 +683,7 @@ static Set<PosixFilePermission> getPermissions(int octals) {`
`683`	`683`	`}`
`684`	`684`
`685`	`685`	`private static File validatePathNameInternal(String pathName, String emptyErrorKey) {`
`686`		`- final String METHOD = "validatePathyNameInternal";`
	`686`	`+ final String METHOD = "validatePathNameInternal";`
`687`	`687`
`688`	`688`	`LOGGER.entering(CLASS, METHOD, pathName, emptyErrorKey);`
`689`	`689`	`if (StringUtils.isEmpty(pathName)) {`