Merge branch 'release/2.0.3'

cryptomator · Mar 7, 2023 · 56e1361 · 56e1361
2 parents 6ca6116 + bb32e25
commit 56e1361
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git 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
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cryptomator</groupId>
     <artifactId>fuse-nio-adapter</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <name>FUSE-NIO-Adapter</name>
     <description>Access resources at a given NIO path via FUSE.</description>
     <url>https://github.com/cryptomator/fuse-nio-adapter</url>
@@ -32,7 +32,7 @@
         <cryptofs.version>2.4.3</cryptofs.version>
 
         <!-- build dependencies -->
-        <dependency-check.version>8.1.0</dependency-check.version>
+        <dependency-check.version>8.1.2</dependency-check.version>
         <maven.deploy.version>3.1.0</maven.deploy.version>
     </properties>
 

diff --git 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
@@ -41,4 +41,12 @@
         <!-- Can't fix: Error in FUSE/Not of technical concern for this library -->
         <cve>CVE-2018-10906</cve>
     </suppress>
+    <suppress>
+        <notes><![CDATA[
+  		Suppress false positive, because com.google.common.io.Files.getTempDir() is not used
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/com\.google\.guava/guava@.*$</packageUrl>
+        <vulnerabilityName>CVE-2020-8908</vulnerabilityName>
+        <cve>CVE-2020-8908</cve>
+    </suppress>
 </suppressions>