Author: norman
Date: Fri Dec 24 12:28:05 2010
New Revision: 1052498
URL: http://svn.apache.org/viewvc?rev=1052498&view=rev
Log:
Adjust code to match latest changes in protocols. This is related to
PROTOCOLS-17
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1052498&r1=1052497&r2=1052498&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
Fri Dec 24 12:28:05 2010
@@ -97,12 +97,6 @@ public class ValidRcptHandler extends Ab
@Override
protected boolean isValidRecipient(SMTPSession session, MailAddress
recipient) {
- if (domains.containsDomain(recipient.getDomain()) == false) {
- session.getLogger().debug("Unknown domain " +
recipient.getDomain() + " so reject it");
-
- return false;
- }
-
String username = recipient.toString();
// check if the server use virtualhosting, if not use only the
localpart
@@ -132,4 +126,12 @@ public class ValidRcptHandler extends Ab
return false;
}
}
+
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.protocols.smtp.core.fastfail.AbstractValidRcptHandler#isLocalDomain(org.apache.james.protocols.smtp.SMTPSession,
java.lang.String)
+ */
+ protected boolean isLocalDomain(SMTPSession session, String domain) {
+ return domains.containsDomain(domain);
+ }
}
Modified:
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=1052498&r1=1052497&r2=1052498&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
(original)
+++
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
Fri Dec 24 12:28:05 2010
@@ -215,13 +215,13 @@ public class ValidRcptHandlerTest extend
assertEquals("Rejected",rCode,HookReturnCode.DENY);
}
- public void testNotRejectInvalidUserRelay() throws Exception {
+ public void testRejectInvalidUserRelay() throws Exception {
MailAddress mailAddress = new MailAddress(INVALID_USER + "@localhost");
SMTPSession session =
setupMockedSMTPSession(setupMockedSMTPConfiguration(),mailAddress,true);
int rCode = handler.doRcpt(session, null, mailAddress).getResult();
- assertEquals("Not rejected",rCode,HookReturnCode.DECLINED);
+ assertEquals("Rejected",rCode,HookReturnCode.DENY);
}
public void testNotRejectValidUser() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
