More robust MacAppleScriptMounter

Author: overheadhunter

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

@@ -3,7 +3,12 @@
 import java.io.IOException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,6 +22,7 @@ class MacAppleScriptMounter implements MounterStrategy {
 	private static final Logger LOG = LoggerFactory.getLogger(MacAppleScriptMounter.class);
 	private static final boolean IS_OS_MACOSX = System.getProperty("os.name").contains("Mac OS X");
 	private static final String[] OS_VERSION = Iterables.toArray(Splitter.on('.').splitToList(System.getProperty("os.version")), String.class);
+	private static final Pattern MOUNT_PATTERN = Pattern.compile(".* on (\\S+) \\(.*\\)"); // catches mount point in "http://host:port/foo/ on /Volumes/foo (webdav, nodev, noexec, nosuid)"
 
 	@Override
 	public boolean isApplicable() {
@@ -30,58 +36,59 @@ public boolean isApplicable() {
 	@Override
 	public Mount mount(URI uri, MountParams mountParams) throws CommandFailedException {
 		try {
-			ProcessBuilder storeCredentials = new ProcessBuilder("security", "add-internet-password", //
-					"-a", "anonymous", //
-					"-s", "localhost", //
-					"-P", String.valueOf(uri.getPort()), //
-					"-r", "http", //
-					"-D", "Cryptomator WebDAV Access", //
-					"-T", "/System/Library/CoreServices/NetAuthAgent.app/Contents/MacOS/NetAuthSysAgent");
-			ProcessUtil.startAndWaitFor(storeCredentials, 10, TimeUnit.SECONDS);
-		} catch (CommandFailedException e) {
-			LOG.warn("Unable to store credentials for WebDAV access: {}", e.getMessage());
-		}
-		try {
-			String mountAppleScript = String.format("mount volume \"%s\"", uri.toASCIIString());
+			// mount:
+			String mountAppleScript = String.format("mount volume \"%s\" as user name \"anonymous\" with password \"\"", uri.toASCIIString());
 			ProcessBuilder mount = new ProcessBuilder("/usr/bin/osascript", "-e", mountAppleScript);
 			Process mountProcess = mount.start();
-			String stdout = ProcessUtil.toString(mountProcess.getInputStream(), StandardCharsets.UTF_8);
-			ProcessUtil.waitFor(mountProcess, 30, TimeUnit.SECONDS);
+			ProcessUtil.waitFor(mountProcess, 60, TimeUnit.SECONDS); // huge timeout since the user might need to confirm connecting via http
+			ProcessUtil.assertExitValue(mountProcess, 0);
+
+			// verify mounted:
+			ProcessBuilder verifyMount = new ProcessBuilder("/bin/sh", "-c", "mount | grep \"" + uri.toASCIIString() + "\"");
+			Process verifyProcess = verifyMount.start();
+			String stdout = ProcessUtil.toString(verifyProcess.getInputStream(), StandardCharsets.UTF_8);
+			ProcessUtil.waitFor(verifyProcess, 10, TimeUnit.SECONDS);
 			ProcessUtil.assertExitValue(mountProcess, 0);
-			if (!stdout.startsWith("file ")) {
-				throw new CommandFailedException("Unexpected mount result: " + stdout);
+
+			// determine mount point:
+			Matcher mountPointMatcher = MOUNT_PATTERN.matcher(stdout);
+			if (mountPointMatcher.find()) {
+				String mountPoint = mountPointMatcher.group(1);
+				LOG.debug("Mounted {} on {}.", uri.toASCIIString(), mountPoint);
+				return new MountImpl(Paths.get(mountPoint));
+			} else {
+				throw new CommandFailedException("Mount succeeded, but failed to determine mount point in string: " + stdout);
 			}
-			assert stdout.startsWith("file ");
-			String volumeIdentifier = CharMatcher.whitespace().trimFrom(stdout.substring(5)); // remove preceeding "file "
-			String waitAppleScript1 = String.format("tell application \"Finder\" to repeat while not (\"%s\" exists)", volumeIdentifier);
-			String waitAppleScript2 = "delay 0.1";
-			String waitAppleScript3 = "end repeat";
-			ProcessBuilder wait = new ProcessBuilder("/usr/bin/osascript", "-e", waitAppleScript1, "-e", waitAppleScript2, "-e", waitAppleScript3);
-			ProcessUtil.assertExitValue(ProcessUtil.startAndWaitFor(wait, 30, TimeUnit.SECONDS), 0);
-			LOG.debug("Mounted {}.", uri.toASCIIString());
-			return new MountImpl(volumeIdentifier);
 		} catch (IOException e) {
 			throw new CommandFailedException(e);
 		}
 	}
 
 	private static class MountImpl implements Mount {
 
+		private final Path mountPath;
 		private final ProcessBuilder revealCommand;
 		private final ProcessBuilder unmountCommand;
 
-		private MountImpl(String volumeIdentifier) {
-			String openAppleScript = String.format("tell application \"Finder\" to open \"%s\"", volumeIdentifier);
-			String activateAppleScript = String.format("tell application \"Finder\" to activate \"%s\"", volumeIdentifier);
-			String ejectAppleScript = String.format("tell application \"Finder\" to if \"%s\" exists then eject \"%s\"", volumeIdentifier, volumeIdentifier);
-
-			this.revealCommand = new ProcessBuilder("/usr/bin/osascript", "-e", openAppleScript, "-e", activateAppleScript);
-			this.unmountCommand = new ProcessBuilder("/usr/bin/osascript", "-e", ejectAppleScript);
+		private MountImpl(Path mountPath) {
+			this.mountPath = mountPath;
+			this.revealCommand = new ProcessBuilder("open", mountPath.toString());
+			this.unmountCommand = new ProcessBuilder("sh", "-c", "diskutil umount \"" + mountPath + "\"");
 		}
 
 		@Override
 		public void unmount() throws CommandFailedException {
+			if (!Files.isDirectory(mountPath)) {
+				// unmounting a mounted drive will delete the associated mountpoint (at least under OS X 10.11)
+				LOG.debug("Volume already unmounted.");
+				return;
+			}
 			ProcessUtil.assertExitValue(ProcessUtil.startAndWaitFor(unmountCommand, 10, TimeUnit.SECONDS), 0);
+			try {
+				Files.deleteIfExists(mountPath);
+			} catch (IOException e) {
+				LOG.warn("Could not delete {} due to exception: {}", mountPath, e.getMessage());
+			}
 		}
 
 		@Override

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

@@ -35,7 +35,7 @@ public static void main(String[] args) throws IOException, CommandFailedExceptio
 				MountParams mountParams = MountParams.create() //
 						.withWindowsDriveLetter("X:") //
 						.withPreferredGvfsScheme("dav") //
-						.withWebdavHostname("cryptomator-vault") //
+						// .withWebdavHostname("cryptomator-vault") // uncomment only if hostname is set in /etc/hosts!
 						.build();
 				Mount mount = servlet.mount(mountParams);
 				mount.reveal();