8202110: (fs) Remove FileSystem support for resolving against a default directory (chdir configuration)

Brian Burkhalter · Brian Burkhalter · commit 05cc02b2438d · 2023-03-30T16:44:01.000Z
Reviewed-by: alanb
diff --git a/src/java.base/aix/classes/sun/nio/fs/AixFileSystem.java b/src/java.base/aix/classes/sun/nio/fs/AixFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -38,8 +38,8 @@
 
 class AixFileSystem extends UnixFileSystem {
 
-    AixFileSystem(UnixFileSystemProvider provider, String dir) {
-        super(provider, dir);
+    AixFileSystem(UnixFileSystemProvider provider) {
+        super(provider);
     }
 
     @Override
diff --git a/src/java.base/aix/classes/sun/nio/fs/AixFileSystemProvider.java b/src/java.base/aix/classes/sun/nio/fs/AixFileSystemProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -38,8 +38,8 @@ public AixFileSystemProvider() {
     }
 
     @Override
-    AixFileSystem newFileSystem(String dir) {
-        return new AixFileSystem(this, dir);
+    AixFileSystem newFileSystem() {
+        return new AixFileSystem(this);
     }
 
     /**
diff --git a/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java b/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,8 +41,8 @@
  */
 
 class LinuxFileSystem extends UnixFileSystem {
-    LinuxFileSystem(UnixFileSystemProvider provider, String dir) {
-        super(provider, dir);
+    LinuxFileSystem(UnixFileSystemProvider provider) {
+        super(provider);
     }
 
     @Override
diff --git a/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java b/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,8 +42,8 @@ public LinuxFileSystemProvider() {
     }
 
     @Override
-    LinuxFileSystem newFileSystem(String dir) {
-        return new LinuxFileSystem(this, dir);
+    LinuxFileSystem newFileSystem() {
+        return new LinuxFileSystem(this);
     }
 
     @Override
diff --git a/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystem.java b/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,8 +46,8 @@
 
 class BsdFileSystem extends UnixFileSystem {
 
-    BsdFileSystem(UnixFileSystemProvider provider, String dir) {
-        super(provider, dir);
+    BsdFileSystem(UnixFileSystemProvider provider) {
+        super(provider);
     }
 
     @Override
diff --git a/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystemProvider.java b/src/java.base/macosx/classes/sun/nio/fs/BsdFileSystemProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,8 +39,8 @@ public BsdFileSystemProvider() {
     }
 
     @Override
-    BsdFileSystem newFileSystem(String dir) {
-        return new BsdFileSystem(this, dir);
+    BsdFileSystem newFileSystem() {
+        return new BsdFileSystem(this);
     }
 
     @Override
diff --git a/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystem.java b/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,8 +48,8 @@ class MacOSXFileSystem extends BsdFileSystem {
             && ("".equals(value) || Boolean.parseBoolean(value));
     }
 
-    MacOSXFileSystem(UnixFileSystemProvider provider, String dir) {
-        super(provider, dir);
+    MacOSXFileSystem(UnixFileSystemProvider provider) {
+        super(provider);
     }
 
     boolean isCaseInsensitiveAndPreserving() {
diff --git a/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystemProvider.java b/src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystemProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,8 +40,8 @@ public MacOSXFileSystemProvider() {
     }
 
     @Override
-    MacOSXFileSystem newFileSystem(String dir) {
-        return new MacOSXFileSystem(this, dir);
+    MacOSXFileSystem newFileSystem() {
+        return new MacOSXFileSystem(this);
     }
 
     @Override
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java
@@ -52,6 +52,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 import jdk.internal.misc.Blocker;
+import jdk.internal.util.StaticProperty;
 import sun.nio.ch.DirectBuffer;
 import sun.nio.ch.IOStatus;
 import sun.security.action.GetPropertyAction;
@@ -73,39 +74,17 @@ abstract class UnixFileSystem
 
     private final UnixFileSystemProvider provider;
     private final byte[] defaultDirectory;
-    private final boolean needToResolveAgainstDefaultDirectory;
     private final UnixPath rootDirectory;
 
     // package-private
-    UnixFileSystem(UnixFileSystemProvider provider, String dir) {
+    UnixFileSystem(UnixFileSystemProvider provider) {
+        String dir = StaticProperty.userDir();
         this.provider = provider;
         this.defaultDirectory = Util.toBytes(UnixPath.normalizeAndCheck(dir));
         if (this.defaultDirectory[0] != '/') {
             throw new RuntimeException("default directory must be absolute");
         }
 
-        // if process-wide chdir is allowed or default directory is not the
-        // process working directory then paths must be resolved against the
-        // default directory.
-        String propValue = GetPropertyAction
-                .privilegedGetProperty("sun.nio.fs.chdirAllowed", "false");
-        boolean chdirAllowed = propValue.isEmpty() ? true : Boolean.parseBoolean(propValue);
-        if (chdirAllowed) {
-            this.needToResolveAgainstDefaultDirectory = true;
-        } else {
-            byte[] cwd = UnixNativeDispatcher.getcwd();
-            boolean defaultIsCwd = (cwd.length == defaultDirectory.length);
-            if (defaultIsCwd) {
-                for (int i=0; i<cwd.length; i++) {
-                    if (cwd[i] != defaultDirectory[i]) {
-                        defaultIsCwd = false;
-                        break;
-                    }
-                }
-            }
-            this.needToResolveAgainstDefaultDirectory = !defaultIsCwd;
-        }
-
         // the root directory
         this.rootDirectory = new UnixPath(this, "/");
     }
@@ -115,10 +94,6 @@ byte[] defaultDirectory() {
         return defaultDirectory;
     }
 
-    boolean needToResolveAgainstDefaultDirectory() {
-        return needToResolveAgainstDefaultDirectory;
-    }
-
     boolean isCaseInsensitiveAndPreserving() {
         return false;
     }
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,17 +75,17 @@ public abstract class UnixFileSystemProvider
     private final UnixFileSystem theFileSystem;
 
     public UnixFileSystemProvider() {
-        theFileSystem = newFileSystem(StaticProperty.userDir());
+        theFileSystem = newFileSystem();
     }
 
     UnixFileSystem theFileSystem() {
         return theFileSystem;
     }
 
     /**
-     * Constructs a new file system using the given default directory.
+     * Constructs a new file system.
      */
-    abstract UnixFileSystem newFileSystem(String dir);
+    abstract UnixFileSystem newFileSystem();
 
     @Override
     public final String getScheme() {
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java b/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,11 +52,6 @@ static NativeBuffer copyToNativeBuffer(UnixPath path) {
         return buffer;
     }
 
-    /**
-     * char *getcwd(char *buf, size_t size);
-     */
-    static native byte[] getcwd();
-
     /**
      * int dup(int filedes)
      */
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixPath.java b/src/java.base/unix/classes/sun/nio/fs/UnixPath.java
@@ -138,18 +138,12 @@ byte[] asByteArray() {
 
     // use this path when making system/library calls
     byte[] getByteArrayForSysCalls() {
-        // resolve against default directory if required (chdir allowed or
-        // file system default directory is not working directory)
-        if (getFileSystem().needToResolveAgainstDefaultDirectory()) {
-            return resolve(getFileSystem().defaultDirectory(), path);
+        if (!isEmpty()) {
+            return path;
         } else {
-            if (!isEmpty()) {
-                return path;
-            } else {
-                // empty path case will access current directory
-                byte[] here = { '.' };
-                return here;
-            }
+            // empty path case will access current directory
+            byte[] here = { '.' };
+            return here;
         }
     }
 
@@ -160,11 +154,7 @@ String getPathForExceptionMessage() {
 
     // use this path for permission checks
     String getPathForPermissionCheck() {
-        if (getFileSystem().needToResolveAgainstDefaultDirectory()) {
-            return Util.toString(getByteArrayForSysCalls());
-        } else {
-            return toString();
-        }
+        return toString();
     }
 
     // Checks that the given file is a UnixPath
diff --git a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -324,25 +324,6 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this)
     return capabilities;
 }
 
-JNIEXPORT jbyteArray JNICALL
-Java_sun_nio_fs_UnixNativeDispatcher_getcwd(JNIEnv* env, jclass this) {
-    jbyteArray result = NULL;
-    char buf[PATH_MAX+1];
-
-    /* EINTR not listed as a possible error */
-    char* cwd = getcwd(buf, sizeof(buf));
-    if (cwd == NULL) {
-        throwUnixException(env, errno);
-    } else {
-        jsize len = (jsize)strlen(buf);
-        result = (*env)->NewByteArray(env, len);
-        if (result != NULL) {
-            (*env)->SetByteArrayRegion(env, result, 0, len, (jbyte*)buf);
-        }
-    }
-    return result;
-}
-
 JNIEXPORT jbyteArray
 Java_sun_nio_fs_UnixNativeDispatcher_strerror(JNIEnv* env, jclass this, jint error)
 {
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystem.java b/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystem.java
@@ -31,6 +31,7 @@
 import java.util.*;
 import java.util.regex.Pattern;
 import java.io.IOException;
+import jdk.internal.util.StaticProperty;
 
 class WindowsFileSystem
     extends FileSystem
@@ -42,12 +43,11 @@ class WindowsFileSystem
     private final String defaultRoot;
 
     // package-private
-    WindowsFileSystem(WindowsFileSystemProvider provider,
-                      String dir)
-    {
+    WindowsFileSystem(WindowsFileSystemProvider provider) {
         this.provider = provider;
 
         // parse default directory and check it is absolute
+        String dir = StaticProperty.userDir();
         WindowsPathParser.Result result = WindowsPathParser.parse(dir);
 
         if ((result.type() != WindowsPathType.ABSOLUTE) &&
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java b/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import java.util.concurrent.ExecutorService;
 import java.io.*;
 import java.util.*;
-import jdk.internal.util.StaticProperty;
 import sun.nio.ch.ThreadPool;
 import sun.security.util.SecurityConstants;
 
@@ -49,7 +48,7 @@ class WindowsFileSystemProvider
     private final WindowsFileSystem theFileSystem;
 
     public WindowsFileSystemProvider() {
-        theFileSystem = new WindowsFileSystem(this, StaticProperty.userDir());
+        theFileSystem = new WindowsFileSystem(this);
     }
 
     WindowsFileSystem theFileSystem() {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* Copyright (c) 2013 SAP SE. All rights reserved.`
`4`	`4`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`5`	`5`	`*`
`@@ -38,8 +38,8 @@`
`38`	`38`
`39`	`39`	`class AixFileSystem extends UnixFileSystem {`
`40`	`40`
`41`		`- AixFileSystem(UnixFileSystemProvider provider, String dir) {`
`42`		`- super(provider, dir);`
	`41`	`+ AixFileSystem(UnixFileSystemProvider provider) {`
	`42`	`+ super(provider);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -42,8 +42,8 @@ public LinuxFileSystemProvider() {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Override`
`45`		`- LinuxFileSystem newFileSystem(String dir) {`
`46`		`- return new LinuxFileSystem(this, dir);`
	`45`	`+ LinuxFileSystem newFileSystem() {`
	`46`	`+ return new LinuxFileSystem(this);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -46,8 +46,8 @@`
`46`	`46`
`47`	`47`	`class BsdFileSystem extends UnixFileSystem {`
`48`	`48`
`49`		`- BsdFileSystem(UnixFileSystemProvider provider, String dir) {`
`50`		`- super(provider, dir);`
	`49`	`+ BsdFileSystem(UnixFileSystemProvider provider) {`
	`50`	`+ super(provider);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Override`