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 ba...@apache.org on 2006/09/20 14:13:20 UTC
svn commit: r448185 - in /james/jspf/trunk/src:
main/java/org/apache/james/jspf/ main/java/org/apache/james/jspf/core/
main/java/org/apache/james/jspf/terms/ test/java/org/apache/james/jspf/
test/resources/org/apache/james/jspf/
Author: bago
Date: Wed Sep 20 05:13:19 2006
New Revision: 448185
URL: http://svn.apache.org/viewvc?view=rev&rev=448185
Log:
Removed masks from DNSService calls: we return single IP. The caller will have to handle masking.
We now pass all tests but 1 IPv6 test (See JSPF-25)
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/DNSServiceXBillImpl.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AMechanism.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP6Mechanism.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java
james/jspf/trunk/src/test/java/org/apache/james/jspf/LoggingDNSService.java
james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1TestMZMockDNSService.java
james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1TestMockDNSService.java
james/jspf/trunk/src/test/java/org/apache/james/jspf/SPFYamlTest.java
james/jspf/trunk/src/test/resources/org/apache/james/jspf/test_parser.txt
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/DNSServiceXBillImpl.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/DNSServiceXBillImpl.java?view=diff&rev=448185&r1=448184&r2=448185
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/DNSServiceXBillImpl.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/DNSServiceXBillImpl.java Wed Sep 20 05:13:19 2006
@@ -76,9 +76,6 @@
// do DNS lookup for TXT
txtR = getTXTRecords(hostname);
-
- System.err.println("CIM:");
-
// process returned records
if (!txtR.isEmpty()) {
@@ -90,6 +87,7 @@
// remove '"'
compare = compare.toLowerCase().substring(1,
compare.length() - 1);
+
if (compare.startsWith(spfVersion + " ")) {
if (returnValue == null) {
returnValue = compare;
@@ -164,12 +162,11 @@
* @see org.apache.james.jspf.core.DNSService#getARecords(java.lang.String,
* int)
*/
- public List getARecords(String strServer, int mask) throws NoneException,
+ public List getARecords(String strServer) throws NoneException,
PermErrorException, TempErrorException {
ArrayList listTxtData = new ArrayList();
- System.err.println("server: " + strServer);
if (IPAddr.isIPAddr(strServer)) {
IPAddr ipTest = IPAddr.getAddress(strServer);
// Address is already an IP address, so add it to list
@@ -193,18 +190,11 @@
for (int i = 0; i < records.length; i++) {
ARecord a = (ARecord) records[i];
+
+ IPAddr ip = IPAddr.getAddress(a.getAddress().getHostAddress());
- ArrayList ipArray = getIPList(a.getAddress()
- .getHostAddress(), mask);
- Iterator ip = ipArray.iterator();
- System.err.println("IP: " + ip);
-
- while (ip.hasNext()) {
- Object ipA = ip.next();
-
- log.debug("Add ipAddress " + ipA + " to list");
- listTxtData.add(ipA);
- }
+ log.debug("Add ipAddress " + ip + " to list");
+ listTxtData.add(ip);
}
} else {
throw new NoneException("No A record found for: "
@@ -226,7 +216,7 @@
* @see org.apache.james.jspf.core.DNSService#getAAAARecords(java.lang.String,
* int)
*/
- public List getAAAARecords(String strServer, int mask)
+ public List getAAAARecords(String strServer)
throws NoneException, PermErrorException, TempErrorException {
ArrayList listTxtData = new ArrayList();
@@ -255,16 +245,11 @@
for (int i = 0; i < records.length; i++) {
AAAARecord a = (AAAARecord) records[i];
- ArrayList ipArray = getIPList(a.getAddress()
- .getHostAddress(), mask);
- Iterator ip = ipArray.iterator();
-
- while (ip.hasNext()) {
- Object ipA = ip.next();
- //IPAddr ipA = (IPAddr) ip.next();
- log.debug("Add ipAddress " + ipA + " to list");
- listTxtData.add(ipA);
- }
+ IPAddr ip = IPAddr.getAddress(a.getAddress()
+ .getHostAddress());
+
+ log.debug("Add ipAddress " + ip + " to list");
+ listTxtData.add(ip);
}
} else {
throw new NoneException("No AAAA record found for: "
@@ -295,7 +280,7 @@
* @throws PermErrorException
* if an PermError should be returned
*/
- private ArrayList getAList(ArrayList addressList, int maskLength)
+ private ArrayList getAList(ArrayList addressList)
throws PermErrorException {
ArrayList listAddresses = new ArrayList();
@@ -304,7 +289,7 @@
for (int i = 0; i < addressList.size(); i++) {
aValue = addressList.get(i).toString();
try {
- listAddresses.addAll(getARecords(aValue, maskLength));
+ listAddresses.addAll(getARecords(aValue));
} catch (Exception e) {
// Carry on regardless?
}
@@ -387,37 +372,11 @@
* @see org.apache.james.jspf.core.DNSService#getMXRecords(java.lang.String,
* int)
*/
- public List getMXRecords(String domainName, int mask)
+ public List getMXRecords(String domainName)
throws PermErrorException, NoneException, TempErrorException {
- ArrayList mxAddresses = getAList(getMXNames(domainName), mask);
- return mxAddresses;
-
- }
- /**
- * Get an ArrayList of IPAddr's given the DNS type and mask
- *
- * @param host
- * The hostname or ip of the server for which we want to get the
- * ips
- * @param mask
- * The netmask
- * @return ipAddresses Array which contains all ipAddresses
- */
- private static ArrayList getIPList(String host, int mask)
- throws PermErrorException {
-
- ArrayList listIP = new ArrayList();
-
- try {
- if (host != null) {
- listIP.addAll(IPAddr.getAddresses(host, mask));
- }
- } catch (Exception e1) {
- throw new PermErrorException(e1.getMessage());
- }
-
- return listIP;
+ ArrayList mxAddresses = getAList(getMXNames(domainName));
+ return mxAddresses;
}
@@ -450,7 +409,7 @@
if ((queryResult != Lookup.TRY_AGAIN)) {
if (records != null) {
log.debug("Found " + records.length + " MX-Records");
-
+
// check if the maximum lookup count is reached
if (records.length >= SPF1Data.MAX_DEPTH) throw new PermErrorException("Maximum MX lookup count reached");
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java?view=diff&rev=448185&r1=448184&r2=448185
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java Wed Sep 20 05:13:19 2006
@@ -53,12 +53,10 @@
throws PermErrorException, NoneException, TempErrorException;
/**
- * Get a list of IPAddr's for a server using the mask length
+ * Get a list of IPAddr's for a server
*
* @param strServer
* The hostname or ipAddress whe should get the A-Records for
- * @param mask
- * The netmask to use
* @return The ipAddresses
* @throws NoneException
* if no A records was found
@@ -67,16 +65,14 @@
* @throws TempErrorException
* if the lookup result was "TRY_AGAIN"
*/
- public List getARecords(String strServer, int mask) throws NoneException,
+ public List getARecords(String strServer) throws NoneException,
PermErrorException, TempErrorException;
/**
- * Get a list of IPAddr's for a server using the mask length
+ * Get a list of IPAddr's for a server
*
* @param strServer
* The hostname or ipAddress whe should get the AAAA-Records for
- * @param mask
- * The netmask to use
* @return The ipAddresses
* @throws NoneException
* if no AAAA records was found
@@ -85,7 +81,7 @@
* @throws TempErrorException
* if the lookup result was "TRY_AGAIN"
*/
- public List getAAAARecords(String strServer, int mask)
+ public List getAAAARecords(String strServer)
throws NoneException, PermErrorException, TempErrorException;
/**
@@ -126,8 +122,6 @@
*
* @param domainName
* The domainName or ipaddress we want to get the ips for
- * @param mask
- * The netmask
* @return IPAddresses of the MX-Records
* @throws NoneException
* if no MX-Record was found
@@ -136,7 +130,7 @@
* @throws TempErrorException
* if the lookup result was "TRY_AGAIN"
*/
- public List getMXRecords(String domainName, int mask)
+ public List getMXRecords(String domainName)
throws PermErrorException, NoneException, TempErrorException;
/**
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AMechanism.java?view=diff&rev=448185&r1=448184&r2=448185
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AMechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AMechanism.java Wed Sep 20 05:13:19 2006
@@ -29,7 +29,6 @@
import org.apache.james.jspf.util.Inet6Util;
import org.apache.james.jspf.util.ConfigurationMatch;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -55,8 +54,6 @@
*/
public boolean run(SPF1Data spfData) throws PermErrorException,
TempErrorException {
- ArrayList addressList = new ArrayList();
-
// update currentDepth
spfData.setCurrentDepth(spfData.getCurrentDepth() + 1);
@@ -71,19 +68,17 @@
getIp4cidr());
try {
- List aRecords =spfData.getDnsProbe().getARecords(host,getIp4cidr());
+ List aRecords =spfData.getDnsProbe().getARecords(host);
- if (aRecords != null) {
- addressList.addAll(aRecords);
- } else {
+ if (aRecords == null) {
return false;
}
// We should match if any A Record was found!
- if (addressList.size() > 0 && spfData.matchAnyARecord()) return true;
+ if (aRecords.size() > 0 && spfData.matchAnyARecord()) return true;
- if (checkAddressList(checkAddress, addressList)) {
+ if (checkAddressList(checkAddress, aRecords, getIp4cidr())) {
return true;
}
} catch (NoneException e) {
@@ -96,19 +91,17 @@
getIp6cidr());
try {
- List aaaaRecords =spfData.getDnsProbe().getAAAARecords(host, getIp6cidr());
+ List aaaaRecords =spfData.getDnsProbe().getAAAARecords(host);
- if (aaaaRecords != null) {
- addressList.addAll(aaaaRecords);
- } else {
+ if (aaaaRecords == null) {
return false;
}
// We should match if any A Record was found!
- if (addressList.size() > 0 && spfData.matchAnyAAAARecord()) return true;
+ if (aaaaRecords.size() > 0 && spfData.matchAnyAAAARecord()) return true;
- if (checkAddressList(checkAddress, addressList)) {
+ if (checkAddressList(checkAddress, aaaaRecords, getIp6cidr())) {
return true;
}
} catch (NoneException e) {
@@ -158,18 +151,18 @@
* @return true or false
* @throws PermErrorException
*/
- public boolean checkAddressList(IPAddr checkAddress, List addressList) throws PermErrorException {
+ public boolean checkAddressList(IPAddr checkAddress, List addressList, int cidr) throws PermErrorException {
- IPAddr aValue = null;
for (int i = 0; i < addressList.size(); i++) {
- Object ip = addressList.get(i);
+ IPAddr ip = (IPAddr) addressList.get(i);
// Check for empty record
if (ip != null) {
- aValue = (IPAddr.getAddress(ip.toString()));
-
+ // set the mask in the address.
+ // TODO should we use cidr from the parameters or the input checkAddress cidr?
+ ip.setMask(checkAddress.getMaskLength());
if (checkAddress.getMaskedIPAddress().equals(
- aValue.getMaskedIPAddress()) || checkAddress.toString().equals(ip.toString()) ) {
+ ip.getMaskedIPAddress())) {
return true;
}
}
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java?view=diff&rev=448185&r1=448184&r2=448185
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java Wed Sep 20 05:13:19 2006
@@ -59,7 +59,7 @@
}
try {
- aRecords = spfData.getDnsProbe().getARecords(host, 32);
+ aRecords = spfData.getDnsProbe().getARecords(host);
} catch (Exception e) {
e.printStackTrace();
return false;
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP6Mechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP6Mechanism.java?view=diff&rev=448185&r1=448184&r2=448185
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP6Mechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP6Mechanism.java Wed Sep 20 05:13:19 2006
@@ -38,8 +38,10 @@
* @see org.apache.james.jspf.terms.IP4Mechanism#isValidAddress(String)
*/
protected boolean isValidAddress(String ipString) {
- System.err.println("IP6: " + ipString);
- return Inet6Util.isValidIP6Address(ipString);
+ // TODO: this check is not accurate ":CAFE::BABE" pass the test but is invalid
+ boolean res = Inet6Util.isValidIP6Address(ipString);
+ // System.err.println("IP6: " + ipString + " valid? "+res);
+ return res;
}
/**
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java?view=diff&rev=448185&r1=448184&r2=448185
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java Wed Sep 20 05:13:19 2006
@@ -27,7 +27,6 @@
import org.apache.james.jspf.exceptions.TempErrorException;
import org.apache.james.jspf.parser.SPF1Parser;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -50,7 +49,6 @@
*/
public boolean run(SPF1Data spfData) throws PermErrorException,
TempErrorException{
- ArrayList addressList = new ArrayList();
IPAddr checkAddress;
// update currentDepth
@@ -63,26 +61,27 @@
checkAddress = IPAddr.getAddress(spfData.getIpAddress(), getIp4cidr());
try {
- List mxRecords = spfData.getDnsProbe().getMXRecords(host,getIp4cidr());
+ List mxRecords = spfData.getDnsProbe().getMXRecords(host);
// should never happen.
if (mxRecords == null) return false;
- addressList.addAll(mxRecords);
- } catch (NoneException e ) {
- e.printStackTrace();
- return false;
- }
- try {
- if (checkAddressList(checkAddress, addressList)) {
- return true;
+ try {
+ if (checkAddressList(checkAddress, mxRecords, getIp4cidr())) {
+ return true;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new PermErrorException("No valid ipAddress: "
+ + spfData.getIpAddress());
}
- } catch (Exception e) {
+
+ } catch (NoneException e ) {
e.printStackTrace();
- throw new PermErrorException("No valid ipAddress: "
- + spfData.getIpAddress());
+ return false;
}
+
// No match found
return false;
}
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java?view=diff&rev=448185&r1=448184&r2=448185
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java Wed Sep 20 05:13:19 2006
@@ -70,7 +70,7 @@
// Get a record for this
List aList = spfData.getDnsProbe().getARecords(
- (String) domainList.get(i), 32);
+ (String) domainList.get(i));
for (int j = 0; j < aList.size(); j++) {
compareIP = (IPAddr) aList.get(j);
if (compareIP.toString().equals(spfData.getIpAddress())) {
Modified: james/jspf/trunk/src/test/java/org/apache/james/jspf/LoggingDNSService.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/LoggingDNSService.java?view=diff&rev=448185&r1=448184&r2=448185
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/LoggingDNSService.java (original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/LoggingDNSService.java Wed Sep 20 05:13:19 2006
@@ -76,13 +76,12 @@
}
- public List getAAAARecords(String strServer, int mask)
+ public List getAAAARecords(String strServer)
throws NoneException, PermErrorException, TempErrorException {
try {
- List res = dnsService.getAAAARecords(strServer, mask);
- System.out.print("getAAAARecords(" + strServer + "," + mask
- + ") = ");
+ List res = dnsService.getAAAARecords(strServer);
+ System.out.print("getAAAARecords(" + strServer + ") = ");
if (res != null) {
for (int i = 0; i < res.size(); i++) {
System.out.print(res.get(i));
@@ -98,25 +97,22 @@
return res;
} catch (TempErrorException e) {
- System.out.println("getAAAARecords(" + strServer + "," + mask
- + ") = TermErrorException[" + e.getMessage() + "]");
+ System.out.println("getAAAARecords(" + strServer + ") = TermErrorException[" + e.getMessage() + "]");
throw e;
} catch (PermErrorException e) {
- System.out.println("getAAAARecords(" + strServer + "," + mask
- + ") = PermErrorException[" + e.getMessage() + "]");
+ System.out.println("getAAAARecords(" + strServer + ") = PermErrorException[" + e.getMessage() + "]");
throw e;
} catch (NoneException e) {
- System.out.println("getAAAARecords(" + strServer + "," + mask
- + ") = NoneException[" + e.getMessage() + "]");
+ System.out.println("getAAAARecords(" + strServer + ") = NoneException[" + e.getMessage() + "]");
throw e;
}
}
- public List getARecords(String strServer, int mask) throws NoneException,
+ public List getARecords(String strServer) throws NoneException,
PermErrorException, TempErrorException {
try {
- List res = dnsService.getARecords(strServer, mask);
- System.out.print("getARecords(" + strServer + "," + mask + ") = ");
+ List res = dnsService.getARecords(strServer);
+ System.out.print("getARecords(" + strServer + ") = ");
if (res != null) {
for (int i = 0; i < res.size(); i++) {
System.out.print(res.get(i));
@@ -132,16 +128,13 @@
return res;
} catch (TempErrorException e) {
- System.out.println("getARecords(" + strServer + "," + mask
- + ") = TermErrorException[" + e.getMessage() + "]");
+ System.out.println("getARecords(" + strServer + ") = TermErrorException[" + e.getMessage() + "]");
throw e;
} catch (PermErrorException e) {
- System.out.println("getARecords(" + strServer + "," + mask
- + ") = PermErrorException[" + e.getMessage() + "]");
+ System.out.println("getARecords(" + strServer + ") = PermErrorException[" + e.getMessage() + "]");
throw e;
} catch (NoneException e) {
- System.out.println("getARecords(" + strServer + "," + mask
- + ") = NoneException[" + e.getMessage() + "]");
+ System.out.println("getARecords(" + strServer + ") = NoneException[" + e.getMessage() + "]");
throw e;
}
@@ -215,12 +208,12 @@
return new ArrayList(Arrays.asList(ips));
}
- public List getMXRecords(String domainName, int mask)
+ public List getMXRecords(String domainName)
throws PermErrorException, NoneException, TempErrorException {
try {
- List res = dnsService.getMXRecords(domainName, mask);
+ List res = dnsService.getMXRecords(domainName);
System.out
- .print("getMXRecords(" + domainName + "," + mask + ") = ");
+ .print("getMXRecords(" + domainName + ") = ");
if (res != null) {
for (int i = 0; i < res.size(); i++) {
System.out.print(res.get(i));
@@ -235,16 +228,13 @@
}
return res;
} catch (TempErrorException e) {
- System.out.println("getMXRecords(" + domainName + "," + mask
- + ") = TempErrorException[" + e.getMessage() + "]");
+ System.out.println("getMXRecords(" + domainName + ") = TempErrorException[" + e.getMessage() + "]");
throw e;
} catch (PermErrorException e) {
- System.out.println("getMXRecords(" + domainName + "," + mask
- + ") = ErrorException[" + e.getMessage() + "]");
+ System.out.println("getMXRecords(" + domainName + ") = ErrorException[" + e.getMessage() + "]");
throw e;
} catch (NoneException e) {
- System.out.println("getMXRecords(" + domainName + "," + mask
- + ") = NoneException[" + e.getMessage() + "]");
+ System.out.println("getMXRecords(" + domainName + ") = NoneException[" + e.getMessage() + "]");
throw e;
}
Modified: james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1TestMZMockDNSService.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1TestMZMockDNSService.java?view=diff&rev=448185&r1=448184&r2=448185
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1TestMZMockDNSService.java (original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1TestMZMockDNSService.java Wed Sep 20 05:13:19 2006
@@ -171,217 +171,179 @@
throw new IllegalStateException("Mock data not available");
}
- public List getAAAARecords(String strServer, int mask)
+ public List getAAAARecords(String strServer)
throws NoneException, PermErrorException, TempErrorException {
throw new IllegalStateException("Mock data not available");
}
- public List getARecords(String strServer, int mask) throws NoneException,
+ public List getARecords(String strServer) throws NoneException,
PermErrorException, TempErrorException {
- if (mask == 32
- && "1.bob.lp._spf.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32
- && "1.joe.lp._spf.spf1-test.mailzone.com".equals(strServer))
+ if ("1.bob.lp._spf.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("127.0.0.2");
+ if ("1.joe.lp._spf.spf1-test.mailzone.com".equals(strServer))
throw new NoneException(
"No A record found for: 1.joe.lp._spf.spf1-test.mailzone.com");
- if (mask == 32
- && "100.2.0.192.in-addr._spf.40.spf1-test.mailzone.com"
+ if ("100.2.0.192.in-addr._spf.40.spf1-test.mailzone.com"
.equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32
- && "100.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
+ return getAddressList("127.0.0.2");
+ if ("100.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 100.2.0.192.in-addr._spf.42.spf1-test.mailzone.com");
- if (mask == 32
- && "100.2.0.192.in-addr._spf.spf1-test.mailzone.com"
+ if ("100.2.0.192.in-addr._spf.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 100.2.0.192.in-addr._spf.spf1-test.mailzone.com");
- if (mask == 32
- && "100.2.0.192.in-addr._spf.spf1-test.mailzone.com"
+ if ("100.2.0.192.in-addr._spf.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 100.2.0.192.in-addr._spf.spf1-test.mailzone.com");
- if (mask == 32
- && "101.2.0.192.in-addr._spf.40.spf1-test.mailzone.com"
+ if ("101.2.0.192.in-addr._spf.40.spf1-test.mailzone.com"
.equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32
- && "102.2.0.192.in-addr._spf.40.spf1-test.mailzone.com"
+ return getAddressList("127.0.0.2");
+ if ("102.2.0.192.in-addr._spf.40.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 102.2.0.192.in-addr._spf.40.spf1-test.mailzone.com");
- if (mask == 32
- && "110.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
+ if ("110.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 110.2.0.192.in-addr._spf.42.spf1-test.mailzone.com");
- if (mask == 32
- && "110.2.0.192.in-addr._spf.spf1-test.mailzone.com"
+ if ("110.2.0.192.in-addr._spf.spf1-test.mailzone.com"
.equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32
- && "111.2.0.192.in-addr._spf.spf1-test.mailzone.com"
- .equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32 && "111.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("192.0.2.200", mask);
- if (mask == 32 && "112.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("192.0.2.200", mask);
- if (mask == 32 && "113.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("192.0.2.200", mask);
- if (mask == 32 && "114.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("192.0.2.200", mask);
- if (mask == 32 && "115.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("192.0.2.200", mask);
- if (mask == 32 && "116.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("192.0.2.200", mask);
- if (mask == 32
- && "130.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
- .equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32
- && "131.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
- .equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32
- && "2.bob.lp._spf.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32 && "20.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("192.0.2.120", mask);
- if (mask == 32
- && "200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
+ return getAddressList("127.0.0.2");
+ if ("111.2.0.192.in-addr._spf.spf1-test.mailzone.com"
+ .equals(strServer))
+ return getAddressList("127.0.0.2");
+ if ("111.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("192.0.2.200");
+ if ("112.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("192.0.2.200");
+ if ("113.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("192.0.2.200");
+ if ("114.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("192.0.2.200");
+ if ("115.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("192.0.2.200");
+ if ("116.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("192.0.2.200");
+ if ("130.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
+ .equals(strServer))
+ return getAddressList("127.0.0.2");
+ if ("131.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
+ .equals(strServer))
+ return getAddressList("127.0.0.2");
+ if ("2.bob.lp._spf.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("127.0.0.2");
+ if ("20.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("192.0.2.120");
+ if ("200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com");
- if (mask == 32
- && "200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
+ if ("200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com");
- if (mask == 32
- && "200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
+ if ("200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com");
- if (mask == 32
- && "200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
+ if ("200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com");
- if (mask == 32
- && "200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
+ if ("200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com");
- if (mask == 32
- && "200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
+ if ("200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 200.2.0.192.in-addr._spf.42.spf1-test.mailzone.com");
- if (mask == 32
- && "200.2.0.192.in-addr._spf.spf1-test.mailzone.com"
+ if ("200.2.0.192.in-addr._spf.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 200.2.0.192.in-addr._spf.spf1-test.mailzone.com");
- if (mask == 32
- && "200.2.0.192.in-addr._spf.spf1-test.mailzone.com"
+ if ("200.2.0.192.in-addr._spf.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 200.2.0.192.in-addr._spf.spf1-test.mailzone.com");
- if (mask == 32
- && "200.2.0.192.in-addr._spf.spf1-test.mailzone.com"
+ if ("200.2.0.192.in-addr._spf.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 200.2.0.192.in-addr._spf.spf1-test.mailzone.com");
- if (mask == 32
- && "200.2.0.192.in-addr._spf.spf1-test.mailzone.com"
+ if ("200.2.0.192.in-addr._spf.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 200.2.0.192.in-addr._spf.spf1-test.mailzone.com");
- if (mask == 32
- && "200.2.0.192.in-addr._spf.spf1-test.mailzone.com"
+ if ("200.2.0.192.in-addr._spf.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 200.2.0.192.in-addr._spf.spf1-test.mailzone.com");
- if (mask == 32
- && "200.2.0.192.in-addr._spf.spf1-test.mailzone.com"
+ if ("200.2.0.192.in-addr._spf.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 200.2.0.192.in-addr._spf.spf1-test.mailzone.com");
- if (mask == 32
- && "208.210.124.1.whitelist.spf1-test.mailzone.com"
+ if ("208.210.124.1.whitelist.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 208.210.124.1.whitelist.spf1-test.mailzone.com");
- if (mask == 32
- && "208.210.124.180.whitelist.spf1-test.mailzone.com"
+ if ("208.210.124.180.whitelist.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 208.210.124.180.whitelist.spf1-test.mailzone.com");
- if (mask == 32
- && "208.210.124.180.whitelist.spf1-test.mailzone.com"
+ if ("208.210.124.180.whitelist.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 208.210.124.180.whitelist.spf1-test.mailzone.com");
- if (mask == 32 && "22.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("192.0.2.122", mask);
- if (mask == 32 && "30.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("208.210.124.130", mask);
- if (mask == 32 && "31.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("208.210.124.131", mask);
- if (mask == 32
- && "4.24.236.64.in-addr._spf.80.spf1-test.mailzone.com"
+ if ("22.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("192.0.2.122");
+ if ("30.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("208.210.124.130");
+ if ("31.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("208.210.124.131");
+ if ("4.24.236.64.in-addr._spf.80.spf1-test.mailzone.com"
.equals(strServer))
throw new NoneException(
"No A record found for: 4.24.236.64.in-addr._spf.80.spf1-test.mailzone.com");
- if (mask == 32 && "45.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("192.0.2.147,192.0.2.145,192.0.2.146", mask);
- if (mask == 32 && "80.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("208.210.124.180", mask);
- if (mask == 32
- && "80.spf1-test.mailzone.com.whitelist.spf1-test.mailzone.com"
- .equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32
- && "80.2.0.192.in-addr._spf.80.spf1-test.mailzone.com"
- .equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32
- && "96.spf1-test.mailzone.com.blacklist.spf1-test.mailzone.com"
- .equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32
- && "97.spf1-test.mailzone.com.blacklist.spf1-test.mailzone.com"
- .equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 26 && "98.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("192.0.2.98", mask);
- if (mask == 32
- && "bob.lp._spf.spf1-test.mailzone.com".equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32
- && "droid.lp._spf.spf1-test.mailzone.com".equals(strServer))
+ if ("45.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("192.0.2.147,192.0.2.145,192.0.2.146");
+ if ("80.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("208.210.124.180");
+ if ("80.spf1-test.mailzone.com.whitelist.spf1-test.mailzone.com"
+ .equals(strServer))
+ return getAddressList("127.0.0.2");
+ if ("80.2.0.192.in-addr._spf.80.spf1-test.mailzone.com"
+ .equals(strServer))
+ return getAddressList("127.0.0.2");
+ if ("96.spf1-test.mailzone.com.blacklist.spf1-test.mailzone.com"
+ .equals(strServer))
+ return getAddressList("127.0.0.2");
+ if ("97.spf1-test.mailzone.com.blacklist.spf1-test.mailzone.com"
+ .equals(strServer))
+ return getAddressList("127.0.0.2");
+ // this was with mask 26.. let's check!
+ if ("98.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("192.0.2.98");
+ if ("bob.lp._spf.spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("127.0.0.2");
+ if ("droid.lp._spf.spf1-test.mailzone.com".equals(strServer))
throw new NoneException(
"No A record found for: droid.lp._spf.spf1-test.mailzone.com");
- if (mask == 32
- && "joe-2.lp._spf.spf1-test.mailzone.com".equals(strServer))
+ if ("joe-2.lp._spf.spf1-test.mailzone.com".equals(strServer))
throw new NoneException(
"No A record found for: joe-2.lp._spf.spf1-test.mailzone.com");
- if (mask == 32
- && "moe-1.lp._spf.spf1-test.mailzone.com".equals(strServer))
+ if ("moe-1.lp._spf.spf1-test.mailzone.com".equals(strServer))
throw new NoneException(
"No A record found for: moe-1.lp._spf.spf1-test.mailzone.com");
- if (mask == 32
- && "postmaster.lp._spf.spf1-test.mailzone.com"
+ if ("postmaster.lp._spf.spf1-test.mailzone.com"
.equals(strServer))
- return getAddressList("127.0.0.2", mask);
- if (mask == 32 && "spf1-test.mailzone.com".equals(strServer))
- return getAddressList("208.210.124.192,192.0.2.200", mask);
- if (mask == 32 && "www1.cnn.com".equals(strServer))
- return getAddressList("64.236.24.4", mask);
+ return getAddressList("127.0.0.2");
+ if ("spf1-test.mailzone.com".equals(strServer))
+ return getAddressList("208.210.124.192,192.0.2.200");
+ if ("www1.cnn.com".equals(strServer))
+ return getAddressList("64.236.24.4");
throw new IllegalStateException("Mock data not available");
}
@@ -413,51 +375,47 @@
throw new IllegalStateException("Mock data not available");
}
- public List getAddressList(String list, int mask) throws PermErrorException {
+ public List getAddressList(String list) throws PermErrorException {
if (list == null || "".equals(list)) {
return new ArrayList();
}
String[] s = list.split(",");
IPAddr[] ips = new IPAddr[s.length];
for (int i = 0; i < s.length; i++) {
- ips[i] = IPAddr.getAddress(s[i], mask);
+ ips[i] = IPAddr.getAddress(s[i]);
}
return new ArrayList(Arrays.asList(ips));
}
- public List getMXRecords(String domainName, int mask)
+ public List getMXRecords(String domainName)
throws PermErrorException, NoneException, TempErrorException {
- if (mask == 32 && "10.spf1-test.mailzone.com".equals(domainName))
+ if ("10.spf1-test.mailzone.com".equals(domainName))
return getAddressList(
- "192.0.2.23,192.0.2.20,192.0.2.21,192.0.2.22,192.0.2.30,192.0.2.31,192.0.2.32,192.0.2.33,192.0.2.12,192.0.2.13,192.0.2.10,192.0.2.11",
- mask);
- if (mask == 32 && "12.spf1-test.mailzone.com".equals(domainName))
+ "192.0.2.23,192.0.2.20,192.0.2.21,192.0.2.22,192.0.2.30,192.0.2.31,192.0.2.32,192.0.2.33,192.0.2.12,192.0.2.13,192.0.2.10,192.0.2.11");
+ if ("12.spf1-test.mailzone.com".equals(domainName))
return getAddressList(
- "192.0.2.23,192.0.2.20,192.0.2.21,192.0.2.22,192.0.2.30,192.0.2.31,192.0.2.32,192.0.2.33,192.0.2.12,192.0.2.13,192.0.2.10,192.0.2.11",
- mask);
- if (mask == 32 && "14.spf1-test.mailzone.com".equals(domainName))
+ "192.0.2.23,192.0.2.20,192.0.2.21,192.0.2.22,192.0.2.30,192.0.2.31,192.0.2.32,192.0.2.33,192.0.2.12,192.0.2.13,192.0.2.10,192.0.2.11");
+ if ("14.spf1-test.mailzone.com".equals(domainName))
return getAddressList(
- "192.0.2.23,192.0.2.20,192.0.2.21,192.0.2.22,192.0.2.30,192.0.2.31,192.0.2.32,192.0.2.33,192.0.2.12,192.0.2.13,192.0.2.10,192.0.2.11",
- mask);
- if (mask == 32 && "111.spf1-test.mailzone.com".equals(domainName))
+ "192.0.2.23,192.0.2.20,192.0.2.21,192.0.2.22,192.0.2.30,192.0.2.31,192.0.2.32,192.0.2.33,192.0.2.12,192.0.2.13,192.0.2.10,192.0.2.11");
+ if ("111.spf1-test.mailzone.com".equals(domainName))
return getAddressList(
- "192.0.2.12,192.0.2.13,192.0.2.10,192.0.2.11", mask);
- if (mask == 32 && "114.spf1-test.mailzone.com".equals(domainName))
+ "192.0.2.12,192.0.2.13,192.0.2.10,192.0.2.11");
+ if ("114.spf1-test.mailzone.com".equals(domainName))
return getAddressList(
- "192.0.2.11,192.0.2.12,192.0.2.13,192.0.2.10", mask);
- if (mask == 32 && "80.spf1-test.mailzone.com".equals(domainName))
+ "192.0.2.11,192.0.2.12,192.0.2.13,192.0.2.10");
+ if ("80.spf1-test.mailzone.com".equals(domainName))
throw new NoneException(
"No MX Record found for: 80.spf1-test.mailzone.com");
- if (mask == 26 && "98.spf1-test.mailzone.com".equals(domainName))
- return getAddressList("208.210.124.180", mask);
- if (mask == 32
- && "fallback-relay.spf1-test.mailzone.com".equals(domainName))
+ // this was with mask 26
+ if ("98.spf1-test.mailzone.com".equals(domainName))
+ return getAddressList("208.210.124.180");
+ if ("fallback-relay.spf1-test.mailzone.com".equals(domainName))
return getAddressList(
- "192.0.2.40,192.0.2.41,192.0.2.42,192.0.2.43", mask);
- if (mask == 32 && "spf1-test.mailzone.com".equals(domainName))
+ "192.0.2.40,192.0.2.41,192.0.2.42,192.0.2.43");
+ if ("spf1-test.mailzone.com".equals(domainName))
return getAddressList(
- "192.0.2.23,192.0.2.20,192.0.2.21,192.0.2.22,192.0.2.30,192.0.2.31,192.0.2.32,192.0.2.33,192.0.2.12,192.0.2.13,192.0.2.10,192.0.2.11",
- mask);
+ "192.0.2.23,192.0.2.20,192.0.2.21,192.0.2.22,192.0.2.30,192.0.2.31,192.0.2.32,192.0.2.33,192.0.2.12,192.0.2.13,192.0.2.10,192.0.2.11");
throw new IllegalStateException("Mock data not available");
Modified: james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1TestMockDNSService.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1TestMockDNSService.java?view=diff&rev=448185&r1=448184&r2=448185
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1TestMockDNSService.java (original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1TestMockDNSService.java Wed Sep 20 05:13:19 2006
@@ -91,14 +91,14 @@
throw new IllegalStateException("Mock data not available");
}
- public List getAAAARecords(String strServer, int mask)
+ public List getAAAARecords(String strServer)
throws NoneException, PermErrorException, TempErrorException {
if ("myipv6a.record".equals(strServer))
- return getAddressList("FEDC:BA98:7654:3210:FEDC:BA98:7654:3210",mask);
+ return getAddressList("FEDC:BA98:7654:3210:FEDC:BA98:7654:3210");
throw new IllegalStateException("Mock data not available");
}
- public List getARecords(String strServer, int mask) throws NoneException,
+ public List getARecords(String strServer) throws NoneException,
PermErrorException, TempErrorException {
throw new IllegalStateException("Mock data not available");
}
@@ -124,7 +124,7 @@
throw new IllegalStateException("Mock data not available");
}
- public List getMXRecords(String domainName, int mask)
+ public List getMXRecords(String domainName)
throws PermErrorException, NoneException, TempErrorException {
throw new IllegalStateException("Mock data not available");
}
@@ -133,14 +133,14 @@
// MOCK
}
- public List getAddressList(String list, int mask) throws PermErrorException {
+ public List getAddressList(String list) throws PermErrorException {
if (list == null || "".equals(list)) {
return new ArrayList();
}
String[] s = list.split(",");
IPAddr[] ips = new IPAddr[s.length];
for (int i = 0; i < s.length; i++) {
- ips[i] = IPAddr.getAddress(s[i], mask);
+ ips[i] = IPAddr.getAddress(s[i]);
}
return new ArrayList(Arrays.asList(ips));
}
Modified: james/jspf/trunk/src/test/java/org/apache/james/jspf/SPFYamlTest.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/SPFYamlTest.java?view=diff&rev=448185&r1=448184&r2=448185
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/SPFYamlTest.java (original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/SPFYamlTest.java Wed Sep 20 05:13:19 2006
@@ -188,7 +188,7 @@
this.zonedata = zonedata;
}
- public List getAAAARecords(String strServer, int mask) throws NoneException, PermErrorException, TempErrorException {
+ public List getAAAARecords(String strServer) throws NoneException, PermErrorException, TempErrorException {
ArrayList res = new ArrayList();
if (zonedata.get(strServer) != null) {
List l = (List) zonedata.get(strServer);
@@ -198,7 +198,7 @@
HashMap hm = (HashMap) i.next();
if (hm.get("AAAA") != null) {
String a = (String) hm.get("AAAA");
- res.add(a);
+ res.add(IPAddr.getAddress(a));
}
}
}
@@ -207,7 +207,7 @@
throw new NoneException("No AAAA Record found");
}
- public List getARecords(String strServer, int mask) throws NoneException, PermErrorException, TempErrorException {
+ public List getARecords(String strServer) throws NoneException, PermErrorException, TempErrorException {
ArrayList res = new ArrayList();
if (zonedata.get(strServer) != null) {
@@ -217,7 +217,7 @@
HashMap hm = (HashMap) i.next();
if (hm.get("A") != null) {
String a = (String) hm.get("A");
- res.add(a);
+ res.add(IPAddr.getAddress(a));
}
}
@@ -231,7 +231,7 @@
return new ArrayList();
}
- public List getMXRecords(String domainName, int mask) throws PermErrorException, NoneException, TempErrorException {
+ public List getMXRecords(String domainName) throws PermErrorException, NoneException, TempErrorException {
if (zonedata.get(domainName) != null) {
List l = (List) zonedata.get(domainName);
Iterator i = l.iterator();
@@ -249,7 +249,7 @@
String mx = (String) mxs.next();
// resolv the record
- List records = getARecords(mx,32);
+ List records = getARecords(mx);
for (int i2 = 0; i2 < records.size();i2++ ) {
res.add(records.get(i2));
}
Modified: james/jspf/trunk/src/test/resources/org/apache/james/jspf/test_parser.txt
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/resources/org/apache/james/jspf/test_parser.txt?view=diff&rev=448185&r1=448184&r2=448185
==============================================================================
--- james/jspf/trunk/src/test/resources/org/apache/james/jspf/test_parser.txt (original)
+++ james/jspf/trunk/src/test/resources/org/apache/james/jspf/test_parser.txt Wed Sep 20 05:13:19 2006
@@ -108,6 +108,11 @@
err-msg /.*/ Could not find a valid SPF record near "v=spf1" in "v=spf1a"
rec-out /.*/ Unknown
+spftest spf "v=spf1mx"
+rec-in /.*/ SPF record in: v=spf1mx
+err-msg /.*/ Could not find a valid SPF record near "v=spf1" in "v=spf1mx"
+rec-out /.*/ Unknown
+
spftest spf "v=spf1 al"
rec-in /.*/ SPF record in: v=spf1 al
err-msg /.*/ Unknown mechanism found in "al"
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org