From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Tue, 17 Feb 2009 04:45:28 +0000 (-0500)
Subject: add some minimal checks to import_key that the default hostname is legitimate.
X-Git-Tag: monkeysphere_0.23~86
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=f109b94f07ff55cf99976dc3cfe23b54b3797ad8

add some minimal checks to import_key that the default hostname is legitimate.
---

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 74dc0b3..ac31133 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -14,9 +14,27 @@
 import_key() {
 
 local hostName
+local domain
 local userID
 
-hostName=${1:-$(hostname -f)}
+hostName="$1"
+
+# use the default hostname if not specified
+if [ -z "$hostName" ] ; then
+    hostName=$(hostname -f)
+    # test that the domain is not obviously illegitimate
+    domain=${foo##*.}
+    case $domain in
+	'local'|'localdomain')
+	    failure "Host domain '$domain' is not legitimate.  Aborting key import."
+	    ;;
+    esac
+    # test that there are at least two parts
+    if (( $(echo "$hostName" | tr . ' ' | wc -w) < 2 )) ; then
+	failure "Host name '$hostName' is not legitimate.  Aborting key import."
+    fi
+fi
+
 userID="ssh://${hostName}"
 
 # create host home