Merge branch 'release/2.0.2'

Author: infeo

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>webdav-nio-adapter</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<name>WebDAV-NIO Adapter</name>
 	<description>Embedded Jetty serving a WebDAV servlet to access resources at a given NIO path.</description>
 	<url>https://github.com/cryptomator/webdav-nio-adapter</url>
@@ -28,7 +28,7 @@
 		<junit.jupiter.version>5.9.2</junit.jupiter.version>
 
 		<!-- mvn plugin dependencies -->
-		<dependency-check.version>8.1.0</dependency-check.version>
+		<dependency-check.version>8.1.2</dependency-check.version>
 		<jacoco.version>0.8.8</jacoco.version>
 		<nexus-staging.version>1.6.8</nexus-staging.version>
 		<maven.deploy.version>3.1.0</maven.deploy.version>

src/main/java/org/cryptomator/frontend/webdav/DefaultServlet.java

@@ -13,8 +13,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
@@ -23,10 +23,10 @@ class DefaultServlet extends HttpServlet implements ContextPathRegistry {
 	private static final String METHOD_PROPFIND = "PROPFIND";
 	private static final int TARPIT_DELAY_MS = 5000;
 	private static final Pattern PATH_SEP_PATTERN = Pattern.compile("/");
-	private final Set<String> synchronizedContextPaths;
+	private final Set<String> contextPaths;
 
 	public DefaultServlet(Set<String> contextPaths) {
-		this.synchronizedContextPaths = Collections.synchronizedSet(contextPaths);
+		this.contextPaths = new CopyOnWriteArraySet<>(contextPaths);
 	}
 
 	@Override
@@ -44,12 +44,12 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
 		}
 
 		switch (req.getMethod()) {
-		case METHOD_PROPFIND:
-			doPropfind(req, resp);
-			break;
-		default:
-			super.service(req, resp);
-			break;
+			case METHOD_PROPFIND:
+				doPropfind(req, resp);
+				break;
+			default:
+				super.service(req, resp);
+				break;
 		}
 	}
 
@@ -79,24 +79,17 @@ protected void doPropfind(HttpServletRequest req, HttpServletResponse resp) thro
 	}
 
 	private boolean isRequestedResourcePathPartOfValidContextPath(String requestedResourcePath) {
-		//required for synchronized collections, see https://docs.oracle.com/en/java/javase/19/docs/api/java.base/java/util/Collections.html#synchronizedSet(java.util.Set)
-		synchronized (synchronizedContextPaths) {
-			return synchronizedContextPaths.stream().anyMatch(cp -> isParentOrSamePath(cp, requestedResourcePath));
-		}
+		return contextPaths.stream().anyMatch(cp -> isParentOrSamePath(cp, requestedResourcePath));
 	}
 
 	@Override
 	public boolean add(String contextPath) {
-		synchronized (synchronizedContextPaths) {
-			return synchronizedContextPaths.add(contextPath);
-		}
+		return contextPaths.add(contextPath);
 	}
 
 	@Override
 	public boolean remove(String contextPath) {
-		synchronized (synchronizedContextPaths) {
-			return synchronizedContextPaths.remove(contextPath);
-		}
+		return contextPaths.remove(contextPath);
 	}
 
 	private boolean isParentOrSamePath(String path, String potentialParent) {

src/main/java/org/cryptomator/frontend/webdav/mount/WindowsMounter.java

@@ -83,10 +83,10 @@ public MountBuilder setMountpoint(Path mountPoint) {
 		public MountBuilder setLoopbackHostName(String hostName) {
 			this.hostName = hostName;
 			try {
-				Path.of("\\\\"+hostName+"\\share");
-				new URL("http",hostName,80,"/");
+				Path.of("\\\\" + hostName + "\\share");
+				new URL("http", hostName, 80, "/");
 			} catch (MalformedURLException | InvalidPathException e) {
-				throw new IllegalArgumentException("hostName \""+hostName+"\" does not satifsfy OS restrictions.",e);
+				throw new IllegalArgumentException("hostName \"" + hostName + "\" does not satifsfy OS restrictions.", e);
 			}
 			return this;
 		}
@@ -109,8 +109,8 @@ protected Mount mount(WebDavServerHandle serverHandle, WebDavServletController s
 				tuneProxyConfigSilently(uri);
 				String mountPoint = driveLetter == null //
 						? SYSTEM_CHOSEN_MOUNTPOINT // MOUNT_TO_SYSTEM_CHOSEN_PATH
-						: driveLetter.toString(); // MOUNT_AS_DRIVE_LETTER
-				String uncPath = "\\\\" + (hostName == null? uri.getHost() : hostName) + "@" + uri.getPort() + uri.getRawPath().replace('/', '\\');
+						: driveLetter.toString().substring(0, 2); // MOUNT_AS_DRIVE_LETTER
+				String uncPath = "\\\\" + (hostName == null ? uri.getHost() : hostName) + "@" + uri.getPort() + uri.getRawPath().replace('/', '\\');
 				ProcessBuilder mount = new ProcessBuilder("net", "use", mountPoint, uncPath, "/persistent:no");
 				Process mountProcess = mount.start();
 				ProcessUtil.waitFor(mountProcess, 30, TimeUnit.SECONDS);
@@ -125,7 +125,7 @@ protected Mount mount(WebDavServerHandle serverHandle, WebDavServletController s
 				}
 
 				LOG.debug("Mounted {} on drive {}", uncPath, actualMountpoint);
-				return new MountImpl(serverHandle, servlet, actualMountpoint);
+				return new MountImpl(serverHandle, servlet, actualMountpoint, uncPath);
 			} catch (IOException | TimeoutException e) {
 				throw new MountFailedException(e);
 			}
@@ -167,7 +167,7 @@ private static void tuneProxyConfigSilently(URI uri) {
 
 	/**
 	 * @param uri The URI for which to tune the registry settings
-	 * @throws IOException If registry access fails
+	 * @throws IOException      If registry access fails
 	 * @throws TimeoutException If registry access does not finish in time
 	 * @deprecated TODO overheadhunter: check if this is really necessary.
 	 */
@@ -205,13 +205,15 @@ private static class MountImpl extends AbstractMount {
 		private final ProcessBuilder forcedUnmountCommand;
 
 		private final Path mountpoint;
+		private final String uncPath;
 		private final AtomicBoolean isUnmounted;
 
-		public MountImpl(WebDavServerHandle serverHandle, WebDavServletController servlet, String driveLetter) {
+		public MountImpl(WebDavServerHandle serverHandle, WebDavServletController servlet, String driveLetter, String uncPath) {
 			super(serverHandle, servlet);
 			this.unmountCommand = new ProcessBuilder("net", "use", driveLetter, "/delete", "/no");
 			this.forcedUnmountCommand = new ProcessBuilder("net", "use", driveLetter, "/delete", "/yes");
 			this.mountpoint = Path.of(driveLetter + "\\");
+			this.uncPath = uncPath;
 			this.isUnmounted = new AtomicBoolean(false);
 		}
 
@@ -267,9 +269,6 @@ private synchronized void unmount(ProcessBuilder command) throws UnmountFailedEx
 		@SuppressWarnings("resource")
 		private boolean isUnmounted() {
 			try {
-				var uri = servlet.getServletRootUri();
-				String uncPath = "\\\\" + uri.getHost() + "@" + uri.getPort() + uri.getRawPath().replace('/', '\\');
-
 				ProcessBuilder determineMP = new ProcessBuilder("net", "use");
 				Process determineMPProcess = ProcessUtil.startAndWaitFor(determineMP, 5, TimeUnit.SECONDS);
 				ProcessUtil.assertExitValue(determineMPProcess, 0);

src/test/java/org/cryptomator/frontend/webdav/MirroringTest.java

@@ -51,7 +51,15 @@ public static void main(String[] args) throws MountFailedException, IOException
 			if (mountProvider.hasCapability(MountCapability.VOLUME_ID)) {
 				mountBuilder.setVolumeId("testMount");
 			}
-
+			if (mountProvider.hasCapability(MountCapability.VOLUME_NAME)) {
+				mountBuilder.setVolumeName("testName");
+			}
+			if (mountProvider.hasCapability(MountCapability.MOUNT_AS_DRIVE_LETTER)) {
+				mountBuilder.setMountpoint(Path.of("X://"));
+			}
+			//if (mountProvider.hasCapability(MountCapability.LOOPBACK_HOST_NAME)) {
+			//	mountBuilder.setLoopbackHostName("cryptomator-vault");
+			//}
 			try (var mount = mountBuilder.mount()) {
 				LOG.info("Mounted successfully to: {}", mount.getMountpoint().uri());
 				LOG.info("Enter anything to unmount...");