8242680: Improved URI Support

Brian Burkhalter · slowhog · commit 9291e608920f · 2020-10-20T14:58:37.000-07:00
Reviewed-by: alanb, rhalade
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java b/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java
@@ -115,9 +115,12 @@ static URI toUri(UnixPath up) {
 
         // trailing slash if directory
         if (sb.charAt(sb.length()-1) != '/') {
-            int mode = UnixNativeDispatcher.stat(up);
-            if ((mode & UnixConstants.S_IFMT) == UnixConstants.S_IFDIR)
-                sb.append('/');
+            try {
+                up.checkRead();
+                int mode = UnixNativeDispatcher.stat(up);
+                if ((mode & UnixConstants.S_IFMT) == UnixConstants.S_IFDIR)
+                    sb.append('/');
+            } catch (SecurityException ignore) { }
         }
 
         try {
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsUriSupport.java b/src/java.base/windows/classes/sun/nio/fs/WindowsUriSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2020, 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
@@ -104,8 +104,9 @@ static URI toUri(WindowsPath path) {
         boolean addSlash = false;
         if (!s.endsWith("\\")) {
             try {
+                 path.checkRead();
                  addSlash = WindowsFileAttributes.get(path, true).isDirectory();
-            } catch (WindowsException x) {
+            } catch (SecurityException | WindowsException x) {
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2008, 2020, 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`
`@@ -104,8 +104,9 @@ static URI toUri(WindowsPath path) {`
`104`	`104`	`boolean addSlash = false;`
`105`	`105`	`if (!s.endsWith("\\")) {`
`106`	`106`	`try {`
	`107`	`+ path.checkRead();`
`107`	`108`	`addSlash = WindowsFileAttributes.get(path, true).isDirectory();`
`108`		`- } catch (WindowsException x) {`
	`109`	`+ } catch (SecurityException \| WindowsException x) {`
`109`	`110`	`}`
`110`	`111`	`}`
`111`	`112`