X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=utils%2Fnewclient.sh;h=9e1cb3578faaf71f131245cf2c128b2df3d07c06;hb=b71b594e74ccbbfc987a787c45158598c2f807c7;hp=e741130957a6f30d6c8956988bcd3c3b58e2f940;hpb=0c6f6e443c37addce07cb3d1cd337c62a234e90d;p=govpn.git

diff --git a/utils/newclient.sh b/utils/newclient.sh
index e741130..9e1cb35 100755
--- a/utils/newclient.sh
+++ b/utils/newclient.sh
@@ -1,16 +1,10 @@
 #!/bin/sh -e
 
-getrand()
-{
-    local size=$1
-    dd if=/dev/urandom bs=$size count=1 2>/dev/null | hexdump -ve '"%02x"'
-}
-
 [ -n "$1" ] || {
     cat <<EOF
 Example script for creating new user peer for GoVPN.
-It just creates directory with random peer ID, dummy verifier,
-dummy up.sh executable script and saves username in it.
+It generates random client's identity, ask for passphrase, generates
+verifier and shows you example JSON entry for server configuration.
 
 Usage: $0 <username>
 EOF
@@ -18,11 +12,41 @@ EOF
 }
 
 username=$1
-peerid=$(getrand 16)
+peerid=$(dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -ve '"%02x"')
+[ $(echo -n $peerid | wc -c) = 32 ] || peerid=0"$peerid"
 umask 077
-mkdir -p peers/$peerid
-echo '0000000000000000000000000000000000000000000000000000000000000000' > peers/$peerid/verifier
-echo $username > peers/$peerid/name
-echo '#!/bin/sh' > peers/$peerid/up.sh
-chmod 700 peers/$peerid/up.sh
-echo Place verifier to peers/$peerid/verifier
+passphrase=$(mktemp)
+$(dirname $0)/storekey.sh $passphrase
+verifier=$(govpn-verifier -id $peerid -key $passphrase)
+rm -f $passphrase
+echo
+
+cat <<EOF
+Your id is: $peerid
+
+Place the following JSON configuration entry on the server's side:
+
+    "$peerid": {
+        "name": "$username",
+        "up": "/path/to/up.sh",
+        "verifier": "$verifier"
+    }
+
+Verifier was generated with:
+
+    $(dirname $0)/storekey.sh /tmp/passphrase
+    govpn-verifier -id $peerid -key /tmp/passphrase
+
+Create up.sh script that will output on the first line TAP interface
+name that must be used for the peer. For example:
+
+    % umask 077
+    % ed /path/to/up.sh
+    a
+    #!/bin/sh
+    echo tap0
+    .
+    wq
+    20
+    % chmod +x /path/to/up.sh
+EOF