diff --git a/.gitignore b/.gitignore index 7496fc9..b7218d5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,11 +15,5 @@ target/ pom.xml.versionsBackup # IntelliJ Settings Files (https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems) # -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/dictionaries -.idea/compiler.xml -.idea/encodings.xml -.idea/jarRepositories.xml -.idea/**/libraries/ +.idea/** *.iml diff --git a/pom.xml b/pom.xml index 369c927..2456e3b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.cryptomator fuse-nio-adapter - 2.0.2 + 2.0.3 FUSE-NIO-Adapter Access resources at a given NIO path via FUSE. https://github.com/cryptomator/fuse-nio-adapter @@ -32,7 +32,7 @@ 2.4.3 - 8.1.0 + 8.1.2 3.1.0 diff --git a/src/main/java/org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java b/src/main/java/org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java index 930a53f..143eec1 100644 --- a/src/main/java/org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java +++ b/src/main/java/org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java @@ -14,6 +14,8 @@ import org.cryptomator.jfuse.api.Fuse; import org.cryptomator.jfuse.api.FuseMountFailedException; +import java.io.IOException; +import java.io.UncheckedIOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -37,6 +39,7 @@ public class FuseTMountProvider implements MountService { private static final String DYLIB_PATH = "/usr/local/lib/libfuse-t.dylib"; + private static final Path USER_HOME = Paths.get(System.getProperty("user.home")); @Override public String displayName() { @@ -66,7 +69,13 @@ public int getDefaultLoopbackPort() { @Override public String getDefaultMountFlags() { // see: https://github.com/macos-fuse-t/fuse-t/wiki#supported-mount-options - return "-orwsize=262144"; + try { + return "-orwsize=262144" // + + " -ouid=" + Files.getAttribute(USER_HOME, "unix:uid") // + + " -ogid=" + Files.getAttribute(USER_HOME, "unix:gid"); + } catch (IOException e) { + throw new UncheckedIOException(e); + } } private static class FuseTMountBuilder extends AbstractMacMountBuilder { diff --git a/suppression.xml b/suppression.xml index bb67725..c0edcc0 100644 --- a/suppression.xml +++ b/suppression.xml @@ -41,4 +41,12 @@ CVE-2018-10906 + + + ^pkg:maven/com\.google\.guava/guava@.*$ + CVE-2020-8908 + CVE-2020-8908 + \ No newline at end of file