You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2009/08/10 19:46:42 UTC
svn commit: r802872 - in
/james/server/sandbox/active/smtp_refactor/smtpserver-function/src:
main/java/org/apache/james/smtpserver/
main/java/org/apache/james/smtpserver/core/
main/java/org/apache/james/smtpserver/core/filter/fastfail/
test/java/org/ap...
Author: norman
Date: Mon Aug 10 17:46:42 2009
New Revision: 802872
URL: http://svn.apache.org/viewvc?rev=802872&view=rev
Log:
Fix broken test
Remove old imports
Modified:
james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java
james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SendMailHandler.java
james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java
james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
Modified: james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java?rev=802872&r1=802871&r2=802872&view=diff
==============================================================================
--- james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java (original)
+++ james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerChain.java Mon Aug 10 17:46:42 2009
@@ -32,7 +32,6 @@
import org.apache.james.smtpserver.core.CoreCmdHandlerLoader;
import org.apache.james.smtpserver.core.SendMailHandler;
import org.apache.james.smtpserver.core.UnknownCmdHandler;
-import org.apache.james.smtpserver.core.filter.CoreFilterCmdHandlerLoader;
import java.util.ArrayList;
import java.util.Collection;
@@ -77,8 +76,7 @@
|| configuration.getChildren("handler").length == 0) {
configuration = new DefaultConfiguration("handlerchain");
Properties cmds = new Properties();
- cmds.setProperty("Default CoreCmdFilterHandlerLoader",
- CoreFilterCmdHandlerLoader.class.getName());
+
cmds.setProperty("Default CoreCmdHandlerLoader", CoreCmdHandlerLoader.class
.getName());
cmds.setProperty("Default SendMailHandler", SendMailHandler.class
@@ -95,10 +93,7 @@
Configuration[] children = configuration.getChildren("handler");
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- // load the BaseFilterCmdHandler
- loadClass(classLoader, CoreFilterCmdHandlerLoader.class.getName(),
- addHandler(null, CoreFilterCmdHandlerLoader.class.getName()));
-
+
// load the configured handlers
if (children != null) {
for (int i = 0; i < children.length; i++) {
@@ -106,9 +101,7 @@
if (className != null) {
// ignore base handlers.
- if (!className.equals(CoreFilterCmdHandlerLoader.class
- .getName())
- && !className.equals(CoreCmdHandlerLoader.class
+ if (!className.equals(CoreCmdHandlerLoader.class
.getName())
&& !className.equals(SendMailHandler.class
.getName())) {
Modified: james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SendMailHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SendMailHandler.java?rev=802872&r1=802871&r2=802872&view=diff
==============================================================================
--- james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SendMailHandler.java (original)
+++ james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SendMailHandler.java Mon Aug 10 17:46:42 2009
@@ -21,8 +21,7 @@
package org.apache.james.smtpserver.core;
-import org.apache.activemq.transport.stomp.Stomp.Responses;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
Modified: james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java?rev=802872&r1=802871&r2=802872&view=diff
==============================================================================
--- james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java (original)
+++ james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java Mon Aug 10 17:46:42 2009
@@ -166,6 +166,9 @@
* @see org.apache.james.smtpserver.core.PostRcptListener#onRcpt(org.apache.james.smtpserver.SMTPSession, org.apache.mailet.MailAddress)
*/
public String onRcpt(SMTPSession session, MailAddress rcpt) {
+ if (session.isRelayingAllowed()) {
+ return null;
+ }
boolean invalidUser = true;
if (session.getConfigurationData().getUsersRepository().contains(rcpt.getLocalPart()) == true || recipients.contains(rcpt.toString().toLowerCase()) || domains.contains(rcpt.getDomain().toLowerCase())) {
Modified: james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java?rev=802872&r1=802871&r2=802872&view=diff
==============================================================================
--- james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java (original)
+++ james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java Mon Aug 10 17:46:42 2009
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.james.smtpserver.core.CoreCmdHandlerLoader;
-import org.apache.james.smtpserver.core.filter.CoreFilterCmdHandlerLoader;
import org.apache.james.smtpserver.core.filter.fastfail.DNSRBLHandler;
import org.apache.james.smtpserver.core.filter.fastfail.MaxRcptHandler;
import org.apache.james.smtpserver.core.filter.fastfail.ResolvableEhloHeloHandler;
@@ -183,8 +182,6 @@
}
- config.addChild(createHandler(CoreFilterCmdHandlerLoader.class
- .getName(), null));
if (m_heloResolv || m_ehloResolv) {
DefaultConfiguration d = createHandler(
Modified: james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=802872&r1=802871&r2=802872&view=diff
==============================================================================
--- james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Mon Aug 10 17:46:42 2009
@@ -180,17 +180,7 @@
assertNotNull("Rejected",response);
}
-
- public void testNotRejectInvalidUserAuth() throws Exception {
- ValidRcptHandler handler = new ValidRcptHandler();
- ContainerUtil.service(handler, setUpServiceManager());
- SMTPSession session = setupMockedSMTPSession(setupMockedSMTPConfiguration(),false,true,"authedUser");
- ContainerUtil.enableLogging(handler,new MockLogger());
-
- String response = handler.onRcpt(session,new MailAddress(INVALID_USER + "@localhost"));
-
- assertNull("Not rejected",response);
- }
+
public void testNotRejectInvalidUserRelay() throws Exception {
ValidRcptHandler handler = new ValidRcptHandler();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org