=back
+=item B<reply-to> [string]
+
+Add a Reply-To: header to messages sent. Default: none.
+
=item B<bcc> [string]
Address to send blind carbon copies to when sending mail.
my ($REVISION_NUMER) = $REVISION =~ /(\d+)/;
my $VERSION = "0.0.0.$REVISION_NUMER";
-sub generate_config() {
- die "Error: \$LOGNAME is not set.\n" unless $ENV{LOGNAME};
- my $gecos = (getpwnam($ENV{LOGNAME}))[6];
- $gecos =~ s/,.*//;
- my $gpg = GnuPG::Interface->new();
- $gpg->call( 'gpg' );
- $gpg->options->hash_init(
- 'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always --with-colons --fixed-list-mode } ] );
- $gpg->options->meta_interactive( 0 );
- my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
- my $pid = $gpg->list_public_keys(handles => $handles, command_args => [ $gecos ]);
- my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
- waitpid $pid, 0;
- if ($stdout eq '') {
- warn ("No data from gpg for list-key\n"); # There should be at least 'tru:' everywhere.
- };
+sub notice($) {
+ my ($line) = @_;
+ print "[NOTICE] $line\n";
+};
+sub info($) {
+ my ($line) = @_;
+ print "[INFO] $line\n";
+};
+sub debug($) {
+ my ($line) = @_;
+ #print "[DEBUG] $line\n";
+};
+sub trace($) {
+ my ($line) = @_;
+ #print "[trace] $line\n";
+};
+sub trace2($) {
+ my ($line) = @_;
+ #print "[trace2] $line\n";
+};
+
+sub generate_config() {
+ notice("Error: \$LOGNAME is not set.\n") unless defined $ENV{'LOGNAME'};
+ my $gecos = defined $ENV{'LOGNAME'} ? (getpwnam($ENV{LOGNAME}))[6] : undef;
+ my $email;
my @keys;
- unless (@keys = ($stdout =~ /^pub:[^r:]*:(?:[^:]*:){2,2}([^:]+):/mg)) {
- die "Error: No keys were found using \"gpg --list-public-keys '$gecos'\".\n";
- }
- unless ($stdout =~ /^uid:.*<(.+@.+)>.*:/m) {
- die "Error: No email address was found using \"gpg --list-public-keys '$gecos'\".\n";
- }
- my $email = $1;
+ my $hostname = `hostname -f`;
+ chomp $hostname;
+ if (defined $gecos) {
+ $gecos =~ s/,.*//;
+
+ my $gpg = GnuPG::Interface->new();
+ $gpg->call( 'gpg' );
+ $gpg->options->hash_init(
+ 'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always --with-colons --fixed-list-mode } ] );
+ $gpg->options->meta_interactive( 0 );
+ my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
+ my $pid = $gpg->list_public_keys(handles => $handles, command_args => [ $gecos ]);
+ my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
+ waitpid $pid, 0;
+
+ if ($stdout eq '') {
+ warn ("No data from gpg for list-key\n"); # There should be at least 'tru:' everywhere.
+ };
+
+ @keys = ($stdout =~ /^pub:[^r:]*:(?:[^:]*:){2,2}([^:]+):/mg);
+ unless (scalar @keys) {
+ info("Error: No keys were found using \"gpg --list-public-keys '$gecos'\".");
+ @keys = qw{0123456789abcdef 89abcdef76543210}
+ }
+ ($email) = ($stdout =~ /^uid:.*<(.+?@.+?)>.*:/m);
+ unless (defined $email) {
+ info("Error: No email address was found using \"gpg --list-public-keys '$gecos'\".");
+ $email = $ENV{'LOGNAME'}.'@'.$hostname;
+ }
+ } else {
+ $gecos = 'Unknown Caff User';
+ $email = $ENV{'LOGNAME'}.'@'.$hostname;
+ @keys = qw{0123456789abcdef 89abcdef76543210}
+ };
return <<EOT;
# .caffrc -- vim:syntax=perl:
#
# if you have a v4 key, it will simply be the last 16 digits of
# your fingerprint.
+#
+# Example:
+# \$CONFIG{'keyid'} = [ qw{FEDCBA9876543210} ];
+# or, if you have more than one key:
+# \$CONFIG{'keyid'} = [ qw{0123456789ABCDEF 89ABCDEF76543210} ];
\$CONFIG{'keyid'} = [ qw{@keys} ];
EOT
unless (-f $config) {
print "No configfile $config present, I will use this template:\n";
my $template = generate_config();
- print "$template\nPress enter to continue.";
- <STDIN>;
+ print "$template\nPlease edit $config and run caff again.\n";
open F, ">$config" or die "$config: $!";
print F $template;
close F;
+ exit(1);
}
unless (scalar eval `cat $config`) {
die "Couldn't parse $config: $EVAL_ERROR\n" if $EVAL_ERROR;
EOM
};
-sub notice($) {
- my ($line) = @_;
- print "[NOTICE] $line\n";
-};
-sub info($) {
- my ($line) = @_;
- print "[INFO] $line\n";
-};
-sub debug($) {
- my ($line) = @_;
- #print "[DEBUG] $line\n";
-};
-sub trace($) {
- my ($line) = @_;
- #print "[trace] $line\n";
-};
-sub trace2($) {
- my ($line) = @_;
- #print "[trace2] $line\n";
-};
-
sub make_gpg_fds() {
my %fds = (
stdin => IO::Handle->new(),
$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("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);
$message_entity->send();
# [GNUPG:] NODATA 1
# [GNUPG:] IMPORT_OK 0 25FC1614B8F87B52FF2F99B962AF4031C82E0039
my %local_keyids = map { $_ => 1 } @KEYIDS;
+ my $had_v3_keys = 0;
for my $line (split /\n/, $status) {
if ($line =~ /^\[GNUPG:\] IMPORT_OK \d+ ([0-9A-F]{40})/) {
my $imported_key = $1;
delete $local_keyids{$speced_key};
unshift @keyids_ok, $imported_key;
} elsif ($line =~ /^\[GNUPG:\] (NODATA|IMPORT_RES|IMPORTED) /) {
+ } elsif ($line =~ /^\[GNUPG:\] IMPORT_OK \d+ ([0-9A-F]{32})/) {
+ my $imported_key = $1;
+ notice ("Imported key $1 is a version 3 key. Version 3 keys are obsolete, should not be used, and are not and will not be properly supported.");
+ $had_v3_keys = 1;
} else {
notice ("got unknown reply from gpg: $line");
}
};
if (scalar %local_keyids) {
- notice ("Import failed for: ". (join ' ', keys %local_keyids).".");
+ notice ("Import failed for: ". (join ' ', keys %local_keyids)."." . ($had_v3_keys ? " (Or maybe it's one of those ugly v3 keys?)" : ""));
exit 1 unless ask ("Some keys could not be imported - continue anyway?", 0);
}
};
projects / pgp-tools.git / blobdiff