ps/hermes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add spf-fail to the headers

Browse source
This commit is contained in:
ps 2011-08-16 12:21:37 +00:00
parent b765b6f2fd
commit 25b8d879d9
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Proxy.cpp
View file

@ -139,15 +139,19 @@ void Proxy::run(string &peer_address)
code="421"; code="421";
mechanism="greylist"; mechanism="greylist";
message=code+" Greylisted!! Please try again in a few minutes."; message=code+" Greylisted!! Please try again in a few minutes.";
LINF("checking " + mechanism); LINF("checking " + mechanism);
} }
#ifdef HAVE_SPF #ifdef HAVE_SPF
else if(cfg.getQuerySpf()&&!authenticated&&!spf_checker.query(peer_address,ehlostr,from)) else if(cfg.getQuerySpf()&&!authenticated&&!spf_checker.query(peer_address,ehlostr,from))
{ {
code=cfg.getReturnTempErrorOnReject()?"421":"550"; hermes_status="spf-failed";
if(cfg.getAddStatusHeader())
code="250";
else
code=cfg.getReturnTempErrorOnReject()?"421":"550";
mechanism="spf"; mechanism="spf";
message=code+" You do not seem to be allowed to send email for that particular domain."; message=code+" You do not seem to be allowed to send email for that particular domain.";
LINF("checking " + mechanism); LINF("checking " + mechanism);
} }
#endif //HAVE_SPF #endif //HAVE_SPF
//check blacklist //check blacklist
@ -156,7 +160,7 @@ void Proxy::run(string &peer_address)
code=cfg.getReturnTempErrorOnReject()?"421":"550"; code=cfg.getReturnTempErrorOnReject()?"421":"550";
mechanism="allowed-domain-per-ip"; mechanism="allowed-domain-per-ip";
message=code+" You do not seem to be allowed to send email to that particular domain from that address."; message=code+" You do not seem to be allowed to send email to that particular domain from that address.";
LINF("checking " + mechanism); LINF("checking " + mechanism);
} }
//check rbl //check rbl
else if(!cfg.getDnsBlacklistDomains().empty()&&!authenticated&&Utils::listed_on_dns_lists(cfg.getDnsBlacklistDomains(),cfg.getDnsBlacklistPercentage(),peer_address)) else if(!cfg.getDnsBlacklistDomains().empty()&&!authenticated&&Utils::listed_on_dns_lists(cfg.getDnsBlacklistDomains(),cfg.getDnsBlacklistPercentage(),peer_address))
@ -168,21 +172,21 @@ void Proxy::run(string &peer_address)
code=cfg.getReturnTempErrorOnReject()?"421":"550"; code=cfg.getReturnTempErrorOnReject()?"421":"550";
mechanism="dnsbl"; mechanism="dnsbl";
message=code+" You are listed on some DNS blacklists. Get delisted before trying to send us email."; message=code+" You are listed on some DNS blacklists. Get delisted before trying to send us email.";
LINF("checking " + mechanism); LINF("checking " + mechanism);
} }
else if(cfg.getRejectNoReverseResolution()&&!authenticated&&""==resolvedname) else if(cfg.getRejectNoReverseResolution()&&!authenticated&&""==resolvedname)
{ {
code=cfg.getReturnTempErrorOnReject()?"421":"550"; code=cfg.getReturnTempErrorOnReject()?"421":"550";
mechanism="no reverse resolution"; mechanism="no reverse resolution";
message=code+" Your IP address does not resolve to a hostname."; message=code+" Your IP address does not resolve to a hostname.";
LINF("checking " + mechanism); LINF("checking " + mechanism);
} }
else if(cfg.getCheckHeloAgainstReverse()&&!authenticated&&ehlostr!=resolvedname) else if(cfg.getCheckHeloAgainstReverse()&&!authenticated&&ehlostr!=resolvedname)
{ {
code=cfg.getReturnTempErrorOnReject()?"421":"550"; code=cfg.getReturnTempErrorOnReject()?"421":"550";
mechanism="helo differs from resolved name"; mechanism="helo differs from resolved name";
message=code+" Your IP hostname doesn't match your envelope hostname."; message=code+" Your IP hostname doesn't match your envelope hostname.";
LINF("checking " + mechanism); LINF("checking " + mechanism);
} }
else else
code="250"; code="250";