From 19de9c271bf941f7206c360a02e0f395f589eba1 Mon Sep 17 00:00:00 2001
From: nemunaire <nemunaire@nemunai.re>
Date: Wed, 21 Feb 2018 01:25:31 +0100
Subject: [PATCH] adlin: able to tokenize every arguments

---
 challenge/bin/adlin | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/challenge/bin/adlin b/challenge/bin/adlin
index d1ffa00..8ce238a 100755
--- a/challenge/bin/adlin
+++ b/challenge/bin/adlin
@@ -36,10 +36,15 @@ token_format() {
 	DATA="$DATA]"
     }
 
+    local challenge=
+    [ -z "${TID}" ] || {
+	challenge="
+    \"challenge\": ${TID},"
+    }
+
     >&2 cat <<EOF
 {
-    "login": "${ULGN}",
-    "challenge": ${TID},
+    "login": "${ULGN}",${challenge}
     "token": "${TOKEN}"${DATA}
 }
 EOF
@@ -65,7 +70,8 @@ PKEY=$(cmdline adlin.key)
 
 [ $# -lt 1 ] && { usage; exit 1; }
 
-case "$1" in
+TOKENID="$1"
+case "${TOKENID}" in
     token1|token2)
 	HDATA=42
 	;;
@@ -73,7 +79,7 @@ case "$1" in
 	DATA=$(date +%s%N)
     ;;
     token4)
-	echo "$1 is not here! Perhaps it has been accidentally deleted?" >&2
+	echo "${TOKENID} is not here! Perhaps it has been accidentally deleted?" >&2
 	exit 2
     ;;
     token5)
@@ -84,10 +90,9 @@ case "$1" in
 	echo $HDATA | grep "not here" 2> /dev/null && exit 3
     ;;
     *)
-	echo "Invalid argument: $1" >&2
-	usage
-	exit 1
+	DATA=$@
+	TOKENID=
 	;;
 esac
 
-token_format "${1#token}" "$(token_generator ${1#token} ${HDATA} ${DATA})" ${DATA}
+token_format "${TOKENID#token}" "$(token_generator ${TOKENID#token} ${HDATA} ${DATA})" ${DATA}