Merge pull request #38 from fabrixxm/patch-1

tokssh: shared secret support,fix no user cmd line

1 files changed, 10 insertions, 2 deletions

diff --git a/scripts/tokssh b/scripts/tokssh
index 9d219bb..0017221 100755
--- a/scripts/tokssh
+++ b/scripts/tokssh
@@ -6,6 +6,7 @@
 # tokssh user@5A40C3443ABD6E1DDEE682E83F84A4D556C24C22D2230DCC141A4723C123473C171A4D9C4054
 # tokssh 5A40C3443ABD6E1DDEE682E83F84A4D556C24C22D2230DCC141A4723C123473C171A4D9C4054
 # tokssh -p 2222 -o ForwardAgent=yes user@5A40C3443ABD6E1DDEE682E83F84A4D556C24C22D2230DCC141A4723C123473C171A4D9C4054
+# tokssh user@5A40C3443ABD6E1DDEE682E83F84A4D556C24C22D2230DCC141A4723C123473C171A4D9C4054 -s TuNToXSeCreT
 #
 
 array=( $@ )
@@ -13,6 +14,13 @@ len=${#array[@]}
 userhost=${array[$len-1]}
 args=${array[@]:0:$len-1}
 
+if [ "${array[$len-2]}" == "-s" ]
+then
+        secret="${array[@]:$len-2:$len-1}"
+        len=$[len-2]
+fi
+
+
 arruserhost=(${userhost//@/ })
 arruserhostlen=${#arruserhost[@]}
 
@@ -21,9 +29,9 @@ then
 # last argument is user@toxid
         user=${arruserhost[0]}
         toxid=${arruserhost[1]}
-        ssh -o ProxyCommand="tuntox -i $toxid -P 127.0.0.1:%p" $args $user@localhost
+        ssh -o ProxyCommand="tuntox -i $toxid -P 127.0.0.1:%p $secret" $args $user@localhost
 else
 # last argument is just toxid
-        ssh -o ProxyCommand="tuntox -i $toxid -P 127.0.0.1:%p" $args localhost
+        ssh -o ProxyCommand="tuntox -i $userhost -P 127.0.0.1:%p $secret" $args localhost
 fi