Changeset 22bb7f84b63ffb80263525b3b82d020a6c34f574 for fedkit

Timestamp:

11/11/07 17:05:10 (5 years ago)

Author:

Ted Faber <faber@…>

Children:

906c76398e933601fe2e59e503084b2b645df5db

Parents:

e5fee75fd84b388603a8daf58ffd7eff8539c7aa

git-committer:

Ted Faber <faber@isi.edu> / 2007-11-12T01:05:10Z+0000

Message:

Auto generate the ssh keys used to coordinate gateways.

Location:

fedkit

Files:

• splitter.conf.example (modified) (2 diffs)
• splitter.pl (modified) (5 diffs)

fedkit/splitter.conf.example

@@ -7 +7 @@
 ScriptDir: /users/faber/testbed/federation
 
-# These will go away, but for now should be password-free ssh keys.  Format is
-# unimportant (dsa vs. rsa)
-GatewayPubkey: /users/faber/fed_dsa.pub
-GatewaySecretKey: /users/faber/fed_dsa
+# These will be honored if used, but automatically generating the keys by
+# leaving these commented is probably better, but for now should be
+# password-free ssh keys.  Format is unimportant (dsa vs. rsa)
+# GatewayPubkey: /users/faber/fed_dsa.pub
+# GatewaySecretKey: /users/faber/fed_dsa
+
+# Type of key to auto generate.  RSA and DSA are valid choices, leaving it
+# unspecified gives you RSA keys (as long as GatewayPubKey and GatewaySecretKey
+# are not specified.
+
+GatewayKeyType: rsa
 
 # These are the SMB share to export and the user to export them as.  They
@@ -18 +25 @@
 SMBShare: USERS
 SMBUser: jhickey
+
+
+# The number of experiment links or lans that can be multiplexed over one
+# gateway pair.
+MuxLimit: 2
+
+

fedkit/splitter.pl

@@ -26 +26 @@
 my($gw_secretkey, $gw_secretkey_base);# Connector secret key (full path & 
                                 # basename)
+my($keytype);                   # Type (DSA or RSA) of generated gateway keys
 my $tcl_splitter;               # tcl program to split experiments
                                 # (changed during devel)
@@ -139 +140 @@
 }
 
+# Generate SSH keys for use by the gateways.  The parameters are the type and
+# the filename for the private key.  The pubkey will be stored in a filename
+# with the same name as the private key but with .pub appended.  Type can be
+# dsa or rsa.
+
+sub generate_ssh_keys {
+    my($type, $dest) = @_;
+
+    $type =~ tr/A-Z/a-z/;
+    return 0 if $type !~ /(rsa|dsa)/;
+    system("/usr/bin/ssh-keygen -t $type -N \"\" -f $dest");
+    return $@ ? 0 : 1;
+}
 
 # use scp to transfer a file, reporting true if successful and false otherwise.
@@ -453 +467 @@
     die "Must give an SMB user\n";
 
-# For now specify these.  We may want to generate them later.
-$gw_pubkey = $opts{'gatewaypubkey'};
-($gw_pubkey_base = $gw_pubkey) =~ s#.*/##;
-$gw_secretkey = $opts{'gatewaysecretkey'};
-($gw_secretkey_base = $gw_secretkey) =~ s#.*/##;
-
 # tcl program to split experiments (changed during devel)
 $tcl_splitter = $opts{'tclparse'} || "/usr/testbed/lib/ns2ir/parse.tcl";
@@ -472 +480 @@
     mkdir("$tmpdir") || die "Can't create $tmpdir: $!";
 }
+
+# If the keys are given, use them.  Otherwise create a set under $tmpdir
+
+if ( $opts{'gatewatpubkey'} && $opts{'gatewaysecretkey'}) {
+    $gw_pubkey = $opts{'gatewaypubkey'};
+    $gw_secretkey = $opts{'gatewaysecretkey'};
+}
+else {
+    $keytype = $opts{'gatewaykeytype'} || "rsa";
+    mkdir("$tmpdir/keys") || die "Can't create temoprary key dir: $!\n";
+    $gw_pubkey = "$tmpdir/keys/fed.$keytype.pub";
+    $gw_secretkey = "$tmpdir/keys/fed.$keytype";
+    print "Generating $keytype keys\n" if $verbose;
+    generate_ssh_keys($keytype, $gw_secretkey) || 
+        die "Cannot generate kets:$@\n";
+}
+# Generate the basenames
+($gw_pubkey_base = $gw_pubkey) =~ s#.*/##;
+($gw_secretkey_base = $gw_secretkey) =~ s#.*/##;
+
+
 
 # Validate scripts directory
@@ -916 +945 @@
 
 The names of the files containing secret and public keys to use in setting up
-tunnels between testbeds.  These will eventually be automatically generated.
+tunnels between testbeds.  If given they are used, otherwise keys are generated.
+
+=item GatewayKeyType
+
+This controls the kind of SSH keys generated to configure the geatways.  If
+given this must be B<dsa> or B<rsa>, and it defaults to B<rsa>.  The parameter
+is csase insensitive.
 
 =item TmpDir