thh/yapfaq
1
0
Fork 0
Code Issues 1 Pull requests Packages Projects Releases Activity

Moved configuration to a hash (%Config).

Browse source 
Signed-off-by: Thomas Hochstein <thh@inter.net>
This commit is contained in:
Thomas Hochstein 2010-04-07 22:09:15 +02:00
parent b855559ee3
commit 2507947f17
1 changed files with 56 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
yapfaq.pl
View file

@ -14,27 +14,23 @@
my $Version = "0.6.2"; my $Version = "0.6.2";
my $NNTPServer = "localhost"; my %Config = (NNTPServer => "localhost",
my $NNTPUser = ""; NNTPUser => "",
my $NNTPPass = ""; NNTPPass => "",
my $Sender = ""; Sender => "",
my $ConfigFile = "yapfaq.cfg"; ConfigFile => "yapfaq.cfg",
my $UsePGP = 0; UsePGP => 0,
################################## PGP-Config ################################# ################################## PGP-Config #################################
pgp => '/usr/bin/pgp', # path to pgp
my $pgp = '/usr/bin/pgp'; # path to pgp PGPVersion => '2', # Use 2 for 2.X, 5 for PGP > 2.X and GPG for GPG
my $PGPVersion = '2'; # Use 2 for 2.X, 5 for PGP > 2.X and GPG for GPG PGPSigner => '', # sign as who?
PGPPass => '', # pgp2 only
my $PGPSigner = ''; # sign as who? PathtoPGPPass => '', # pgp2, pgp5 and gpg
my $PGPPass = ''; # pgp2 only pgpbegin => '-----BEGIN PGP SIGNATURE-----', # Begin of PGP-Signature
my $PathtoPGPPass = ''; # pgp2, pgp5 and gpg pgpend => '-----END PGP SIGNATURE-----', # End of PGP-Signature
pgptmpf => 'pgptmp', # temporary file for PGP.
pgpheader => 'X-PGP-Sig');
my $pgpbegin ='-----BEGIN PGP SIGNATURE-----';# Begin of PGP-Signature
my $pgpend ='-----END PGP SIGNATURE-----'; # End of PGP-Signature
my $pgptmpf ='pgptmp'; # temporary file for PGP.
my $pgpheader ='X-PGP-Sig';
my @PGPSignHeaders = ('From', 'Newsgroups', 'Subject', 'Control', my @PGPSignHeaders = ('From', 'Newsgroups', 'Subject', 'Control',
'Supersedes', 'Followup-To', 'Date', 'Sender', 'Approved', 'Supersedes', 'Followup-To', 'Date', 'Sender', 'Approved',
@ -77,7 +73,7 @@ my ($Faq) = $Options{'f'} if ($Options{'f'});
# read configuration (configured FAQs) # read configuration (configured FAQs)
my @Config; my @Config;
readconfig (\$ConfigFile, \@Config, \$Faq); readconfig (\$Config{'ConfigFile'}, \@Config, \$Faq);
# for each FAQ: # for each FAQ:
# - parse configuration # - parse configuration
@ -119,7 +115,7 @@ foreach (@Config) {
if($Options{'d'}) { if($Options{'d'}) {
print "$ActName: Would be posted now (but running in simulation mode [$0 -d]).\n" if $Options{'v'}; print "$ActName: Would be posted now (but running in simulation mode [$0 -d]).\n" if $Options{'v'};
} else { } else {
postfaq(\$ActName,\$File,\$From,\$Subject,\$NG,\$Fup2,\$MIDF,\$ExtHea,\$Sender,\$TDY,\$TDM,\$TDD,\$ReplyTo,\$SupersedeMID,\$Expire); postfaq(\$ActName,\$File,\$From,\$Subject,\$NG,\$Fup2,\$MIDF,\$ExtHea,\$Config{'Sender'},\$TDY,\$TDM,\$TDD,\$ReplyTo,\$SupersedeMID,\$Expire);
} }
} elsif($Options{'v'}) { } elsif($Options{'v'}) {
print "$ActName: Nothing to do.\n"; print "$ActName: Nothing to do.\n";
@ -287,7 +283,7 @@ sub postfaq {
} }
# sign article if $UsePGP is true # sign article if $UsePGP is true
my @Article = ($UsePGP)?@{signpgp(\@Header, \@Body)}:(@Header, "\n", @Body); my @Article = ($Config{'UsePGP'})?@{signpgp(\@Header, \@Body)}:(@Header, "\n", @Body);
# post article # post article
print "$$ActName: Posting article ...\n" if($Options{'v'}); print "$$ActName: Posting article ...\n" if($Options{'v'});
@ -329,10 +325,8 @@ sub post {
return; return;
} }
my $NewsConnection = Net::NNTP->new($NNTPServer, Reader => 1) my $NewsConnection = Net::NNTP->new($Config{'NNTPServer'}, Reader => 1) or die "$0: E: Can't connect to news server '$Config{'NNTPServer'}'!\n";
or die "$0: E: Can't connect to news server '$NNTPServer'!\n"; $NewsConnection->authinfo ($Config{'NNTPUser'}, $Config{'NNTPPass'}) if (defined($Config{'NNTPUser'}));
$NewsConnection->authinfo ($NNTPUser, $NNTPPass) if (defined($NNTPUser));
$NewsConnection->post(); $NewsConnection->post();
$NewsConnection->datasend (@$ArticleR); $NewsConnection->datasend (@$ArticleR);
$NewsConnection->dataend(); $NewsConnection->dataend();
@ -362,26 +356,26 @@ sub getpgpcommand {
my $PGPCommand; my $PGPCommand;
if ($PGPVersion eq '2') { if ($PGPVersion eq '2') {
if ($PathtoPGPPass && !$PGPPass) { if ($Config{'PathtoPGPPass'} && !$Config{'PGPPass'}) {
open (PGPPW, $PathtoPGPPass) or die "$0: E: Can't open $PathtoPGPPass: $!"; open (PGPPW, $Config{'PathtoPGPPass'}) or die "$0: E: Can't open $Config{'PathtoPGPPass'}: $!";
$PGPPass = <PGPPW>; Config{'$PGPPass'} = <PGPPW>;
close PGPPW; close PGPPW;
} }
if ($PGPPass) { if (Config{'$PGPPass'}) {
$PGPCommand = "PGPPASS=\"".$PGPPass."\" ".$pgp." -u \"".$PGPSigner."\" +verbose=0 language='en' -saft <".$pgptmpf.".txt >".$pgptmpf.".txt.asc"; $PGPCommand = "PGPPASS=\"".$Config{'PGPPass'}."\" ".$Config{'pgp'}." -u \"".$Config{'PGPSigner'}."\" +verbose=0 language='en' -saft <".$Config{'pgptmpf'}.".txt >".$Config{'pgptmpf'}.".txt.asc";
} else { } else {
die "$0: E: PGP-Passphrase is unknown!\n"; die "$0: E: PGP-Passphrase is unknown!\n";
} }
} elsif ($PGPVersion eq '5') { } elsif ($PGPVersion eq '5') {
if ($PathtoPGPPass) { if ($Config{'PathtoPGPPass'}) {
$PGPCommand = "PGPPASSFD=2 ".$pgp."s -u \"".$PGPSigner."\" -t --armor -o ".$pgptmpf.".txt.asc -z -f < ".$pgptmpf.".txt 2<".$PathtoPGPPass; $PGPCommand = "PGPPASSFD=2 ".$Config{'pgp'}."s -u \"".$Config{'PGPSigner'}."\" -t --armor -o ".$Config{'pgptmpf'}.".txt.asc -z -f < ".$Config{'pgptmpf'}.".txt 2<".$Config{'PathtoPGPPass'};
} else { } else {
die "$0: E: PGP-Passphrase is unknown!\n"; die "$0: E: PGP-Passphrase is unknown!\n";
} }
} elsif ($PGPVersion =~ m/GPG/io) { } elsif ($PGPVersion =~ m/GPG/io) {
if ($PathtoPGPPass) { if (Config{'$PathtoPGPPass'}) {
$PGPCommand = $pgp." --digest-algo MD5 -a -u \"".$PGPSigner."\" -o ".$pgptmpf.".txt.asc --no-tty --batch --passphrase-fd 2 2<".$PathtoPGPPass." --clearsign ".$pgptmpf.".txt"; $PGPCommand = $Config{'pgp'}." --digest-algo MD5 -a -u \"".$Config{'PGPSigner'}."\" -o ".$Config{'pgptmpf'}.".txt.asc --no-tty --batch --passphrase-fd 2 2<".$Config{'PathtoPGPPass'}." --clearsign ".$Config{'pgptmpf'}.".txt";
} else { } else {
die "$0: E: Passphrase is unknown!\n"; die "$0: E: Passphrase is unknown!\n";
} }
@ -424,8 +418,8 @@ sub signpgp {
$pgpbody = join ("", @$BodyR); $pgpbody = join ("", @$BodyR);
# Delete and create the temporary pgp-Files # Delete and create the temporary pgp-Files
unlink "$pgptmpf.txt"; unlink "$Config{'pgptmpf'}.txt";
unlink "$pgptmpf.txt.asc"; unlink "$Config{'pgptmpf'}.txt.asc";
$signheaders = join(",", @signheaders); $signheaders = join(",", @signheaders);
$pgphead = "X-Signed-Headers: $signheaders\n"; $pgphead = "X-Signed-Headers: $signheaders\n";
@ -435,37 +429,37 @@ sub signpgp {
} }
} }
open(FH, ">" . $pgptmpf . ".txt") or die "$0: E: can't open $pgptmpf: $!\n"; open(FH, ">" . $Config{'pgptmpf'} . ".txt") or die "$0: E: can't open $Config{'pgptmpf'}: $!\n";
print FH $pgphead, "\n", $pgpbody; print FH $pgphead, "\n", $pgpbody;
print FH "\n" if ($PGPVersion =~ m/GPG/io); # workaround a pgp/gpg incompatibility - should IMHO be fixed in pgpverify print FH "\n" if ($Config{'PGPVersion'} =~ m/GPG/io); # workaround a pgp/gpg incompatibility - should IMHO be fixed in pgpverify
close(FH) or warn "$0: W: Couldn't close TMP: $!\n"; close(FH) or warn "$0: W: Couldn't close TMP: $!\n";
# Start PGP, then read the signature; # Start PGP, then read the signature;
my $PGPCommand = getpgpcommand($PGPVersion); my $PGPCommand = getpgpcommand($Config{'PGPVersion'});
`$PGPCommand`; `$PGPCommand`;
open (FH, "<" . $pgptmpf . ".txt.asc") or die "$0: E: can't open ".$pgptmpf.".txt.asc: $!\n"; open (FH, "<" . $Config{'pgptmpf'} . ".txt.asc") or die "$0: E: can't open ".$Config{'pgptmpf'}.".txt.asc: $!\n";
$/ = "$pgpbegin\n"; $/ = "$Config{'pgpbegin'}\n";
$_ = <FH>; $_ = <FH>;
unless (m/\Q$pgpbegin\E$/o) { unless (m/\Q$Config{'pgpbegin'}\E$/o) {
# unlink $pgptmpf . ".txt"; # unlink $Config{'pgptmpf'} . ".txt";
# unlink $pgptmpf . ".txt.asc"; # unlink $Config{'pgptmpf'} . ".txt.asc";
die "$0: E: $pgpbegin not found in ".$pgptmpf.".txt.asc\n" die "$0: E: $Config{'pgpbegin'} not found in ".$Config{'pgptmpf'}.".txt.asc\n"
} }
unlink($pgptmpf . ".txt") or warn "$0: W: Couldn't unlink $pgptmpf.txt: $!\n"; unlink($Config{'pgptmpf'} . ".txt") or warn "$0: W: Couldn't unlink $Config{'pgptmpf'}.txt: $!\n";
$/ = "\n"; $/ = "\n";
$_ = <FH>; $_ = <FH>;
unless (m/^Version: (\S+)(?:\s(\S+))?/o) { unless (m/^Version: (\S+)(?:\s(\S+))?/o) {
unlink $pgptmpf . ".txt"; unlink $Config{'pgptmpf'} . ".txt";
unlink $pgptmpf . ".txt.asc"; unlink $Config{'pgptmpf'} . ".txt.asc";
die "$0: E: didn't find PGP Version line where expected.\n"; die "$0: E: didn't find PGP Version line where expected.\n";
} }
if (defined($2)) { if (defined($2)) {
$$HeaderR{$pgpheader} = $1."-".$2." ".$signheaders; $$HeaderR{$Config{'pgpheader'}} = $1."-".$2." ".$signheaders;
} else { } else {
$$HeaderR{$pgpheader} = $1." ".$signheaders; $$HeaderR{$Config{'pgpheader'}} = $1." ".$signheaders;
} }
do { # skip other pgp headers like do { # skip other pgp headers like
@ -474,23 +468,23 @@ sub signpgp {
while (<FH>) { while (<FH>) {
chomp; chomp;
last if /^\Q$pgpend\E$/; last if /^\Q$Config{'pgpend'}\E$/;
$$HeaderR{$pgpheader} .= "\n\t$_"; $$HeaderR{$Config{'pgpheader'}} .= "\n\t$_";
} }
$$HeaderR{$pgpheader} .= "\n" unless ($$HeaderR{$pgpheader} =~ /\n$/s); $$HeaderR{$Config{'pgpheader'}} .= "\n" unless ($$HeaderR{$Config{'pgpheader'}} =~ /\n$/s);
$_ = <FH>; $_ = <FH>;
unless (eof(FH)) { unless (eof(FH)) {
unlink $pgptmpf . ".txt"; unlink $Config{'pgptmpf'} . ".txt";
unlink $pgptmpf . ".txt.asc"; unlink $Config{'pgptmpf'} . ".txt.asc";
die "$0: E: unexpected data following $pgpend\n"; die "$0: E: unexpected data following $Config{'pgpend'}\n";
} }
close(FH); close(FH);
unlink "$pgptmpf.txt.asc"; unlink "$Config{'pgptmpf'}.txt.asc";
my $tmppgpheader = $pgpheader . ": " . $$HeaderR{$pgpheader}; my $tmppgpheader = $Config{'pgpheader'} . ": " . $$HeaderR{$Config{'pgpheader'}};
delete $$HeaderR{$pgpheader}; delete $$HeaderR{$Config{'pgpheader'}};
@pgphead = (); @pgphead = ();
foreach $header (@PGPorderheaders) { foreach $header (@PGPorderheaders) {
@ -507,7 +501,7 @@ sub signpgp {
} }
} }
push @pgphead, ("X-PGP-Key: " . $PGPSigner . "\n"), $tmppgpheader; push @pgphead, ("X-PGP-Key: " . $Config{'PGPSigner'} . "\n"), $tmppgpheader;
undef $tmppgpheader; undef $tmppgpheader;
@pgpbody = split /$/m, $pgpbody; @pgpbody = split /$/m, $pgpbody;