Changeset 53

Timestamp:

Jul 24, 2006, 11:37:17 PM (18 years ago)

Author:

rainer

Message:

samhainadmin.pl: check for gpg-agent running if use-agent is set

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• scripts/samhainadmin.pl.in (modified) (3 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 2.2.3:
+        * fix samhainadmin.pl: check for gpg-agent running if use-agent is set
+          (ticket #28 by anonymous)
         * fix stealth mode (regression in parser), problem reported by 
           Joschi Kuphal

trunk/scripts/samhainadmin.pl.in

@@ -28 +28 @@
 use IO::Handle;
 use Fcntl qw(:DEFAULT :flock);
+use Tie::File;
 
 # Do I/O to the data file in binary mode (so it 
@@ -55 +56 @@
 $gpg = "gpg" if ($gpg eq "");
 
+sub check_gpg_agent() {
+    my  $gpgconf = "$ENV{'HOME'}/.gnupg/gpg.conf";
+
+    if (!-f "$gpgconf") {
+        $gpgconf = "$ENV{'HOME'}/.gnupg/options";
+    }
+
+    if (-f $gpgconf) {
+
+        my @array = ();
+        tie @array, 'Tie::File', $gpgconf or die "Cannot tie ${gpgconf}: $!";
+        my @grep = grep(/^\s*use-agent/, @array);
+        
+        # print "matches = $#grep\n";
+        
+        if ($#grep >= 0)
+        {
+            if (exists $ENV{'GPG_AGENT_INFO'})
+            {
+                my $socke = $ENV{'GPG_AGENT_INFO'};
+                $socke =~ s/:.*//;
+                
+                # print "socke = $socke\n";
+                
+                if (! -S $socke)
+                {
+                    print "--------------------------------------------------\n";
+                    print "\n";
+                    print " GPG is set to use gpg-agent, but GPG agent is";
+                    print " not running, though GPG_AGENT_INFO is defined.\n\n";
+                    print " Please restart gpg-agent, or remove the use-agent\n";
+                    print " option from ${gpgconf} and unset GPG_AGENT_INFO\n\n";
+                    print "--------------------------------------------------\n";
+                    print "\n";
+                    exit 1;
+                }
+            }
+            else
+            {
+                print "--------------------------------------------------\n";
+                print "\n";
+                print " GPG is set to use gpg-agent, but ";
+                print " GPG_AGENT_INFO is not defined.\n\n";
+                print " Please start gpg-agent, or remove the use-agent\n";
+                print " option from ${gpgconf}\n\n";
+                print "--------------------------------------------------\n";
+                print "\n";
+                exit 1;
+            }
+        }
+        untie @array;
+    }
+}
+
+
 sub usage() {
     print "Usage:\n";
@@ -391 +447 @@
 
     check_gpg_uid();
+    check_gpg_agent();
 
     if (!defined($file2)) {