Remove references to user "u". Uses $SUDO_USER.

4 files changed, 16 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 48079f6..30850b8 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,11 @@ work:
 work/.fslckout: | work $(fossil_database)
         cd work && fossil open ../$(fossil_database)
 else
+ifdef SUDO_USER
+THE_USER=$(SUDO_USER)
+else
+$(error "you must define THE_USER")
+endif
 unitdir = /etc/systemd/system
 unit_files = $(addprefix src/fossil-user,@.service .socket)
 units = $(filter-out %@.service,$(notdir $(unit_files)))
@@ -42,7 +47,8 @@ bindir = /usr/local/bin
 
 default: install start follow
 install:
-        install -t /etc/ssh/ -- src/user-d.AnonymousForceCommand src/user-d.AuthorizedKeysCommand
+        install -t /etc/ssh/ -- src/AuthorizedKeysCommand
+        install -T -- src/AnonymousForceCommand /etc/ssh/user-$(THE_USER).AnonymousForceCommand
         install -m644 -t /etc/ssh/sshd_config.d -- src/fossil-user.conf
         install -m644 -t $(unitdir) -- $(unit_files)
         install -t $(bindir) -- $(executables)
diff --git a/src/AuthorizedKeysCommand b/src/AuthorizedKeysCommand
index 6bf0ec9..de0732a 100755
--- a/src/AuthorizedKeysCommand
+++ b/src/AuthorizedKeysCommand
@@ -1,7 +1,11 @@
 #!/bin/sh
-cmd=/etc/ssh/user-d.AnonymousForceCommand
+username=$1
+shift
+
+[ "$username" ]
+cmd=/etc/ssh/user-$username.AnonymousForceCommand
 [ -x "$cmd" ] || exit
 
 key=$1
 shift
-printf 'restrict,pty,command="%s" %s\n' "$cmd $*" "$key"
+printf 'restrict,pty,command="%s" %s\n' "$cmd" "$key"
diff --git a/src/fossil-user.conf b/src/fossil-user.conf
index f4296fd..86387e7 100644
--- a/src/fossil-user.conf
+++ b/src/fossil-user.conf
@@ -1,4 +1,3 @@
-Match User d
 ExposeAuthInfo=yes
 AuthorizedKeysCommandUser=root
-AuthorizedKeysCommand=/etc/ssh/user-d.AuthorizedKeysCommand "%t %k" "%f"
+AuthorizedKeysCommand=/etc/ssh/AuthorizedKeysCommand "%u" "%t %k"
diff --git a/src/fossil-user.socket b/src/fossil-user.socket
index eab5a51..38914e6 100644
--- a/src/fossil-user.socket
+++ b/src/fossil-user.socket
@@ -1,5 +1,5 @@
 [Socket]
 Accept = yes
 ListenStream = /run/fossil-user.S
-SocketUser = d
-SocketMode = 0600
+SocketUser = root
+SocketMode = 0666