Improve "Windows NTFS junction fix"

See #155

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.2.1
+* Windows NTFS junction fix
+  * Automatically disable it on Java 26+ as [JDK-8364277](https://bugs.openjdk.org/browse/JDK-8364277) is fixed there
+  * Backport changes from Java 25 to ensure compatibility and get performance improvements (JEP 486)
+* Updated dependencies
+
 # 2.2.0
 * Added an explicit option for enabling the Windows NTFS junction fix: ``useWinNTFSJunctionFixIfApplicable`` #155
   * Enabling it also requires adding ``--add-exports java.base/sun.nio.fs=ALL-UNNAMED`` or performance will be impacted by ~20x due to non-accessible file attributes cache

testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/java/nio/file/winntfs/FileTreeIterator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -74,7 +74,6 @@ public class FileTreeIterator implements Iterator<Event>, Closeable
 	 *
 	 * @throws IllegalArgumentException if {@code maxDepth} is negative
 	 * @throws IOException              if an I/O errors occurs opening the starting file
-	 * @throws SecurityException        if the security manager denies access to the starting file
 	 * @throws NullPointerException     if {@code start} or {@code options} is {@code null} or the options array
 	 *                                  contains a {@code null} element
 	 */

testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/java/nio/file/winntfs/FileTreeWalker.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -162,21 +162,8 @@ enum EventType
 	/**
 	 * Events returned by the {@link #walk} and {@link #next} methods.
 	 */
-	static class Event
+	record Event(EventType type, Path file, BasicFileAttributes attributes, IOException ioeException)
 	{
-		private final EventType type;
-		private final Path file;
-		private final BasicFileAttributes attrs;
-		private final IOException ioe;
-		
-		private Event(final EventType type, final Path file, final BasicFileAttributes attrs, final IOException ioe)
-		{
-			this.type = type;
-			this.file = file;
-			this.attrs = attrs;
-			this.ioe = ioe;
-		}
-		
 		Event(final EventType type, final Path file, final BasicFileAttributes attrs)
 		{
 			this(type, file, attrs, null);
@@ -186,26 +173,6 @@ private Event(final EventType type, final Path file, final BasicFileAttributes a
 		{
 			this(type, file, null, ioe);
 		}
-		
-		EventType type()
-		{
-			return this.type;
-		}
-		
-		Path file()
-		{
-			return this.file;
-		}
-		
-		BasicFileAttributes attributes()
-		{
-			return this.attrs;
-		}
-		
-		IOException ioeException()
-		{
-			return this.ioe;
-		}
 	}
 
 	/**
@@ -307,16 +274,13 @@ private static BasicFileAttributes extractFromBasicFileAttributesHolder(final Pa
 	 * The
 	 * {@code canUseCached} argument determines whether this method can use cached attributes.
 	 */
-	@SuppressWarnings("removal")
 	private BasicFileAttributes getAttributes(final Path file, final boolean canUseCached)
 		throws IOException
 	{
 		// if attributes are cached then use them if possible
-		if(canUseCached
-			&& this.isBasicFileAttributesHolder(file)
-			&& System.getSecurityManager() == null)
+		if(canUseCached && isBasicFileAttributesHolder(file))
 		{
-			final BasicFileAttributes cached = this.extractFromBasicFileAttributesHolder(file);
+			final BasicFileAttributes cached = extractFromBasicFileAttributesHolder(file);
 			if(cached != null && (!this.followLinks || !cached.isSymbolicLink()))
 			{
 				return cached;
@@ -337,7 +301,7 @@ private BasicFileAttributes getAttributes(final Path file, final boolean canUseC
 				throw ioe;
 			}
 
-			// attempt to get attrmptes without following links
+			// attempt to get attributes without following links
 			attrs = Files.readAttributes(
 				file,
 				BasicFileAttributes.class,
@@ -374,7 +338,7 @@ private boolean wouldLoop(final Path dir, final Object key)
 						return true;
 					}
 				}
-				catch(final IOException | SecurityException x)
+				catch(final IOException e)
 				{
 					// ignore
 				}
@@ -386,13 +350,9 @@ private boolean wouldLoop(final Path dir, final Object key)
 	/**
 	 * Visits the given file, returning the {@code Event} corresponding to that visit.
 	 * <p>
-	 * The {@code ignoreSecurityException} parameter determines whether any SecurityException should be ignored or not.
-	 * If a SecurityException is thrown, and is ignored, then this method returns {@code null} to mean that there is no
-	 * event corresponding to a visit to the file.
-	 * <p>
 	 * The {@code canUseCached} parameter determines whether cached attributes for the file can be used or not.
 	 */
-	private Event visit(final Path entry, final boolean ignoreSecurityException, final boolean canUseCached)
+	private Event visit(final Path entry, final boolean canUseCached)
 	{
 		// need the file attributes
 		final BasicFileAttributes attrs;
@@ -404,14 +364,6 @@ private Event visit(final Path entry, final boolean ignoreSecurityException, fin
 		{
 			return new Event(EventType.ENTRY, entry, ioe);
 		}
-		catch(final SecurityException se)
-		{
-			if(ignoreSecurityException)
-			{
-				return null;
-			}
-			throw se;
-		}
 
 		// at maximum depth or file is not a directory
 		final int depth = this.stack.size();
@@ -439,14 +391,6 @@ private Event visit(final Path entry, final boolean ignoreSecurityException, fin
 		{
 			return new Event(EventType.ENTRY, entry, ioe);
 		}
-		catch(final SecurityException se)
-		{
-			if(ignoreSecurityException)
-			{
-				return null;
-			}
-			throw se;
-		}
 
 		// push a directory node to the stack and return an event
 		this.stack.push(new DirectoryNode(entry, attrs.fileKey(), stream));
@@ -463,12 +407,9 @@ Event walk(final Path file)
 			throw new IllegalStateException("Closed");
 		}
 
-		final Event ev = this.visit(
+		return this.visit(
 			file,
-			false,   // ignoreSecurityException
 			false);  // canUseCached
-		assert ev != null;
-		return ev;
 	}
 
 	/**
@@ -483,61 +424,53 @@ Event next()
 		}
 
 		// continue iteration of the directory at the top of the stack
-		Event ev;
-		do
+		Path entry = null;
+		IOException ioe = null;
+		
+		// get next entry in the directory
+		if(!top.skipped())
 		{
-			Path entry = null;
-			IOException ioe = null;
-			
-			// get next entry in the directory
-			if(!top.skipped())
+			final Iterator<Path> iterator = top.iterator();
+			try
 			{
-				final Iterator<Path> iterator = top.iterator();
-				try
+				if(iterator.hasNext())
 				{
-					if(iterator.hasNext())
-					{
-						entry = iterator.next();
-					}
-				}
-				catch(final DirectoryIteratorException x)
-				{
-					ioe = x.getCause();
+					entry = iterator.next();
 				}
 			}
-			
-			// no next entry so close and pop directory,
-			// creating corresponding event
-			if(entry == null)
+			catch(final DirectoryIteratorException x)
 			{
-				try
+				ioe = x.getCause();
+			}
+		}
+		
+		// no next entry so close and pop directory,
+		// creating corresponding event
+		if(entry == null)
+		{
+			try
+			{
+				top.stream().close();
+			}
+			catch(final IOException e)
+			{
+				if(ioe == null)
 				{
-					top.stream().close();
+					ioe = e;
 				}
-				catch(final IOException e)
+				else
 				{
-					if(ioe == null)
-					{
-						ioe = e;
-					}
-					else
-					{
-						ioe.addSuppressed(e);
-					}
+					ioe.addSuppressed(e);
 				}
-				this.stack.pop();
-				return new Event(EventType.END_DIRECTORY, top.directory(), ioe);
 			}
-			
-			// visit the entry
-			ev = this.visit(
-				entry,
-				true,   // ignoreSecurityException
-				true);  // canUseCached
+			this.stack.pop();
+			return new Event(EventType.END_DIRECTORY, top.directory(), ioe);
 		}
-		while(ev == null);
 
-		return ev;
+		// visit the entry
+		return this.visit(
+			entry,
+			true);  // canUseCached
 	}
 
 	/**

testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/java/nio/file/winntfs/WinNTFSJunctionFiles.java

@@ -52,14 +52,27 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * @see software.xdev.testcontainers.imagebuilder.transfer.java.nio.file.winntfs
  */
 public final class WinNTFSJunctionFiles
 {
+	private static final Logger LOG = LoggerFactory.getLogger(WinNTFSJunctionFiles.class);
+	
+	@SuppressWarnings("checkstyle:MagicNumber")
 	public static boolean shouldBeApplied(final Path path)
 	{
+		// JDK-8364277 was fixed in Java 26
+		if(Runtime.version().feature() >= 26)
+		{
+			LOG.info("WindowsNTFSJunctionFix is no longer required "
+				+ "as this is a Java version where JDK-8364277 is fixed");
+			return false;
+		}
 		try
 		{
 			final FileStore store = Files.getFileStore(path);

testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/java/nio/file/winntfs/package-info.java

@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 /**
- * This package was forked from the OpenJDK (as of 21.0.7) to resolve a crash/infinite loop when encountering
+ * This package was forked from the OpenJDK (25) to resolve a crash/infinite loop when encountering
  * <a href="https://github.com/xdev-software/testcontainers-advanced-imagebuilder/issues/155">
  * recursive NTFS junctions on Windows
  * </a>.
  * <p>
  * <b>Please note:</b>
- * Enabling it also requires adding ``--add-exports java.base/sun.nio.fs=ALL-UNNAMED`` or performance will be
- * impacted by ~20x due non-accessible file attributes cache
+ * Enabling/Using it also requires adding <code>--add-exports java.base/sun.nio.fs=ALL-UNNAMED</code> as arguments
+ * or performance will be impacted by ~20x due non-accessible file attributes cache.
  * </p>
  *
+ * @see <a href="https://bugs.openjdk.org/browse/JDK-8364277">JDK-8364277</a>
  * @see <a href="https://en.wikipedia.org/wiki/NTFS_links#Junction_points">NTFS junction</a>
  */
 package software.xdev.testcontainers.imagebuilder.transfer.java.nio.file.winntfs;

testcontainers-advanced-imagebuilder/src/test/java/software/xdev/testcontainers/imagebuilder/transfer/java/nio/file/winntfs/WinNTFSJunctionFilesTest.java

@@ -52,7 +52,7 @@ void junctionNoCrash(@TempDir final Path tempDir) throws IOException
 
 		if(!WinNTFSJunctionFiles.shouldBeApplied(tempDir))
 		{
-			Assumptions.abort("Test is not applicable: Not WIN + NTFS");
+			Assumptions.abort("Test is not applicable");
 		}
 
 		final Path testFile = sub.resolve("test.txt");