use strict;
use warnings;
+ use vars qw($VERSION);
use parent qw(HTTP::Server::Simple::CGI);
+
+ use Crypt::Monkeysphere::Validator;
+
require Crypt::X509;
use Regexp::Common qw /net/;
use Convert::ASN1;
use File::HomeDir;
use Config::General;
use Crypt::Monkeysphere::MSVA::MarginalUI;
- use Crypt::Monkeysphere::MSVA::Logger;
+ use Crypt::Monkeysphere::Logger;
use Crypt::Monkeysphere::MSVA::Monitor;
use JSON;
# we need the version of GnuPG::Interface that knows about pubkey_data, etc:
use GnuPG::Interface 0.42.02;
- my $VERSION = '0.6';
+ $VERSION = '0.9~pre';
- my $gnupg = GnuPG::Interface->new();
+ my $gnupg = GnuPG::Interface::->new();
$gnupg->options->quiet(1);
$gnupg->options->batch(1);
},
);
- my $default_keyserver = 'hkp://pool.sks-keyservers.net';
my $default_keyserver_policy = 'unlessvalid';
- my $logger = Crypt::Monkeysphere::MSVA::Logger->new($ENV{MSVA_LOG_LEVEL});
+ my $logger = Crypt::Monkeysphere::Logger->new($ENV{MSVA_LOG_LEVEL});
sub logger {
return $logger;
}
- my $rsa_decoder = Convert::ASN1->new;
+ my $rsa_decoder = Convert::ASN1::->new();
$rsa_decoder->prepare(q<
SEQUENCE {
};
}
- sub opensshpubkey2key {
- my $data = shift;
- # FIXME: do we care that the label matches the type of key?
- my ($label, $prop) = split(/ +/, $data);
-
- my $out = parse_rfc4716body($prop);
-
- return $out;
- }
-
- sub rfc47162key {
- my $data = shift;
-
- my @goodlines;
- my $continuation = '';
- my $state = 'outside';
- foreach my $line (split(/\n/, $data)) {
- last if ($state eq 'body' && $line eq '---- END SSH2 PUBLIC KEY ----');
- if ($state eq 'outside' && $line eq '---- BEGIN SSH2 PUBLIC KEY ----') {
- $state = 'header';
- next;
- }
- if ($state eq 'header') {
- $line = $continuation.$line;
- $continuation = '';
- if ($line =~ /^(.*)\\$/) {
- $continuation = $1;
- next;
- }
- if (! ($line =~ /:/)) {
- $state = 'body';
- }
- }
- push(@goodlines, $line) if ($state eq 'body');
- }
-
- msvalog('debug', "Found %d lines of RFC4716 body:\n%s\n",
- scalar(@goodlines),
- join("\n", @goodlines));
- my $out = parse_rfc4716body(join('', @goodlines));
-
- return $out;
- }
-
- sub parse_rfc4716body {
- my $data = shift;
- $data = decode_base64($data) or return undef;
-
- msvalog('debug', "key properties: %s\n", unpack('H*', $data));
- my $out = [ ];
- while (length($data) > 4) {
- my $size = unpack('N', substr($data, 0, 4));
- msvalog('debug', "size: 0x%08x\n", $size);
- return undef if (length($data) < $size + 4);
- push(@{$out}, substr($data, 4, $size));
- $data = substr($data, 4 + $size);
- }
-
- if ($out->[0] ne "ssh-rsa") {
- return {error => 'Not an RSA key'};
- }
-
- if (scalar(@{$out}) != 3) {
- return {error => 'Does not contain the right number of bigints for RSA'};
- }
-
- return { exponent => Math::BigInt->from_hex('0x'.unpack('H*', $out->[1])),
- modulus => Math::BigInt->from_hex('0x'.unpack('H*', $out->[2])),
- } ;
- }
-
-
# return an arrayref of processes which we can detect that have the
# given socket open (the socket is specified with its inode)
sub getpidswithsocketinode {
my $sockid = shift;
+ if (! defined ($sockid)) {
+ msvalog('verbose', "No client socket ID to check. The MSVA is probably not running as a service.\n");
+ return [];
+ }
# this appears to be how Linux symlinks open sockets in /proc/*/fd,
# as of at least 2.6.26:
my $socktarget = sprintf('socket:[%d]', $sockid);
sub get_client_info {
my $socket = shift;
- my $sock = IO::Socket->new_from_fd($socket, 'r');
+ my $sock = IO::Socket::->new_from_fd($socket, 'r');
# check SO_PEERCRED -- if this was a TCP socket, Linux
# might not be able to support SO_PEERCRED (even on the loopback),
# though apparently some kernels (Solaris?) are able to.
msvalog('verbose', "Port: %04x\nAddr: %s\n", $port, $iaddrstring);
my $remmatch = lc(sprintf("%s:%04x", $iaddrstring, $port));
my $infofile = '/proc/net/'.$proto;
- my $f = new IO::File;
+ my $f = IO::File::->new();
if ( $f->open('< '.$infofile)) {
my @header = split(/ +/, <$f>);
my ($localaddrix, $uidix, $inodeix);
}
}
- sub keycomp {
- my $rsakey = shift;
- my $gpgkey = shift;
-
- if ($gpgkey->algo_num != 1) {
- msvalog('verbose', "Monkeysphere only does RSA keys. This key is algorithm #%d\n", $gpgkey->algo_num);
- } else {
- if ($rsakey->{exponent}->bcmp($gpgkey->pubkey_data->[1]) == 0 &&
- $rsakey->{modulus}->bcmp($gpgkey->pubkey_data->[0]) == 0) {
- return 1;
+ sub get_keyserver_policy {
+ if (exists $ENV{MSVA_KEYSERVER_POLICY} and $ENV{MSVA_KEYSERVER_POLICY} ne '') {
+ if ($ENV{MSVA_KEYSERVER_POLICY} =~ /^(always|never|unlessvalid)$/) {
+ return $1;
}
+ msvalog('error', "Not a valid MSVA_KEYSERVER_POLICY):\n %s\n", $ENV{MSVA_KEYSERVER_POLICY});
}
- return 0;
+ return $default_keyserver_policy;
}
- sub pem2der {
- my $pem = shift;
- my @lines = split(/\n/, $pem);
- my @goodlines = ();
- my $ready = 0;
- foreach my $line (@lines) {
- if ($line eq '-----END CERTIFICATE-----') {
- last;
- } elsif ($ready) {
- push @goodlines, $line;
- } elsif ($line eq '-----BEGIN CERTIFICATE-----') {
- $ready = 1;
+ sub get_keyserver {
+ # We should read from (first hit wins):
+ # the environment
+ if (exists $ENV{MSVA_KEYSERVER} and $ENV{MSVA_KEYSERVER} ne '') {
+ if ($ENV{MSVA_KEYSERVER} =~ /^(((hkps?|hkpms|finger|ldap):\/\/)?$RE{net}{domain})$/) {
+ return $1;
}
+ msvalog('error', "Not a valid keyserver (from MSVA_KEYSERVER):\n %s\n", $ENV{MSVA_KEYSERVER});
}
- msvalog('debug', "%d lines of base64:\n%s\n", $#goodlines + 1, join("\n", @goodlines));
- return decode_base64(join('', @goodlines));
+
+ # FIXME: some msva.conf or monkeysphere.conf file (system and user?)
+
+ # let the keyserver routines choose.
+ return undef;
+ }
+
+
+##################################################
+## PKC KEY EXTRACTION ############################
+
+ sub pkcextractkey {
+ my $data = shift;
+ my $key;
+
+ if (lc($data->{pkc}->{type}) eq 'x509der') {
+ $key = der2key(join('', map(chr, @{$data->{pkc}->{data}})));
+ } elsif (lc($data->{pkc}->{type}) eq 'x509pem') {
+ $key = der2key(pem2der($data->{pkc}->{data}));
+ } elsif (lc($data->{pkc}->{type}) eq 'opensshpubkey') {
+ $key = opensshpubkey2key($data->{pkc}->{data});
+ } elsif (lc($data->{pkc}->{type}) eq 'rfc4716') {
+ $key = rfc47162key($data->{pkc}->{data});
+ } else {
+ $key->{error} = sprintf("Don't know this public key carrier type: %s", $data->{pkc}->{type});
+ }
+
+ if (exists $key->{error}) {
+ return $key;
+ }
+
+ # make sure that the returned integers are Math::BigInts:
+ $key->{exponent} = Math::BigInt::->new($key->{exponent}) unless (ref($key->{exponent}));
+ $key->{modulus} = Math::BigInt::->new($key->{modulus}) unless (ref($key->{modulus}));
+ msvalog('debug', "pubkey info:\nmodulus: %s\nexponent: %s\n",
+ $key->{modulus}->as_hex(),
+ $key->{exponent}->as_hex(),
+ );
+
+ if ($key->{modulus}->copy()->blog(2) < 1000) {
+ $key->{error} = sprintf('Public key size is less than 1000 bits (was: %d bits)', $key->{modulus}->copy()->blog(2));
+ }
+
+ return $key;
}
sub der2key {
my $rawdata = shift;
- my $cert = Crypt::X509->new(cert => $rawdata);
+ my $cert = Crypt::X509::->new(cert => $rawdata);
my $key = {error => 'I do not know what happened here'};
return $key;
}
- sub get_keyserver_policy {
- if (exists $ENV{MSVA_KEYSERVER_POLICY} and $ENV{MSVA_KEYSERVER_POLICY} ne '') {
- if ($ENV{MSVA_KEYSERVER_POLICY} =~ /^(always|never|unlessvalid)$/) {
- return $1;
+ sub pem2der {
+ my $pem = shift;
+ my @lines = split(/\n/, $pem);
+ my @goodlines = ();
+ my $ready = 0;
+ foreach my $line (@lines) {
+ if ($line eq '-----END CERTIFICATE-----') {
+ last;
+ } elsif ($ready) {
+ push @goodlines, $line;
+ } elsif ($line eq '-----BEGIN CERTIFICATE-----') {
+ $ready = 1;
}
- msvalog('error', "Not a valid MSVA_KEYSERVER_POLICY):\n %s\n", $ENV{MSVA_KEYSERVER_POLICY});
}
- return $default_keyserver_policy;
+ msvalog('debug', "%d lines of base64:\n%s\n", $#goodlines + 1, join("\n", @goodlines));
+ return decode_base64(join('', @goodlines));
}
- sub get_keyserver {
- # We should read from (first hit wins):
- # the environment
- if (exists $ENV{MSVA_KEYSERVER} and $ENV{MSVA_KEYSERVER} ne '') {
- if ($ENV{MSVA_KEYSERVER} =~ /^(((hkps?|finger|ldap):\/\/)?$RE{net}{domain})$/) {
- return $1;
- }
- msvalog('error', "Not a valid keyserver (from MSVA_KEYSERVER):\n %s\n", $ENV{MSVA_KEYSERVER});
- }
+ sub opensshpubkey2key {
+ my $data = shift;
+ # FIXME: do we care that the label matches the type of key?
+ my ($label, $prop) = split(/ +/, $data);
- # FIXME: some msva.conf or monkeysphere.conf file (system and user?)
+ my $out = parse_rfc4716body($prop);
- # or else read from the relevant gnupg.conf:
- my $gpghome;
- if (exists $ENV{GNUPGHOME} and $ENV{GNUPGHOME} ne '') {
- $gpghome = untaint($ENV{GNUPGHOME});
- } else {
- $gpghome = File::Spec->catfile(File::HomeDir->my_home, '.gnupg');
- }
- my $gpgconf = File::Spec->catfile($gpghome, 'gpg.conf');
- if (-f $gpgconf) {
- if (-r $gpgconf) {
- my %gpgconfig = Config::General::ParseConfig($gpgconf);
- if ($gpgconfig{keyserver} =~ /^(((hkps?|finger|ldap):\/\/)?$RE{net}{domain})$/) {
- msvalog('debug', "Using keyserver %s from the GnuPG configuration file (%s)\n", $1, $gpgconf);
- return $1;
- } else {
- msvalog('error', "Not a valid keyserver (from gpg config %s):\n %s\n", $gpgconf, $gpgconfig{keyserver});
+ return $out;
+ }
+
+ sub rfc47162key {
+ my $data = shift;
+
+ my @goodlines;
+ my $continuation = '';
+ my $state = 'outside';
+ foreach my $line (split(/\n/, $data)) {
+ last if ($state eq 'body' && $line eq '---- END SSH2 PUBLIC KEY ----');
+ if ($state eq 'outside' && $line eq '---- BEGIN SSH2 PUBLIC KEY ----') {
+ $state = 'header';
+ next;
+ }
+ if ($state eq 'header') {
+ $line = $continuation.$line;
+ $continuation = '';
+ if ($line =~ /^(.*)\\$/) {
+ $continuation = $1;
+ next;
+ }
+ if (! ($line =~ /:/)) {
+ $state = 'body';
}
- } else {
- msvalog('error', "The GnuPG configuration file (%s) is not readable\n", $gpgconf);
}
- } else {
- msvalog('info', "Did not find GnuPG configuration file while looking for keyserver '%s'\n", $gpgconf);
+ push(@goodlines, $line) if ($state eq 'body');
}
- # the default_keyserver
- return $default_keyserver;
+ msvalog('debug', "Found %d lines of RFC4716 body:\n%s\n",
+ scalar(@goodlines),
+ join("\n", @goodlines));
+ my $out = parse_rfc4716body(join('', @goodlines));
+
+ return $out;
}
- sub fetch_uid_from_keyserver {
- my $uid = shift;
-
- my $cmd = IO::Handle->new();
- my $out = IO::Handle->new();
- my $nul = IO::File->new("< /dev/null");
-
- my $ks = get_keyserver();
- msvalog('debug', "start ks query to %s for UserID: %s\n", $ks, $uid);
- my $pid = $gnupg->wrap_call
- ( handles => GnuPG::Handles->new( command => $cmd, stdout => $out, stderr => $nul ),
- command_args => [ '='.$uid ],
- commands => [ '--keyserver',
- $ks,
- qw( --no-tty --with-colons --search ) ]
- );
- while (my $line = $out->getline()) {
- msvalog('debug', "from ks query: (%d) %s", $cmd->fileno, $line);
- if ($line =~ /^info:(\d+):(\d+)/ ) {
- $cmd->print(join(' ', ($1..$2))."\n");
- msvalog('debug', 'to ks query: '.join(' ', ($1..$2))."\n");
- last;
- }
+ sub parse_rfc4716body {
+ my $data = shift;
+
+ return undef
+ unless defined($data);
+ $data = decode_base64($data) or return undef;
+
+ msvalog('debug', "key properties: %s\n", unpack('H*', $data));
+ my $out = [ ];
+ while (length($data) > 4) {
+ my $size = unpack('N', substr($data, 0, 4));
+ msvalog('debug', "size: 0x%08x\n", $size);
+ return undef if (length($data) < $size + 4);
+ push(@{$out}, substr($data, 4, $size));
+ $data = substr($data, 4 + $size);
+ }
+
+ if ($out->[0] ne "ssh-rsa") {
+ return {error => 'Not an RSA key'};
+ }
+
+ if (scalar(@{$out}) != 3) {
+ return {error => 'Does not contain the right number of bigints for RSA'};
}
- # FIXME: can we do something to avoid hanging forever?
- waitpid($pid, 0);
- msvalog('debug', "ks query returns %d\n", POSIX::WEXITSTATUS($?));
+
+ return { exponent => Math::BigInt->from_hex('0x'.unpack('H*', $out->[1])),
+ modulus => Math::BigInt->from_hex('0x'.unpack('H*', $out->[2])),
+ } ;
}
+## PKC KEY EXTRACTION ############################
+##################################################
+
sub reviewcert {
my $data = shift;
my $clientinfo = shift;
message => 'Unknown failure',
};
+ # check that there actually is key data
+ if ($data->{pkc}->{data} eq '') {
+ $ret->{message} = sprintf("Key data empty.");
+ return $status,$ret;
+ }
+
# check context string
- if ($data->{context} =~ /^(https|ssh|smtp|ike|postgresql|imaps|imap|submission)$/) {
+ if ($data->{context} =~ /^(https|ssh|smtp|ike|postgresql|imaps|imap|submission|e-mail)$/) {
$data->{context} = $1;
} else {
msvalog('error', "invalid context: %s\n", $data->{context});
$data->{peer} = { name => $data->{peer} }
if (ref($data->{peer}) ne 'HASH');
- if ($data->{peer}->{name} =~ /^($RE{net}{domain})$/) {
- $data->{peer}->{name} = $1;
- } else {
- msvalog('error', "invalid peer name string: %s\n", $data->{peer}->{name});
- $ret->{message} = sprintf("Invalid peer name string: %s", $data->{peer}->{name});
- return $status,$ret;
- }
if (defined($data->{peer}->{type})) {
if ($data->{peer}->{type} =~ /^(client|server|peer)$/) {
$data->{peer}->{type} = $1;
}
}
- msvalog('verbose', "peer: %s\n", $data->{peer}->{name});
-
- # generate uid string
my $prefix = $data->{context}.'://';
- if (defined $data->{peer}->{type} &&
+ if ($data->{context} eq 'e-mail' ||
+ (defined $data->{peer}->{type} &&
$data->{peer}->{type} eq 'client' &&
# ike and smtp clients are effectively other servers, so we'll
# exclude them:
- $data->{context} !~ /^(ike|smtp)$/) {
+ $data->{context} !~ /^(ike|smtp)$/)) {
$prefix = '';
- }
- my $uid = $prefix.$data->{peer}->{name};
- msvalog('verbose', "user ID: %s\n", $uid);
-
- # check pkc type
- my $key;
- if (lc($data->{pkc}->{type}) eq 'x509der') {
- $key = der2key(join('', map(chr, @{$data->{pkc}->{data}})));
- } elsif (lc($data->{pkc}->{type}) eq 'x509pem') {
- $key = der2key(pem2der($data->{pkc}->{data}));
- } elsif (lc($data->{pkc}->{type}) eq 'opensshpubkey') {
- $key = opensshpubkey2key($data->{pkc}->{data});
- } elsif (lc($data->{pkc}->{type}) eq 'rfc4716') {
- $key = rfc47162key($data->{pkc}->{data});
+ # clients can have any one-line User ID without NULL characters
+ # and leading or trailing whitespace
+ if ($data->{peer}->{name} =~ /^([^[:space:]][^\n\0]*[^[:space:]]|[^\0[:space:]])$/) {
+ $data->{peer}->{name} = $1;
+ } else {
+ msvalog('error', "invalid client peer name string: %s\n", $data->{peer}->{name});
+ $ret->{message} = sprintf("Invalid client peer name string: %s", $data->{peer}->{name});
+ return $status,$ret;
+ }
+ } elsif ($data->{peer}->{name} =~ /^($RE{net}{domain}(:[[:digit:]]+)?)$/) {
+ $data->{peer}->{name} = $1;
} else {
- $ret->{message} = sprintf("Don't know this public key carrier type: %s", $data->{pkc}->{type});
+ msvalog('error', "invalid peer name string: %s\n", $data->{peer}->{name});
+ $ret->{message} = sprintf("Invalid peer name string: %s", $data->{peer}->{name});
return $status,$ret;
}
- if (exists $key->{error}) {
- $ret->{message} = $key->{error};
- return $status,$ret;
- }
+ msvalog('verbose', "peer: %s\n", $data->{peer}->{name});
- # make sure that the returned integers are Math::BigInts:
- $key->{exponent} = Math::BigInt->new($key->{exponent}) unless (ref($key->{exponent}));
- $key->{modulus} = Math::BigInt->new($key->{modulus}) unless (ref($key->{modulus}));
- msvalog('debug', "pubkey info:\nmodulus: %s\nexponent: %s\n",
- $key->{modulus}->as_hex(),
- $key->{exponent}->as_hex(),
- );
+ # generate uid string
+ my $uid = $prefix.$data->{peer}->{name};
+ msvalog('verbose', "user ID: %s\n", $uid);
- if ($key->{modulus}->copy()->blog(2) < 1000) {
- $ret->{message} = sprintf('Public key size is less than 1000 bits (was: %d bits)', $key->{modulus}->copy()->blog(2));
- } else {
- $ret->{message} = sprintf('Failed to validate "%s" through the OpenPGP Web of Trust.', $uid);
- my $lastloop = 0;
- my $kspolicy;
- if (defined $data->{keyserverpolicy} &&
- $data->{keyserverpolicy} =~ /^(always|never|unlessvalid)$/) {
- $kspolicy = $1;
- msvalog("verbose", "using requested keyserver policy: %s\n", $1);
+ # extract key or openpgp fingerprint from PKC
+ my $fpr;
+ my $key;
+ if (lc($data->{pkc}->{type}) eq 'openpgp4fpr') {
+ if ($data->{pkc}->{data} =~ /^(0x)?([[:xdigit:]]{40})$/) {
+ $data->{pkc}->{data} = uc($2);
+ $fpr = $data->{pkc}->{data};
+ msvalog('verbose', "OpenPGP v4 fingerprint: %s\n",$fpr);
} else {
- $kspolicy = get_keyserver_policy();
- }
- msvalog('debug', "keyserver policy: %s\n", $kspolicy);
- # needed because $gnupg spawns child processes
- $ENV{PATH} = '/usr/local/bin:/usr/bin:/bin';
- if ($kspolicy eq 'always') {
- fetch_uid_from_keyserver($uid);
- $lastloop = 1;
- } elsif ($kspolicy eq 'never') {
- $lastloop = 1;
+ msvalog('error', "invalid OpenPGP v4 fingerprint: %s\n",$data->{pkc}->{data});
+ $ret->{message} = sprintf("Invalid OpenPGP v4 fingerprint.");
+ return $status,$ret;
}
- my $foundvalid = 0;
-
- # fingerprints of keys that are not fully-valid for this User ID, but match
- # the key from the queried certificate:
- my @subvalid_key_fprs;
-
- while (1) {
- foreach my $gpgkey ($gnupg->get_public_keys('='.$uid)) {
- my $validity = '-';
- foreach my $tryuid ($gpgkey->user_ids) {
- if ($tryuid->as_string eq $uid) {
- $validity = $tryuid->validity;
- }
- }
- # treat primary keys just like subkeys:
- foreach my $subkey ($gpgkey, @{$gpgkey->subkeys}) {
- my $primarymatch = keycomp($key, $subkey);
- if ($primarymatch) {
- if ($subkey->usage_flags =~ /a/) {
- msvalog('verbose', "key matches, and 0x%s is authentication-capable\n", $subkey->hex_id);
- if ($validity =~ /^[fu]$/) {
- $foundvalid = 1;
- msvalog('verbose', "...and it matches!\n");
- $ret->{valid} = JSON::true;
- $ret->{message} = sprintf('Successfully validated "%s" through the OpenPGP Web of Trust.', $uid);
- } else {
- push(@subvalid_key_fprs, { fpr => $subkey->fingerprint, val => $validity }) if $lastloop;
- }
- } else {
- msvalog('verbose', "key matches, but 0x%s is not authentication-capable\n", $subkey->hex_id);
- }
- }
- }
- }
- if ($lastloop) {
- last;
- } else {
- fetch_uid_from_keyserver($uid) if (!$foundvalid);
- $lastloop = 1;
- }
+ } else {
+ # extract key from PKC
+ $key = pkcextractkey($data);
+ if (exists $key->{error}) {
+ $ret->{message} = $key->{error};
+ return $status,$ret;
}
+ }
- # only show the marginal UI if the UID of the corresponding
- # key is not fully valid.
- if (!$foundvalid) {
- my $resp = Crypt::Monkeysphere::MSVA::MarginalUI->ask_the_user($gnupg,
- $uid,
- \@subvalid_key_fprs,
- getpidswithsocketinode($clientinfo->{inode}),
- $logger);
- msvalog('info', "response: %s\n", $resp);
- if ($resp) {
- $ret->{valid} = JSON::true;
- $ret->{message} = sprintf('Manually validated "%s" through the OpenPGP Web of Trust.', $uid);
- }
+ # determine keyserver policy
+ my $kspolicy;
+ if (defined $data->{keyserverpolicy} &&
+ $data->{keyserverpolicy} =~ /^(always|never|unlessvalid)$/) {
+ $kspolicy = $1;
+ msvalog("verbose", "using requested keyserver policy: %s\n", $1);
+ } else {
+ $kspolicy = get_keyserver_policy();
+ }
+ msvalog('debug', "keyserver policy: %s\n", $kspolicy);
+ # needed because $gnupg spawns child processes
+ $ENV{PATH} = '/usr/local/bin:/usr/bin:/bin';
+
+ $ret->{message} = sprintf('Failed to validate "%s" through the OpenPGP Web of Trust.', $uid);
+
+ my $validator=new Crypt::Monkeysphere::Validator(kspolicy=>$kspolicy,
+ context=>$data->{context},
+ keyserver=>get_keyserver(),
+ gnupg=>$gnupg,
+ logger=>$logger);
+
+ my $uid_query=$validator->query(uid=>$uid,fpr=>$fpr, key=>$key );
+
+ # only show the marginal UI if the UID of the corresponding
+ # key is not fully valid.
+ if (scalar(@{$uid_query->{valid_keys}}) > 0) {
+ $ret->{valid} = JSON::true;
+ $ret->{message} = sprintf('Successfully validated "%s" through the OpenPGP Web of Trust.', $uid);
+ } else
+ my @subvalid_key_fprs= map { $_->{fingerprint} } @{$uid_query->{subvalid_keys}};
+
+ my $resp = Crypt::Monkeysphere::MSVA::MarginalUI->ask_the_user($gnupg,
+ $uid,
+ \@subvalid_key_fprs,
+ getpidswithsocketinode($clientinfo->{inode}),
+ $logger);
+ msvalog('info', "response: %s\n", $resp);
+ if ($resp) {
+ $ret->{valid} = JSON::true;
+ $ret->{message} = sprintf('Manually validated "%s" through the OpenPGP Web of Trust.', $uid);
}
}
- return $status, $ret;
+
+ return $status,$ret;
}
sub pre_loop_hook {
$server->server_close();
}
$self->port($port);
- $self->{updatemonitor} = Crypt::Monkeysphere::MSVA::Monitor->new($logger);
+ $self->{updatemonitor} = Crypt::Monkeysphere::MSVA::Monitor::->new($logger);
}
sub spawn_master_subproc {
projects / monkeysphere-validation-agent.git / blobdiff