stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8307887: (fs) Files.createSymbolicLink throws less specific exception when in developer mode and file already exists

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Brian Burkhalter 2023-06-06 15:14:57 +00:00
parent ca6f07f9ab
commit d709c25cbf
4 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java
View File

@ -238,7 +238,7 @@ class WindowsFileCopy {
} else { } else {
String linkTarget = WindowsLinkSupport.readLink(source); String linkTarget = WindowsLinkSupport.readLink(source);
int flags = SYMBOLIC_LINK_FLAG_DIRECTORY; int flags = SYMBOLIC_LINK_FLAG_DIRECTORY;
CreateSymbolicLink(targetPath, WindowsLinkSupport.createSymbolicLink(targetPath,
WindowsPath.addPrefixIfNeeded(linkTarget), WindowsPath.addPrefixIfNeeded(linkTarget),
flags); flags);
} }
@ -441,7 +441,7 @@ class WindowsFileCopy {
CreateDirectory(targetPath, 0L); CreateDirectory(targetPath, 0L);
} else { } else {
String linkTarget = WindowsLinkSupport.readLink(source); String linkTarget = WindowsLinkSupport.readLink(source);
CreateSymbolicLink(targetPath, WindowsLinkSupport.createSymbolicLink(targetPath,
WindowsPath.addPrefixIfNeeded(linkTarget), WindowsPath.addPrefixIfNeeded(linkTarget),
SYMBOLIC_LINK_FLAG_DIRECTORY); SYMBOLIC_LINK_FLAG_DIRECTORY);
} }

4
src/java.base/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -594,7 +594,7 @@ class WindowsFileSystemProvider
// create the link // create the link
try { try {
CreateSymbolicLink(link.getPathForWin32Calls(), WindowsLinkSupport.createSymbolicLink(link.getPathForWin32Calls(),
WindowsPath.addPrefixIfNeeded(target.toString()), WindowsPath.addPrefixIfNeeded(target.toString()),
flags); flags);
} catch (WindowsException x) { } catch (WindowsException x) {

30
src/java.base/windows/classes/sun/nio/fs/WindowsLinkSupport.java
View File

@ -45,6 +45,36 @@ class WindowsLinkSupport {
private WindowsLinkSupport() { private WindowsLinkSupport() {
} }
/**
* Creates a symbolic link, retyring if not privileged
*/
static void createSymbolicLink(String link, String target, int flags)
throws WindowsException
{
try {
CreateSymbolicLink(link, target, flags);
} catch (WindowsException x) {
// Retry if the privilege to create symbolic links is not held
if (x.lastError() == ERROR_PRIVILEGE_NOT_HELD) {
flags |= SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE;
try {
CreateSymbolicLink(link, target, flags);
return;
} catch (WindowsException y) {
// Throw an exception if and only if it is not due to symbolic link creation
// privilege not being held (ERROR_PRIVILEGE_NOT_HELD) nor the
// SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE flag not being recognized
// (ERROR_INVALID_PARAMETER). The latter will occur for Windows builds
// older than 14972.
int lastError = y.lastError();
if (lastError != ERROR_PRIVILEGE_NOT_HELD && lastError != ERROR_INVALID_PARAMETER)
throw y;
}
}
throw x;
}
}
/** /**
* Returns the target of a symbolic link * Returns the target of a symbolic link
*/ */

15
src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -975,19 +975,6 @@ class WindowsNativeDispatcher {
try { try {
CreateSymbolicLink0(linkBuffer.address(), targetBuffer.address(), CreateSymbolicLink0(linkBuffer.address(), targetBuffer.address(),
flags); flags);
} catch (WindowsException x) {
if (x.lastError() == ERROR_PRIVILEGE_NOT_HELD) {
flags |= SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE;
try {
CreateSymbolicLink0(linkBuffer.address(),
targetBuffer.address(), flags);
return;
} catch (WindowsException ignored) {
// Will fail with ERROR_INVALID_PARAMETER for Windows
// builds older than 14972.
}
}
throw x;
} finally { } finally {
targetBuffer.release(); targetBuffer.release();
linkBuffer.release(); linkBuffer.release();