From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 14 Mar 2017 13:14:08 +0000 (-0300)
Subject: Add checks into ssh-privsend and ssh-authorized-send
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=123a756c8ea7cd103f28d8bf0751966a6ad19892;p=utils-ssh.git

Add checks into ssh-privsend and ssh-authorized-send
---

diff --git a/ssh-authorized-send b/ssh-authorized-send
index c743812..ac687ff 100755
--- a/ssh-authorized-send
+++ b/ssh-authorized-send
@@ -3,9 +3,23 @@
 # Send both public and private keys to a server.
 #
 
+# Parameters
+BASENAME="`basename $0`"
 KEY="$1"
 SERVER="$2"
 DESTKEY="~/.ssh/`basename $KEY`"
 
+# Checks
+if [ -z "$KEY" ]; then
+  echo "usage: $BASENAME <public-key-file>"
+  exit 1
+elif [ ! -e "$KEY" ]; then
+  echo "$BASENAME: file not found: $KEY"
+  exit 1
+elif grep -q -i private $KEY; then
+  echo "$BASENAME: please do not send a private key!"
+  exit 1
+fi
+
 # Put on authorized_keys
 cat $KEY | ssh $SERVER "mkdir -p ~/.ssh && chmod 700 ~/.ssh && touch ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys && cat >> ~/.ssh/authorized_keys"
diff --git a/ssh-privsend b/ssh-privsend
index 8767f57..3770898 100755
--- a/ssh-privsend
+++ b/ssh-privsend
@@ -3,10 +3,24 @@
 # Send both public and private keys to a server.
 #
 
+# Parameters
+BASENAME="`basename $0`"
 KEY="$1"
 SERVER="$2"
 DESTKEY="~/.ssh/`basename $KEY`"
 
+# Checks
+if [ -z "$KEY" ]; then
+  echo "usage: $BASENAME <private-key-file>"
+  exit 1
+elif [ ! -e "$KEY" ]; then
+  echo "$BASENAME: file not found: $KEY"
+  exit 1
+elif [ ! -e "$KEY.pub" ]; then
+  echo "$BASENAME: file not found: $KEY.pub"
+  exit 1
+fi
+
 # Put on authorized_keys
 #ssh-authorized-send $KEY.pub