Author: bago
Date: Tue Jan 2 14:53:59 2007
New Revision: 491961
URL: http://svn.apache.org/viewvc?view=rev&rev=491961
Log:
Minor formatting changes to better overview who calls SMTPSession.getUser()
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SPFHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SPFHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SPFHandler.java?view=diff&rev=491961&r1=491960&r2=491961
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SPFHandler.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SPFHandler.java
Tue Jan 2 14:53:59 2007
@@ -228,9 +228,7 @@
* @see
org.apache.james.smtpserver.hook.RcptHook#doRcpt(org.apache.james.smtpserver.SMTPSession,
org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender,
MailAddress rcpt) {
- if (session.getUser() != null) {
- return new HookResult(HookReturnCode.DECLINED);
- } else {
+ if (session.getUser() == null) {
// Check if session is blocklisted
if (session.getState().get(SPF_BLOCKLISTED)!= null) {
return new
HookResult(HookReturnCode.DENY,DSNStatus.getStatus(DSNStatus.PERMANENT,
DSNStatus.SECURITY_AUTH) + " "
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java?view=diff&rev=491961&r1=491960&r2=491961
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java
Tue Jan 2 14:53:59 2007
@@ -168,7 +168,7 @@
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender,
MailAddress rcpt) {
- if (!session.isRelayingAllowed() && session.getUser() == null) {
+ if (!session.isRelayingAllowed() && session.getUser() == null) {
boolean invalidUser = true;
if
(session.getConfigurationData().getUsersRepository().contains(rcpt.getUser())
== true || recipients.contains(rcpt.toString().toLowerCase()) ||
domains.contains(rcpt.getHost().toLowerCase())) {
@@ -209,10 +209,9 @@
getLogger().info("Rejected message. Unknown user: " +
rcpt.toString());
return new
HookResult(HookReturnCode.DENY,SMTPRetCode.TRANSACTION_FAILED,
DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.ADDRESS_MAILBOX) + " Unknown
user: " + rcpt.toString());
}
- return new HookResult(HookReturnCode.DECLINED);
} else {
getLogger().debug("Sender allowed");
- return new HookResult(HookReturnCode.DECLINED);
}
+ return new HookResult(HookReturnCode.DECLINED);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
