server/user-create: Warn if user already exists

leonklingele · May 18, 2018 · f7cead1 · f7cead1
1 parent a507b08
commit f7cead1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/server/git-shell-commands/user-create b/server/git-shell-commands/user-create
@@ -21,6 +21,14 @@ if [ -z "$NEW_USER" ]; then
 	exit 1
 fi
 
+# TODO(leon): DRY
+# Regex is not an issue here, .* is not allowed in user names :)
+MATCH="^environment=\"GIT_USER=$NEW_USER\".*$"
+if grep -xq "$MATCH" "$FILE_PATH_AUTHORIZED_KEYS"; then
+	echo "User '$NEW_USER' already exists"
+	exit 1
+fi
+
 if [ -z "$PUBLIC_KEY" ]; then
 	echo "No public key specified"
 	exit 1

diff --git a/tests/02-user.test b/tests/02-user.test
@@ -14,6 +14,8 @@ users_list_count_must_equal "3"
 user_create "invalid-ssh" "invalid-ssh" "$INVALID_SSH_KEY_ERROR_MSG"
 user_create "invalid-ssh" "ssh" "$INVALID_SSH_KEY_ERROR_MSG"
 users_list_count_must_equal "3"
+user_create "test" "ssh-rsa" "Error! User 'test' already exists"
+users_list_count_must_equal "3"
 
 # Test user deletion
 user_delete "test2"