further improve/generalize quasseluser-*

4 files changed, 36 insertions, 16 deletions

diff --git a/quasseluser-check-password b/quasseluser-check-password
index ca2d4c8..f6c5561 100755
--- a/quasseluser-check-password
+++ b/quasseluser-check-password
@@ -3,6 +3,7 @@
 set -e
 [ $# = 1 ]
 quser=$1
+case "$quser" in *[']*) exit 1 ;; esac
 qpass=$(./quasselcore-sqlite "select password from quasseluser where username = '$quser' and hashversion = 1;")
 
 hash=${qpass%:*}
diff --git a/quasseluser-get b/quasseluser-get
new file mode 100755
index 0000000..91d4ca6
--- /dev/null
+++ b/quasseluser-get
@@ -0,0 +1,33 @@
+#!/bin/sh
+set -e
+
+cmd=${0##*/}
+case "$cmd" in
+  quasseluser-get-*)
+    exec ./quasseluser-get "${cmd#quasseluser-get-}" "$@"
+    ;;
+esac
+
+if [ $# = 2 ]
+then
+  field=$1
+  case "$field" in
+    userid | username | password | hashversion | authenticator) ;;
+    *) exit 1 ;;
+  esac
+  shift
+fi
+
+[ $# = 1 ]
+username=$1
+case "$username" in *\'*) exit 1 ;; esac
+
+result=$(./quasselcore-sqlite "select $field from quasseluser where username='$username'")
+
+if [ "$result" ]
+then
+  printf '%s\n' "$result"
+else
+  exit 1
+fi
+
diff --git a/quasseluser-get-password b/quasseluser-get-password
new file mode 120000
index 0000000..21b7085
--- /dev/null
+++ b/quasseluser-get-password
@@ -0,0 +1 @@
+quasseluser-get
\ No newline at end of file
diff --git a/quasseluser-get-userid b/quasseluser-get-userid
index d6c9d99..21b7085 100755..120000
--- a/quasseluser-get-userid
+++ b/quasseluser-get-userid
@@ -1,16 +1 @@
-#!/bin/sh
-set -e
-
-[ $# = 1 ]
-username=$1
-case "$username" in *\'*) exit 1 ;; esac
-
-userid=$(./quasselcore-sqlite "select userid from quasseluser where username='$username'")
-
-if [ "$userid" ]
-then
-  printf '%s\n' "$userid"
-else
-  exit 1
-fi
-
+quasseluser-get
\ No newline at end of file