rapid-tunneling:

 - Added GUI password protection.
 - Backed out GPG.


git-svn-id: svn+ssh://xorcom/home/svn/debs/components/rapid-tunneling@6682 283159da-0705-0410-b60c-f2062b4bb6ad

1 files changed, 1 insertions, 28 deletions

diff --git a/rtadm b/rtadm
index 702e1ee..75a736e 100755
--- a/rtadm
+++ b/rtadm
@@ -3,11 +3,6 @@
 USERNAME=support
 FROM_REMOTE_COMMAND=/usr/share/rapid-tunneling/bin/rt-from-remote
 
-# Until we see how this works out.
-# Maybe we need to add a separate "sign" functionality to sign a support
-# request tarball elsewhere?
-REQUIRE_PGP=yes
-
 CFG_FILE=/etc/rapid-tunneling/rtadm 
 
 if [ -r $CFG_FILE ]; then . $CFG_FILE; fi
@@ -24,18 +19,6 @@ create()
 	TUNNEL_PORT=$1
 	COMMENT=$2
 
-	if [ "$REQUIRE_PGP" = 'yes' ] && 
-		[ `gpg --list-secret-keys 2>/dev/null | wc -l` = '0' ]
-	then
-		echo "Support user has no (secret) gpg key and can't sign the"
-		echo "support requests. Either create one:"
-		echo ""
-		echo "  rtadm keygen"
-		echo ""
-		echo "or copy over your secret gpg key."
-		echo "$0: Aborting."
-		exit 7
-	fi
 	if grep -q "ra-[0-9]\+-$COMMENT-[0-9]\+" $HOME/.ssh/authorized_keys 2>/dev/null; then
 		echo "Connection name '$COMMENT' already exists. Aborting." 1>&2
 		exit 1
@@ -53,11 +36,7 @@ create()
 	echo $PORT > ~/tmp/port
 	echo $USERNAME > ~/tmp/user
 	echo $TUNNEL_PORT > ~/tmp/tunnelport
-	# Sign all the data sent, except the signature itself:
-	files_in_tar="host key port tunnelport user" # alphbetical
-	(cd ~/tmp; grep . $files_in_tar) >~/tmp/all_data
-	gpg --output ~/tmp/sig.asc --armour --detach-sign ~/tmp/all_data
-	tar -czf remote-access-$COMMENT.tar.gz -C ~/tmp $files_in_tar sig.asc --owner root --group root
+	tar -czf remote-access-$COMMENT.tar.gz -C ~/tmp host key port tunnelport user --owner root --group root
 	mkdir -m 700 -p ~/.ssh
 	umask 022
 	cat ~/tmp/key.pub >> ~/.ssh/authorized_keys
@@ -142,8 +121,6 @@ usage()
 	echo "    # disconnect connection"
 	echo "  delete <connection-name>"
 	echo "    # disconnect, disable and delete any trace of the connection"
-	echo "  genkey"
-	echo "    # Generate an OpenPGP key for signing tarballs (interactive)"
 	exit 1
 }
 
@@ -184,10 +161,6 @@ case "$1" in
 		delete "$1"
 		disconnect "$1"
 		;;
-	keygen) 
-		shift
-		gpg "$@" --gen-key
-		;;
 	*)
 		usage
 		;;