=head1 SYNOPSIS
-
Usage maps: [-u|ser <username>] [-ve|rbose] [-deb|ug] [-e|xecute]
Where:
-u|ser <username>: Set context to this username
-
+
-v|erbose: Be verbose
-de|bug: Output debug messages
-
+
-[no]e|xecute: Set execute mode.
-# (c) Copyright 2000-2006, Andrew@DeFaria.com, all rights reserved.
+# (c) Copyright 2000-2021, Andrew@DeFaria.com, all rights reserved.
=cut
use warnings;
use Getopt::Long;
+use Email::Valid;
use FindBin;
use File::Temp qw (tempfile);
use Net::Domain qw (hostdomain);
-use lib $FindBin::Bin, '/opt/clearscm/lib';
+use lib "$FindBin::Bin/../lib", "$FindBin::Bin/../../lib";
use MAPS;
use MAPSLog;
use Display;
use Utils;
-my $verbose = 0;
-my $execute = 1;
-my $userid = $ENV{USER};
+my $verbose = 0;
+my $execute = 1;
+my $userid = $ENV{USER};
-my $logpath = "$FindBin::Bin/../log";
-my $logfile = "$logpath/debug.log";
+my $logpath = "$FindBin::Bin/../log";
+my $logfile = "$logpath/debug.log";
+my $forwardto = $ENV{MAPS_FORWARDTO} || 'adefaria@gmail.com';
# For some reason I'm not parsing messages correctly but it only seems to
# happen when the message is piped in from the MTA. This routine will
# temporarily save the messages in a file.
-sub SaveStdin () {
+sub SaveStdin() {
# Generate tempfile
my $msgfile = tempfile ();
return $msgfile;
} # SaveStdin
-sub save_msg {
- my ($sender, $sender_long, $reply_to, $subject, $data) = @_;
-
- open SAVED_MSG, ">>$logpath/$sender"
- or die "Unable to open $logpath/$sender - $!\n";
-
- print SAVED_MSG "Sender = $sender\n";
- print SAVED_MSG "Sender long = $sender\n";
- print SAVED_MSG "reply_to = $reply_to\n";
- print SAVED_MSG "subject = $subject\n";
- print SAVED_MSG "data:\n\n";
- print SAVED_MSG $data;
- print SAVED_MSG "*** END OF DATA***\n";
-} # save_msg
-
-sub ValidDomainUser ($) {
+sub ValidDomainUser($) {
my ($sender) = @_;
my ($username, $domainname);
if ($sender =~ /(.*)\@(.*)/) {
- $username = $1;
+ $username = $1;
$domainname = $2;
} else {
return 1;
sub ProcessMsgs ($$$) {
my ($msgfile, $username, $user_email) = @_;
- return
- unless $execute;
+ return unless $execute;
while (!eof *$msgfile) {
my ($sender, $sender_long, $reply_to, $subject, $data) = ReadMsg (*$msgfile);
+ #if ($forwardto) {
+ # Forward a copy
+ #open my $mail, '|', "/usr/lib/sendmail $forwardto"
+ #or die "Unable to open pipe to sendmail - $!";
+
+ #print $mail "$data\n";
+
+ #close $mail
+ #or die "Unable to forward email to $forwardto - $!";
+ #} # if
+
my ($onlist, $rule, $sequence, $hit_count);
- if ($sender eq "" or $sender eq "@" or $sender =~ /.*\@$/) {
- verbose "Sender not found in message";
- next;
- } elsif ($sender eq $user_email and
+ # Algorithm change: We now first check to see if the sender is not found
+ # in the message and skip it if so. Then we handle if we are the sender
+ # and that the from address is formatted properly. Spammers often use
+ # the senders email address (i.e. andrew@defaria.com) as their from address
+ # so we check "Andrew DeFaria <Andrew@DeFaria.com>", which they have never
+ # forged. This catches a lot of spam actually.
+ #
+ # Next we check to see if the sender is on our whitelist. If so then we let
+ # them in. This allows us to say whitelist josephrosenberg@hotmail.com while
+ # still nulllisting all of the other hotmail.com spammers.
+ #
+ # Next we process blacklisted people as they are also of high priority.
+ #
+ # Then we process nulllist people.
+ #
+ # Finally, we handle return processing
+
+ # Discard any email with an invalid email address
+ next unless Email::Valid->address($sender);
+
+ if ($sender eq $user_email and
(lc ($sender_long) !~ lc ("\"$username\" <$user_email>") and
lc ($sender_long) !~ lc ("$username <$user_email>"))) {
verbose "Nulllisting message from sender ($sender_long) pretending to be $user_email";
next;
} # if
- ($onlist, $rule, $sequence, $hit_count) = OnNulllist $sender;
+ # Check whitelist:
+ ($onlist, $rule, $sequence, $hit_count) = OnWhitelist $sender;
if ($onlist) {
- verbose "Nulllisting $sender";
- Nulllist $sender, $sequence, $hit_count;
+ if (ValidDomainUser $sender) {
+ verbose "Whitelisting $sender";
+ Whitelist $sender, $data, $sequence, $hit_count;
+ } else {
+ verbose "Sender from this domain but user not found";
+ Nulllist $sender;
+ } # if
+
next;
} # if
+ # Check blacklist:
($onlist, $rule, $sequence, $hit_count) = OnBlacklist $sender;
if ($onlist) {
verbose "Blacklisting $sender";
- my @msg = split /\n/, $data;
- Blacklist $sender, $sequence, $hit_count, @msg;
+ Blacklist(
+ userid => $userid,
+ sender => $sender,
+ sequence => $sequence,
+ hit_count => $hit_count,
+ data => $data,
+ );
+
next;
} # if
- ($onlist, $rule, $sequence, $hit_count) = OnWhitelist $sender;
+ # Check nulllist:
+ ($onlist, $rule, $sequence, $hit_count) = OnNulllist $sender;
if ($onlist) {
- if (ValidDomainUser $sender) {
- verbose "Whitelisting $sender";
- Whitelist $sender, $data, $sequence, $hit_count;
- } else {
- verbose "Sender from this domain but user not found";
- Nulllist $sender;
- } # if
- } else {
- if ($sender !~ /\@/) {
- verbose "Sender ($sender) does not appear to be a valid email address";
- } else {
- verbose "Returning message from $sender";
- ReturnMsg $sender, $reply_to, $subject, $data;
- } # if
+ verbose "Nulllisting $sender";
+ Nulllist $sender, $sequence, $hit_count;
+ next;
} # if
+
+ # Return processing:
+ verbose "Returning message from $sender";
+ ReturnMsg(
+ userid => $userid,
+ sender => $sender,
+ reply_to => $reply_to,
+ subject => $subject,
+ data => $data,
+ );
} # while
} # ProcessMsgs
# Main
-GetOptions (
- 'user=s' => \$userid,
- 'verbose' => sub { set_verbose },
- 'debug' => sub { set_debug },
- 'execute!' => \$execute,
+GetOptions(
+ 'user=s' => \$userid,
+ 'verbose' => sub { set_verbose },
+ 'debug' => sub { set_debug },
+ 'execute!' => \$execute,
+ 'forwardto=s' => \$forwardto
) || Usage;
my $msgfile;
if ($ARGV[0] and $ARGV[0] ne "") {
- open $msgfile, $ARGV[0];
+ open $msgfile, '<', $ARGV[0];
- if (!$msgfile) {
+ unless ($msgfile) {
Error "Unable to open file ($ARGV[0]): $!\n";
exit 1;
} # if
verbose "Starting MAPS....";
-my ($username, $user_email) = SetContext $userid
+my %userOptions = SetContext $userid
or die "$userid is not a registered MAPS user\n";
-ProcessMsgs $msgfile, $username, $user_email;
+ProcessMsgs $msgfile, $userOptions{name}, $userOptions{email};
exit 0;
projects / clearscm.git / blobdiff