API: Create socket with user-only mode

git-as-svn · Feb 5, 2016 · ac81a55 · ac81a55
1 parent fbe39e3
commit ac81a55
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -29,6 +29,9 @@ allprojects {
   repositories {
     mavenLocal()
     mavenCentral()
+    maven {
+      url "https://bozaro.github.io/junixsocket"
+    }
   }
 }
 
@@ -110,7 +113,7 @@ dependencies {
   compile "com.esotericsoftware:kryo:3.0.3"
   compile "org.bitbucket.b_c:jose4j:0.4.4"
   compile "com.google.guava:guava:19.0"
-  compile "com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4"
+  compile "com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4.1"
 
   compile "ru.bozaro.gitlfs:gitlfs-pointer:0.9.0"
   compile "ru.bozaro.gitlfs:gitlfs-client:0.9.0"

diff --git a/cfg/config-local.example b/cfg/config-local.example
@@ -86,6 +86,7 @@ shared:
     path: /api
   - !socket
     path: git-as-svn.socket
+    mode: 600
 
 # Simple in-memory user database
 userDB: !localUsers

diff --git a/cfg/git-lfs-authenticate.cfg b/cfg/git-lfs-authenticate.cfg
@@ -2,7 +2,7 @@
 #
 # Git-as-svn API domain socket file.
 #
-socket-file = /var/run/git-as-svn/git-as-svn.socket
+socket-file = /var/run/git-as-svn.socket
 
 #
 # Authentification mode:

diff --git a/src/main/java/svnserver/ext/socket/config/SocketConfig.java b/src/main/java/svnserver/ext/socket/config/SocketConfig.java
@@ -31,6 +31,8 @@ public class SocketConfig implements SharedConfig {
   private static final Logger log = LoggerFactory.getLogger(SocketConfig.class);
   @NotNull
   private String path = "git-as-svn.socket";
+  @NotNull
+  private String mode = "600";
 
   @Override
   public void create(@NotNull SharedContext context) throws IOException {
@@ -44,7 +46,7 @@ public void create(@NotNull SharedContext context) throws IOException {
       //noinspection ResultOfMethodCallIgnored
       socketFile.delete();
     }
-    socket.bind(new AFUNIXSocketAddress(socketFile));
+    socket.bind(new AFUNIXSocketAddress(socketFile, 0, Integer.parseInt(mode, 8)));
     context.add(SocketRpc.class, new SocketRpc(context, socket));
   }
 

diff --git a/tools/git-lfs-authenticate b/tools/git-lfs-authenticate
@@ -15,7 +15,7 @@ else:
 
 def load_config():
     config = configparser.SafeConfigParser({
-        "socket-file": "/var/run/git-as-svn/git-as-svn.socket",
+        "socket-file": "/var/run/git-as-svn.socket",
         "mode": "username",
         "variable": "USER",
     })