mention cabability and validity in verbose output when not capable/valid

[monkeysphere-validation-agent.git] / gpgkeys_hkpms

diff --git a/gpgkeys_hkpms b/gpgkeys_hkpms
index 8022848fb2aca27c6b57a4ee1a483d34c4aee25d..75ce01bcb293cb5a66dff56f0470e0084ab8ad8c 100755 (executable)
--- a/gpgkeys_hkpms
+++ b/gpgkeys_hkpms
@@ -19,6 +19,8 @@ use warnings;
   use POSIX;
   use Crypt::Monkeysphere::MSVA::Logger;
   use Crypt::Monkeysphere::MSVA::Client;
+  use Regexp::Common qw /net/;
+  use Module::Load::Conditional;
 
   sub parse_input {
     my $self = shift;
@@ -45,8 +47,20 @@ use warnings;
               $self->{actually_check} = 0;
             } elsif ($opt eq 'check-cert') {
               $self->{actually_check} = 1;
+            } elsif ($opt =~ /^http-proxy=(.*)/) {
+              my $hp = $1;
+              if ($hp =~ /^(socks|http|https):\/\/($RE{net}{domain}|$RE{net}{IPv4}):([[:digit:]]+)\/?$/) {
+                if ('socks' eq $1) {
+                  if ( ! Module::Load::Conditional::check_install(module => 'LWP::Protocol::socks')) {
+                    $self->{logger}->log('error', "Requesting a socks proxy for hkpms, but LWP::Protocol::socks is not installed.\nThis will likely fail.\n");
+                  }
+                }
+                $self->{proxy} = sprintf('%s://%s:%s', $1, $2, $3);
+              } else {
+                $self->{logger}->log('error', "Failed to make sense of this http-proxy address: '%s'; ignoring.\n", $hp);
+              }
             } else {
-              $self->{logger}->log('error', "Received '%s' as an option, but gpgkeys_hkpms does not implement it. Ignoring...\n");
+              $self->{logger}->log('error', "Received '%s' as an option, but gpgkeys_hkpms does not implement it. Ignoring...\n", $opt);
             }
             # FIXME: consider other keyserver-options from gpg(1).
             # in particular, the following might be interesting:
@@ -54,7 +68,6 @@ use warnings;
             # include-revoked
             # include-disabled
             # ca-cert-file
-            # http-proxy
           }
         }
       } else {
@@ -79,6 +92,7 @@ use warnings;
         ($status, $ret) = $self->{client}->query_agent('https', $self->{config}->{host}, 'server', 'x509pem', $certpem, 'never');
       } else {
         use Crypt::Monkeysphere::MSVA;
+        $self->{logger}->log('verbose', "Could not find a running agent (MONKEYSPHERE_VALIDATION_AGENT_SOCKET env var).\nFalling back to in-process certificate checks.\n");
         # If there is no running agent, we might want to be able to fall
         # back here.
 
@@ -140,7 +154,15 @@ use warnings;
                                       ca_file => undef,
                                      );
 
-    my $ua = LWP::UserAgent->new();
+    my $ua = LWP::UserAgent::->new();
+
+    if (exists($self->{proxy})) {
+      $self->{logger}->log('verbose', "Using http-proxy: %s\n", $self->{proxy});
+      $ua->proxy([qw(http https)] => $self->{proxy});
+    } else {
+      # if no proxy was explicitly set, use the environment:
+      $ua->env_proxy();
+    }
 
     printf("VERSION 1\nPROGRAM %s gpgkeys_hkpms msva-perl/%s\n",
            $self->{config}->{program},  # this is kind of cheating :/
@@ -150,7 +172,7 @@ use warnings;
     $self->{logger}->log('debug', "command: %s\n", $self->{config}->{command});
     if (lc($self->{config}->{command}) eq 'search') {
       # for COMMAND = SEARCH, we want op=index, and we want to rejoin all args with spaces.
-      my $uri = new URI(sprintf('https://%s/pks/lookup', $self->{config}->{host}));
+      my $uri = URI::->new(sprintf('https://%s/pks/lookup', $self->{config}->{host}));
       my $arg = join(' ', @{$self->{args}});
       $uri->query_form(op => 'index',
                        options => 'mr',
@@ -158,6 +180,7 @@ use warnings;
                       );
       $arg =~ s/\n/ /g ; # swap out newlines for spaces
       printf("\n%s %s BEGIN\n", $self->{config}->{command}, $arg);
+      $self->{logger}->log('debug', "URI: %s\n", $uri);
       my $resp = $ua->get($uri);
       if ($resp->is_success) {
         print($resp->decoded_content);
@@ -168,7 +191,7 @@ use warnings;
       printf("\n%s %s END\n", $self->{config}->{command}, $arg);
     } elsif (lc($self->{config}->{command}) eq 'get') {
       # for COMMAND = GET, we want op=get, and we want to issue each query separately.
-      my $uri = new URI(sprintf('https://%s/pks/lookup', $self->{config}->{host}));
+      my $uri = URI::->new(sprintf('https://%s/pks/lookup', $self->{config}->{host}));
       foreach my $arg (@{$self->{args}}) {
         printf("\n%s %s BEGIN\n", $self->{config}->{command}, $arg);
         $uri->query_form(op => 'get',
@@ -198,7 +221,7 @@ use warnings;
           if ($arg eq sprintf('KEY %s END', $keyid)) {
             $self->{logger}->log('debug', "Found KEY END line with %d lines of data elapsed\n", scalar(@keydata));
             # for sending keys, we want to POST to /pks/add, with a keytext variable.
-            my $uri = new URI(sprintf('https://%s/pks/add', $self->{config}->{host}));
+            my $uri = URI::->new(sprintf('https://%s/pks/add', $self->{config}->{host}));
             my $resp = $ua->post($uri, {keytext => join("\n", @keydata)});
             if ($resp->is_success) {
               printf("\n%s", $resp->decoded_content);
@@ -232,14 +255,14 @@ use warnings;
     my $default_log_level = 'error';
     my $client;
     if (exists($ENV{MONKEYSPHERE_VALIDATION_AGENT_SOCKET})) {
-      $client = Crypt::Monkeysphere::MSVA::Client->new(
-                                                       socket => $ENV{MONKEYSPHERE_VALIDATION_AGENT_SOCKET},
-                                                       log_level => $default_log_level,
-                                                      );
+      $client = Crypt::Monkeysphere::MSVA::Client::->new(
+                                                         socket => $ENV{MONKEYSPHERE_VALIDATION_AGENT_SOCKET},
+                                                         log_level => $default_log_level,
+                                                        );
     }
     my $self = { config => { },
                  args => [ ],
-                 logger => (defined($client) ? $client->{logger} : Crypt::Monkeysphere::MSVA::Logger->new($default_log_level)),
+                 logger => (defined($client) ? $client->{logger} : Crypt::Monkeysphere::MSVA::Logger::->new($default_log_level)),
                  cache => { },
                  client => $client,
                  actually_check => 1,
@@ -252,7 +275,7 @@ use warnings;
 }
 
 
-my $hkpms = Crypt::Monkeysphere::MSVA::HKPMS->new();
+my $hkpms = Crypt::Monkeysphere::MSVA::HKPMS::->new();
 
 my $input = # load gpg instructions from stdin:
   do {