byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support more of the milter functionality (header changes)

Browse Source 
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@318 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Matt Sergeant 2004-09-16 10:44:47 +00:00
parent eadaaf217c
commit 06563ad3a3
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/milter
View File

@ -75,20 +75,20 @@ sub check_results {
$transaction->body_write($result->{value}); $transaction->body_write($result->{value});
} }
else { else {
$transaction->header->add($result->{header}, $result->{value}); push @{$transaction->notes('milter_header_changes')->{add}},
[$result->{header}, $result->{value}];
} }
} }
elsif ($result->{action} eq 'delete') { elsif ($result->{action} eq 'delete') {
$transaction->header->delete($result->{header}); push @{$transaction->notes('milter_header_changes')->{delete}},
$result->{header};
} }
elsif ($result->{action} eq 'accept') { elsif ($result->{action} eq 'accept') {
# TODO - figure out what this is used for # TODO - figure out what this is used for
} }
elsif ($result->{action} eq 'replace') { elsif ($result->{action} eq 'replace') {
$transaction->header->replace($result->{header}, $result->{value}); push @{$transaction->notes('milter_header_changes')->{replace}},
} [$result->{header}, $result->{value}];
elsif ($result->{action} eq 'continue') {
# just carry on as normal
} }
} }
} }
@ -102,7 +102,10 @@ sub connect_handler {
$milter->protocol_negotiation(); $milter->protocol_negotiation();
$self->qp->connection->notes(milter => $milter); $self->qp->connection->notes(milter => $milter);
$self->qp->connection->notes(
milter_header_changes => { add => [], delete => [], replace => [], }
);
my $remote_ip = $self->qp->connection->remote_ip; my $remote_ip = $self->qp->connection->remote_ip;
my $remote_host = $self->qp->connection->remote_host; my $remote_host = $self->qp->connection->remote_host;
$self->log(LOGDEBUG, "milter $self->{name} checking connect from $remote_host\[$remote_ip\]"); $self->log(LOGDEBUG, "milter $self->{name} checking connect from $remote_host\[$remote_ip\]");
@ -221,6 +224,18 @@ sub data_handler {
$milter->send_end_body()) }; $milter->send_end_body()) };
return(DENY, $@) if $@; return(DENY, $@) if $@;
my $milter_header_changes = $transaction->notes('milter_header_changes');
foreach my $add (@{$milter_header_changes->{add}}) {
$headers->add($add->[0], $add->[1]);
}
foreach my $del (@{$milter_header_changes->{'delete'}}) {
$headers->delete($del);
}
foreach my $repl (@{$milter_header_changes->{replace}}) {
$headers->replace($repl->[0], $repl->[1]);
}
return DECLINED; return DECLINED;
} }