Author: norman Date: Sat Jul 22 05:36:11 2006 New Revision: 424567 URL: http://svn.apache.org/viewvc?rev=424567&view=rev Log: Forget to fix JAMES-566 when copy the fastfail stuff. Also fix the junit test which was not workin
Modified: james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java Modified: james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java?rev=424567&r1=424566&r2=424567&view=diff ============================================================================== --- james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java (original) +++ james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java Sat Jul 22 05:36:11 2006 @@ -255,10 +255,9 @@ SMTPSession.CURRENT_RECIPIENT); if (blocklisted.equals("true") && // was found in the RBL - ((session.isAuthRequired() && session - .getUser() != null)) && // Not (either an authorized IP - // or (SMTP AUTH is enabled and - // not authenticated)) + !(session.isAuthRequired() && session + .getUser() != null) && // Not (SMTP AUTH is enabled and + // not authenticated) !(recipientAddress.getUser().equalsIgnoreCase("postmaster") || recipientAddress .getUser().equalsIgnoreCase("abuse"))) { Modified: james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java?rev=424567&r1=424566&r2=424567&view=diff ============================================================================== --- james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java (original) +++ james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java Sat Jul 22 05:36:11 2006 @@ -18,7 +18,6 @@ package org.apache.james.smtpserver; -import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.DefaultConfiguration; import org.apache.james.smtpserver.core.CoreCmdHandlerLoader; @@ -151,38 +150,22 @@ DefaultConfiguration config = new DefaultConfiguration("handlerchain"); + // add the rbl handler if (m_useRBL) { - DefaultConfiguration handlerChain = (DefaultConfiguration) handlerConfig - .getChild("handlerchain"); DefaultConfiguration handler = new DefaultConfiguration("handler"); handler.setAttribute("class", DNSRBLHandler.class.getName()); handler.setAttribute("command", "RCPT"); - handlerChain.addChild(handler); - } - // Add Configuration for Helo checks and Ehlo checks - Configuration[] heloConfig = handlerConfig.getChild("handlerchain") - .getChildren("handler"); - for (int i = 0; i < heloConfig.length; i++) { - if (heloConfig[i] instanceof DefaultConfiguration) { - String cmd = ((DefaultConfiguration) heloConfig[i]) - .getAttribute("command", null); - if (cmd == null) { - String className = ((DefaultConfiguration) heloConfig[i]) - .getAttribute("class", null); - - if (DNSRBLHandler.class.getName().equals(className)) { - DefaultConfiguration d = (DefaultConfiguration) heloConfig[i]; - - DefaultConfiguration blacklist = new DefaultConfiguration( - "blacklist"); - blacklist.setValue("bl.spamcop.net"); - DefaultConfiguration rblServers = new DefaultConfiguration( - "rblservers"); - rblServers.addChild(blacklist); - d.addChild(rblServers); - } - } - } + + DefaultConfiguration blacklist = new DefaultConfiguration( + "blacklist"); + blacklist.setValue("bl.spamcop.net"); + DefaultConfiguration rblServers = new DefaultConfiguration( + "rblservers"); + rblServers.addChild(blacklist); + + handler.addChild(rblServers); + config.addChild(handler); + } config.addChild(createHandler(CoreFilterCmdHandlerLoader.class --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]