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 2006/09/08 23:56:46 UTC
svn commit: r441670 - in /james/server/trunk/src:
java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java
test/org/apache/james/smtpserver/URIRBLHandlerTest.java
Author: norman
Date: Fri Sep 8 14:56:45 2006
New Revision: 441670
URL: http://svn.apache.org/viewvc?view=rev&rev=441670
Log:
Fix junit tests.
Modified:
james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java
james/server/trunk/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java
Modified: james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java?view=diff&rev=441670&r1=441669&r2=441670
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java (original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java Fri Sep 8 14:56:45 2006
@@ -73,8 +73,8 @@
* @see org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
*/
public void configure(Configuration arg0) throws ConfigurationException {
- boolean invalidConfig = false;
-
+ boolean invalidConfig = false;
+
Configuration serverConfiguration = arg0.getChild("uriRblServers", false);
if ( serverConfiguration != null ) {
ArrayList serverCollection = new ArrayList();
@@ -178,6 +178,7 @@
String responseString = null;
String detail = null;
String uRblServer = uRbl.next().toString();
+
dnsServer.getByName(target + "." + uRblServer);
if (getLogger().isInfoEnabled()) {
@@ -209,8 +210,8 @@
}
session.writeResponse(responseString);
- session.abortMessage();
session.setStopHandlerProcessing(true);
+ session.abortMessage();
} catch (UnknownHostException uhe) {
// domain not found. keep processing
@@ -231,8 +232,7 @@
* @param domains HashSet for accumulating domain strings
* @param part MimePart to scan
*/
- private HashSet scanMailForDomains(MimePart part)
- throws MessagingException, IOException {
+ private HashSet scanMailForDomains(MimePart part) throws MessagingException, IOException {
HashSet domains = new HashSet();
getLogger().debug("mime type is: \"" + part.getContentType() + "\"");
Modified: james/server/trunk/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java?view=diff&rev=441670&r1=441669&r2=441670
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java Fri Sep 8 14:56:45 2006
@@ -44,9 +44,10 @@
import org.apache.mailet.Mail;
public class URIRBLHandlerTest extends TestCase {
- private static final String BAD_DOMAIN1 = "bad.domain.multi.surbl.org";
- private static final String BAD_DOMAIN2 = "bad2.domain.multi.surbl.org";
- private static final String GOOD_DOMAIN = "good.domain.multi.surbl.org";
+ private static final String BAD_DOMAIN1 = "bad.domain.de";
+ private static final String BAD_DOMAIN2 = "bad2.domain.de";
+ private static final String GOOD_DOMAIN = "good.domain2.de";
+ private static final String URISERVER = "multi.surbl.org";
private SMTPSession mockedSMTPSession;
private String response = null;
@@ -102,7 +103,11 @@
}
public void setStopHandlerProcessing(boolean processing) {
- this.processing = processing;
+ this.processing = processing;
+ }
+
+ public boolean getStopHandlerProcessing() {
+ return processing;
}
};
@@ -146,7 +151,7 @@
return res;
}
;
- if (BAD_DOMAIN1.equals(hostname)) {
+ if ((BAD_DOMAIN1.substring(4)).equals(hostname)) {
res.add("Blocked - see http://www.surbl.org");
}
return res;
@@ -163,11 +168,11 @@
public InetAddress getByName(String host)
throws UnknownHostException {
- if (BAD_DOMAIN1.equals(host)) {
+ if ((BAD_DOMAIN1.substring(4) + "." + URISERVER).equals(host)) {
return InetAddress.getByName("127.0.0.1");
- } else if (BAD_DOMAIN2.equals(host)) {
+ } else if ((BAD_DOMAIN2.substring(4) + "." + URISERVER).equals(host)) {
return InetAddress.getByName("127.0.0.1");
- } else if (GOOD_DOMAIN.equals(host)) {
+ } else if ((GOOD_DOMAIN.substring(5) + "." + URISERVER).equals(host)) {
return InetAddress.getByName("fesdgaeg.deger");
}
return InetAddress.getByName(host);
@@ -178,10 +183,9 @@
}
public void testNotBlocked() throws IOException, MessagingException {
-
ArrayList servers = new ArrayList();
- servers.add("multi.surbl.org");
+ servers.add(URISERVER);
SMTPSession session = setupMockedSMTPSession(setupMockedMail(setupMockedMimeMessage("http://" + GOOD_DOMAIN + "/")));
@@ -192,14 +196,14 @@
handler.setUriRblServer(servers);
handler.onMessage(session);
+ assertFalse("Not Stop handler processing", session.getStopHandlerProcessing());
assertNull("Email was not rejected", getResponse());
}
public void testBlocked() throws IOException, MessagingException {
-
ArrayList servers = new ArrayList();
- servers.add("multi.surbl.org");
+ servers.add(URISERVER);
SMTPSession session = setupMockedSMTPSession(setupMockedMail(setupMockedMimeMessage("http://" + BAD_DOMAIN1 + "/")));
@@ -210,6 +214,7 @@
handler.setUriRblServer(servers);
handler.onMessage(session);
- assertNull("Email was rejected", getResponse());
+ assertTrue("Stop handler processing", session.getStopHandlerProcessing());
+ assertNotNull("Email was rejected", getResponse());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org