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/14 17:09:01 UTC
svn commit: r804254 - in
/james/server/sandbox/active/smtp_refactor/smtpserver-function/src:
main/java/org/apache/james/smtpserver/core/filter/fastfail/
test/java/org/apache/james/smtpserver/
Author: norman
Date: Fri Aug 14 15:09:01 2009
New Revision: 804254
URL: http://svn.apache.org/viewvc?rev=804254&view=rev
Log:
Fix one more test
Modified:
james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java
james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
Modified: james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.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/ValidSenderDomainHandler.java?rev=804254&r1=804253&r2=804254&view=diff
==============================================================================
--- james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java (original)
+++ james/server/sandbox/active/smtp_refactor/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java Fri Aug 14 15:09:01 2009
@@ -47,7 +47,6 @@
implements MailHook, Configurable, Serviceable {
private boolean checkAuthNetworks = false;
-
private DNSService dnsServer = null;
@@ -94,14 +93,16 @@
// Not scan the message if relaying allowed
if (session.isRelayingAllowed() && !checkAuthNetworks) {
- return false;
+ getLogger().info("YES");
+
+ return false;
}
Collection records = null;
// try to resolv the provided domain in the senderaddress. If it can not resolved do not accept it.
try {
- records = dnsServer.findMXRecords(senderAddress.getHost());
+ records = dnsServer.findMXRecords(senderAddress.getDomain());
} catch (TemporaryResolutionException e) {
// TODO: Should we reject temporary ?
}
Modified: james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=804254&r1=804253&r2=804254&view=diff
==============================================================================
--- james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java (original)
+++ james/server/sandbox/active/smtp_refactor/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java Fri Aug 14 15:09:01 2009
@@ -545,7 +545,7 @@
public void testSenderDomainResolvRelayClient() throws Exception {
m_testConfiguration.setSenderDomainResolv();
- //m_testConfiguration.setCheckAuthClients(true);
+ m_testConfiguration.setCheckAuthNetworks(true);
finishSetUp(m_testConfiguration);
SMTPClient smtpProtocol1 = new SMTPClient();
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=804254&r1=804253&r2=804254&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 Fri Aug 14 15:09:01 2009
@@ -68,6 +68,7 @@
m_maxMessageSizeKB = kilobytes;
}
+
public int getMaxMessageSize() {
return m_maxMessageSizeKB;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org