X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=8321031497f2336ea0c8b51621978e86bcd58003;hb=30a14ebe1a9bfbf99062005ed5cba967481b2205;hp=7988badc534f64e5dd6a2c00a48b6198d1e27c78;hpb=71c733152debf7c0d7b34ea1774d51b4c200595c;p=pgp-tools.git diff --git a/caff/caff b/caff/caff index 7988bad..8321031 100755 --- a/caff/caff +++ b/caff/caff @@ -3,7 +3,7 @@ # caff -- CA - Fire and Forget # $Id$ # -# Copyright (c) 2004, 2005 Peter Palfrader +# Copyright (c) 2004, 2005, 2006 Peter Palfrader # Copyright (c) 2005, 2006 Christoph Berg # # All rights reserved. @@ -105,7 +105,7 @@ Import keys from file. Can be supplied more than once. =item $HOME/.caff/gnupghome/gpg.conf - gpg configuration -useful options include use-agent, default-cert-level, etc. +useful options include use-agent, keyserver-options, default-cert-level, etc. =back @@ -116,9 +116,9 @@ The file is generated when it does not exist. Example: - $CONFIG{owner} = q{Peter Palfrader}; - $CONFIG{email} = q{peter@palfrader.org}; - $CONFIG{keyid} = [ qw{DE7AAF6E94C09C7F 62AF4031C82E0039} ]; + $CONFIG{'owner'} = q{Peter Palfrader}; + $CONFIG{'email'} = q{peter@palfrader.org}; + $CONFIG{'keyid'} = [ qw{DE7AAF6E94C09C7F 62AF4031C82E0039} ]; =head2 Required basic settings @@ -171,7 +171,8 @@ Additional keyids to encrypt messages to. Default: none. =item B [string] -Additional arguments to pass to gpg. Default: none. +Additional commands to pass to gpg after the "sign" command. +Default: none. =head2 Keyserver settings @@ -218,7 +219,7 @@ Do not prompt for sending mail, just do it. Default: B<0>. =item B [boolean] Do not prompt for sending mail. The messages are still written to -$CONFIG{caffhome}/keys/. Default: B<0>. +$CONFIG{'caffhome'}/keys/. Default: B<0>. =item B [string] @@ -256,11 +257,11 @@ Default: none. Parameters to pass to Mail::Mailer. This could for example be - $CONFIG{mailer-send} = [ 'smtp', Server => 'mail.server', Auth => ['user', 'pass'] ] + $CONFIG{'mailer-send'} = [ 'smtp', Server => 'mail.server', Auth => ['user', 'pass'] ]; to use the perl SMTP client or - $CONFIG{mailer-send} = [ 'sendmail', '-o8' ] + $CONFIG{'mailer-send'} = [ 'sendmail', '-o8' ]; to pass arguments to the sendmail program. For more information run C<< perldoc Mail::Mailer >>. @@ -297,6 +298,7 @@ use File::Path; use File::Temp qw{tempdir}; use Text::Template; use MIME::Entity; +use Encode; use Fcntl; use IO::Select; use Getopt::Long; @@ -475,6 +477,9 @@ sub load_config() { unless (defined $CONFIG{'mail-template'}) { $CONFIG{'mail-template'} .= $_ foreach ; } + if ((defined $CONFIG{'also-encrypt-to'}) && ! (ref($CONFIG{'also-encrypt-to'}) eq 'ARRAY')) { + $CONFIG{'also-encrypt-to'} = [ $CONFIG{'also-encrypt-to'} ]; + }; }; sub make_gpg_fds() { @@ -764,19 +769,26 @@ sub send_mail($$$@) { my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds(); $gpg->options->push_recipients( $key_id ); if (defined $CONFIG{'also-encrypt-to'}) { - if (ref($CONFIG{'also-encrypt-to'})) { - $gpg->options->push_recipients($_) - foreach @{$CONFIG{'also-encrypt-to'}}; - } else { - $gpg->options->push_recipients($CONFIG{'also-encrypt-to'}); - } + $gpg->options->push_recipients($_) foreach @{$CONFIG{'also-encrypt-to'}}; } my $pid = $gpg->encrypt(handles => $handles); my ($stdout, $stderr, $status) = readwrite_gpg($message, $inputfd, $stdoutfd, $stderrfd, $statusfd); waitpid $pid, 0; if ($stdout eq '') { - warn ("No data from gpg for list-key $key_id\n"); - next; + if (($status =~ /^\[GNUPG:\] INV_RECP ([0-9]+) ([0-9A-F]+)/m) and + (defined $CONFIG{'also-encrypt-to'})) { + my $reason = $1; + my $keyid = $2; + if (grep { $_ eq $keyid } @{$CONFIG{'also-encrypt-to'}}) { + warn("Could not encrypt to $keyid, specified in CONFIG{'also-encrypt-to'}.\n". + "Try to update the key using gpg --homedir=$GNUPGHOME --import \n". + "or try the following if you are slightly more daring:\n". + " gpg --export $keyid | gpg --homedir=$GNUPGHOME --import"); + return; + }; + }; + warn ("No data from gpg for encrypting mail. STDERR was:\n$stderr\nstatus output was:\n$status\n"); + return; }; $message = $stdout; @@ -800,7 +812,7 @@ sub send_mail($$$@) { $message_entity->head->add("Subject", "Your signed PGP key 0x$key_id"); $message_entity->head->add("To", $address); - $message_entity->head->add("From", '"'.$CONFIG{'owner'}.'" <'.$CONFIG{'email'}.'>'); + $message_entity->head->add("From", '"'.Encode::encode('MIME-Q', $CONFIG{'owner'}).'" <'.$CONFIG{'email'}.'>'); $message_entity->head->add("Reply-To", $CONFIG{'reply-to'}) if defined $CONFIG{'reply-to'}; $message_entity->head->add("Bcc", $CONFIG{'bcc'}) if defined $CONFIG{'bcc'}; $message_entity->head->add("User-Agent", $USER_AGENT); @@ -907,8 +919,9 @@ $CONFIG{'mail'} = $params->{'mail'} if defined $params->{'mail'}; $CONFIG{'no-sign'} = $params->{'no-sign'} if defined $params->{'no-sign'}; push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined $params->{'key-files'}; -for my $keyid (@ARGV) { +for my $keyid (map { split /\n/ } @ARGV) { # caff "`cat txt`" is a single argument $keyid =~ s/^0x//i; + $keyid =~ s/ //g; # gpg --fingerprint includes spaces if ($keyid =~ /^[A-F0-9]{32}$/i) { info("Ignoring v3 fingerprint $keyid. v3 keys are obsolete."); next; @@ -1305,12 +1318,15 @@ for my $keyid (@keyids_ok) { $address =~ s/.*<(.*)>.*/$1/; if (ask("Mail signature for $uid->{'text'} to '$address'?", 1, $CONFIG{'mail'})) { my $mail = send_mail($address, $can_encrypt, $longkeyid, $uid, @attached); - - my $keydir = "$KEYSBASE/$DATE_STRING"; - my $mailfile = "$keydir/$longkeyid.mail.".$uid->{'serial'}.".".sanitize_uid($uid->{'text'}); - open (KEY, ">$mailfile") or die ("Cannot open $mailfile: $!\n"); - print KEY $mail; - close KEY; + if (defined $mail) { + my $keydir = "$KEYSBASE/$DATE_STRING"; + my $mailfile = "$keydir/$longkeyid.mail.".$uid->{'serial'}.".".sanitize_uid($uid->{'text'}); + open (KEY, ">$mailfile") or die ("Cannot open $mailfile: $!\n"); + print KEY $mail; + close KEY; + } else { + warn "Generating mail failed.\n"; + }; }; }; };