o Package metadata versioning was all wrong. Now it's fixed.

[gssapi-openssh.git] / setup / setup-openssh.pl

diff --git a/setup/setup-openssh.pl b/setup/setup-openssh.pl
index f676176664f9618560368f2983d0e7de9cff06cb..42446a05ca849e07d8075476762866c038e3a01e 100644 (file)
--- a/setup/setup-openssh.pl
+++ b/setup/setup-openssh.pl
@@ -29,6 +29,18 @@ if (!defined($gpath))
     die "GLOBUS_LOCATION needs to be set before running this script"
 }
 
+#
+# modify the ld library path for when we call ssh executables
+#
+
+$oldldpath = $ENV{LD_LIBRARY_PATH};
+$newldpath = "$gpath/lib";
+if (length($oldldpath) > 0)
+{
+    $newldpath .= ":$oldldpath";
+}
+$ENV{LD_LIBRARY_PATH} = "$newldpath";
+
 #
 # i'm including this because other perl scripts in the gpt setup directories
 # do so
@@ -64,36 +76,27 @@ my $keyfiles = {
                  "rsa1" => "ssh_host_key",
                };
 
-#
-# Check that we are running as root
-#
-
-$uid = $>;
-
-if ($uid != 0)
-{
-    print "--> NOTE: You must be root to run this script! <--\n";
-    exit 0;
-}
-
 sub copyKeyFiles
 {
     my($copylist) = @_;
     my($regex, $basename);
 
-    print "Copying ssh host keys...\n";
-
-    for my $f (@$copylist)
+    if (@$copylist)
     {
-        $f =~ s:/+:/:g;
+        print "Copying ssh host keys...\n";
 
-        if (length($f) > 0)
+        for my $f (@$copylist)
         {
-            $keyfile = "$f";
-            $pubkeyfile = "$f.pub";
+            $f =~ s:/+:/:g;
+
+            if (length($f) > 0)
+            {
+                $keyfile = "$f";
+                $pubkeyfile = "$f.pub";
 
-            action("cp $localsshdir/$keyfile $sysconfdir/$keyfile");
-            action("cp $localsshdir/$pubkeyfile $sysconfdir/$pubkeyfile");
+                action("cp $localsshdir/$keyfile $sysconfdir/$keyfile");
+                action("cp $localsshdir/$pubkeyfile $sysconfdir/$pubkeyfile");
+            }
         }
     }
 }
@@ -112,40 +115,79 @@ sub isReadable
     }
 }
 
+sub isPresent
+{
+    my($file) = @_;
+
+    if ( -e $file )
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
 sub determineKeys
 {
     my($keyhash, $keylist);
     my($count);
 
+    #
+    # initialize our variables
+    #
+
     $count = 0;
 
     $keyhash = {};
     $keyhash->{gen} = [];   # a list of keytypes to generate
     $keyhash->{copy} = [];  # a list of files to copy from the 
+
     $genlist = $keyhash->{gen};
     $copylist = $keyhash->{copy};
 
+    #
+    # loop over our keytypes and determine what we need to do for each of them
+    #
+
     for my $keytype (keys %$keyfiles)
     {
         $basekeyfile = $keyfiles->{$keytype};
-        $keyfile = "$localsshdir/$basekeyfile";
-        $pubkeyfile = "$keyfile.pub";
 
-        if ( !isReadable($keyfile) || !isReadable($pubkeyfile) )
+        #
+        # if the key's are already present, we don't need to bother with this rigamarole
+        #
+
+        $gkeyfile = "$sysconfdir/$basekeyfile";
+        $gpubkeyfile = "$sysconfdir/$basekeyfile.pub";
+
+        if ( isPresent($gkeyfile) && isPresent($gpubkeyfile) )
         {
-            push(@$genlist, $keytype);
-            $count++;
+            next;
         }
-    }
 
-    for my $keytype (keys %$keyfiles)
-    {
-        if ( !grep(/^$keytype$/, @$genlist) )
+        #
+        # if we can find a copy of the keys in /etc/ssh, we'll copy them to the user's
+        # globus location
+        #
+
+        $mainkeyfile = "$localsshdir/$basekeyfile";
+        $mainpubkeyfile = "$localsshdir/$basekeyfile.pub";
+
+        if ( isReadable($mainkeyfile) && isReadable($mainpubkeyfile) )
         {
-            $keyfile = $keyfiles->{$keytype};
-            push(@$copylist, $keyfile);
+            push(@$copylist, $basekeyfile);
             $count++;
+            next;
         }
+
+        #
+        # otherwise, we need to generate the key
+        #
+
+        push(@$genlist, $keytype);
+        $count++;
     }
 
     if ($count > 0)
@@ -164,14 +206,17 @@ sub runKeyGen
 {
     my($gen_keys) = @_;
 
-    print "Generating ssh host keys...\n";
-
-    for my $k (@$gen_keys)
+    if (@$gen_keys)
     {
-        $keyfile = $keyfiles->{$k};
+        print "Generating ssh host keys...\n";
 
-        # if $sysconfdir/$keyfile doesn't exist..
-        action("$bindir/ssh-keygen -t $k -f $sysconfdir/$keyfile -N \"\"");
+        for my $k (@$gen_keys)
+        {
+            $keyfile = $keyfiles->{$k};
+
+            # if $sysconfdir/$keyfile doesn't exist..
+            action("$bindir/ssh-keygen -t $k -f $sysconfdir/$keyfile -N \"\"");
+        }
     }
 
     return 0;
@@ -214,7 +259,11 @@ sub fixpaths
 
     while (<IN>)
     {
-        if ( /Subsystem\s+sftp\s+\S+/ )
+        #
+        # sorry for the whacky regex, but i need to verify a whole line
+        #
+
+        if ( /^\s*Subsystem\s+sftp\s+\S+\s*$/ )
         {
             $_ = "Subsystem\tsftp\t$gpath/libexec/sftp-server\n";
             $_ =~ s:/+:/:g;
@@ -329,7 +378,6 @@ print "them for you.\n";
 print "\n";
 
 $response = query_boolean("Do you wish to continue with the setup package?","y");
-
 if ($response eq "n")
 {
     print "\n";
@@ -338,6 +386,8 @@ if ($response eq "n")
     exit 0;
 }
 
+print "\n";
+
 $keyhash = determineKeys();
 runKeyGen($keyhash->{gen});
 copyKeyFiles($keyhash->{copy});
@@ -347,8 +397,6 @@ my $metadata = new Grid::GPT::Setup(package_name => "gsi_openssh_setup");
 
 $metadata->finish();
 
-print "---------------------------------------------------------------------\n";
-print "$myname: Finished configuring package 'gsi_openssh'.\n";
 print "\n";
 print "Additional Notes:\n";
 print "\n";
@@ -367,6 +415,7 @@ print "    \t\$ LD_LIBRARY_PATH=\"$gpath/lib:\$LD_LIBRARY_PATH\"; \\\n";
 print "    \t     export LD_LIBRARY_PATH\n";
 print "\n";
 print "---------------------------------------------------------------------\n";
+print "$myname: Finished configuring package 'gsi_openssh'.\n";
 
 #
 # Just need a minimal action() subroutine for now..
@@ -378,7 +427,7 @@ sub action
 
     printf "$command\n";
 
-    my $result = system("$command 2>&1");
+    my $result = system("LD_LIBRARY_PATH=\"$gpath/lib:\$LD_LIBRARY_PATH\"; $command 2>&1");
 
     if (($result or $?) and $command !~ m!patch!)
     {