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/05/15 08:14:13 UTC
svn commit: r406548 - in
/james/server/trunk/src/java/org/apache/james/smtpserver:
DNSRBLHandler.java EhloCmdHandler.java HeloCmdHandler.java
Author: norman
Date: Sun May 14 23:14:11 2006
New Revision: 406548
URL: http://svn.apache.org/viewcvs?rev=406548&view=rev
Log:
-Add setMethods. See JAMES-494
-Add default value for configure values
Modified:
james/server/trunk/src/java/org/apache/james/smtpserver/DNSRBLHandler.java
james/server/trunk/src/java/org/apache/james/smtpserver/EhloCmdHandler.java
james/server/trunk/src/java/org/apache/james/smtpserver/HeloCmdHandler.java
Modified: james/server/trunk/src/java/org/apache/james/smtpserver/DNSRBLHandler.java
URL: http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/smtpserver/DNSRBLHandler.java?rev=406548&r1=406547&r2=406548&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/DNSRBLHandler.java (original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/DNSRBLHandler.java Sun May 14 23:14:11 2006
@@ -110,6 +110,7 @@
/**
* Set the whitelist array
+ *
* @param whitelist The array which contains the whitelist
*/
public void setWhitelist(String[] whitelist) {
@@ -118,6 +119,7 @@
/**
* Set the blacklist array
+ *
* @param blacklist The array which contains the blacklist
*/
public void setBlacklist(String[] blacklist) {
@@ -126,6 +128,7 @@
/**
* Set the DNSServer
+ *
* @param dnsServer The DNSServer
*/
public void setDNSServer(DNSServer dnsServer) {
@@ -133,8 +136,9 @@
}
/**
+ * Set for try to get a TXT record for the blocked record.
*
- * @param getDetail
+ * @param getDetail Set to ture for enable
*/
public void setGetDetail(boolean getDetail) {
this.getDetail = getDetail;
Modified: james/server/trunk/src/java/org/apache/james/smtpserver/EhloCmdHandler.java
URL: http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/smtpserver/EhloCmdHandler.java?rev=406548&r1=406547&r2=406548&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/EhloCmdHandler.java (original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/EhloCmdHandler.java Sun May 14 23:14:11 2006
@@ -55,12 +55,12 @@
public void configure(Configuration handlerConfiguration) throws ConfigurationException {
Configuration configuration = handlerConfiguration.getChild("checkValidEhlo",false);
if(configuration != null) {
- checkValidEhlo = configuration.getValueAsBoolean();
+ setCheckValidEhlo(configuration.getValueAsBoolean(false));
}
Configuration configRelay = handlerConfiguration.getChild("checkAuthNetworks",false);
if(configRelay != null) {
- checkAuthNetworks = configRelay.getValueAsBoolean();
+ setCheckAuthNetworks(configRelay.getValueAsBoolean(false));
}
}
@@ -68,7 +68,34 @@
* @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
*/
public void service(ServiceManager serviceMan) throws ServiceException {
- dnsServer = (DNSServer) serviceMan.lookup(DNSServer.ROLE);
+ setDnsServer((DNSServer) serviceMan.lookup(DNSServer.ROLE));
+ }
+
+ /**
+ * Set to true to enable check for valid EHLO
+ *
+ * @param checkValidEhlo Set to true for enable check
+ */
+ public void setCheckValidEhlo(boolean checkValidEhlo) {
+ this.checkValidEhlo = checkValidEhlo;
+ }
+
+ /**
+ * Set to true if AuthNetworks should be included in the EHLO check
+ *
+ * @param checkAuthNetworks Set to true to enable
+ */
+ public void setCheckAuthNetworks(boolean checkAuthNetworks) {
+ this.checkAuthNetworks = checkAuthNetworks;
+ }
+
+ /**
+ * Set the DNSServer
+ *
+ * @param dnsServer The DNSServer
+ */
+ public void setDnsServer(DNSServer dnsServer) {
+ this.dnsServer = dnsServer;
}
/*
Modified: james/server/trunk/src/java/org/apache/james/smtpserver/HeloCmdHandler.java
URL: http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/smtpserver/HeloCmdHandler.java?rev=406548&r1=406547&r2=406548&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/HeloCmdHandler.java (original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/HeloCmdHandler.java Sun May 14 23:14:11 2006
@@ -54,12 +54,12 @@
public void configure(Configuration handlerConfiguration) throws ConfigurationException {
Configuration configuration = handlerConfiguration.getChild("checkValidHelo",false);
if(configuration != null) {
- checkValidHelo = configuration.getValueAsBoolean();
+ setCheckValidHelo(configuration.getValueAsBoolean(false));
}
Configuration configRelay = handlerConfiguration.getChild("checkAuthNetworks",false);
if(configRelay != null) {
- checkAuthNetworks = configRelay.getValueAsBoolean();
+ setCheckAuthNetworks(configRelay.getValueAsBoolean(false));
}
}
@@ -70,6 +70,34 @@
public void service(ServiceManager serviceMan) throws ServiceException {
dnsServer = (DNSServer) serviceMan.lookup(DNSServer.ROLE);
}
+
+ /**
+ * Set to true to enable check for valid EHLO
+ *
+ * @param checkValidHelo Set to true for enable check
+ */
+ public void setCheckValidHelo(boolean checkValidHelo) {
+ this.checkValidHelo = checkValidHelo;
+ }
+
+ /**
+ * Set to true if AuthNetworks should be included in the EHLO check
+ *
+ * @param checkAuthNetworks Set to true to enable
+ */
+ public void setCheckAuthNetworks(boolean checkAuthNetworks) {
+ this.checkAuthNetworks = checkAuthNetworks;
+ }
+
+ /**
+ * Set the DNSServer
+ *
+ * @param dnsServer The DNSServer
+ */
+ public void setDnsServer(DNSServer dnsServer) {
+ this.dnsServer = dnsServer;
+ }
+
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org