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/24 21:47:05 UTC
svn commit: r449468 - in /james/jspf/trunk/src:
main/java/org/apache/james/jspf/SPF1Utils.java
test/java/org/apache/james/jspf/AbstractYamlTest.java
test/resources/org/apache/james/jspf/mailzone-tests.yml
test/resources/org/apache/james/jspf/tests.yml
Author: bago
Date: Sun Sep 24 12:47:04 2006
New Revision: 449468
URL: http://svn.apache.org/viewvc?view=rev&rev=449468
Log:
Changed "error" to "permerror": this seems what is used as the official reply for a permanent error.
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF1Utils.java
james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
james/jspf/trunk/src/test/resources/org/apache/james/jspf/mailzone-tests.yml
james/jspf/trunk/src/test/resources/org/apache/james/jspf/tests.yml
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF1Utils.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF1Utils.java?view=diff&rev=449468&r1=449467&r2=449468
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF1Utils.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF1Utils.java Sun Sep 24 12:47:04 2006
@@ -31,7 +31,7 @@
public class SPF1Utils {
- public static final String PERM_ERROR_CONV = "error";
+ public static final String PERM_ERROR_CONV = "permerror";
public static final String NONE_CONV = "none";
Modified: james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java?view=diff&rev=449468&r1=449467&r2=449468
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java (original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java Sun Sep 24 12:47:04 2006
@@ -138,16 +138,12 @@
String resultSPF = res.getResult();
if (currentTest.get("result") instanceof String) {
- if ("permerror".equals(currentTest.get("result"))) {
- assertEquals("Test "+next+" ("+currentTest.get("description")+") failed. Returned: "+res.getResult()+" Expected: "+currentTest.get("result")+" [["+res.getResultChar()+"||"+res.getHeaderText()+"]]", "error", res.getResult());
- } else {
- assertEquals("Test "+next+" ("+currentTest.get("description")+") failed. Returned: "+res.getResult()+" Expected: "+currentTest.get("result")+" [["+res.getResultChar()+"||"+res.getHeaderText()+"]]", currentTest.get("result"), res.getResult());
- }
+ assertEquals("Test "+next+" ("+currentTest.get("description")+") failed. Returned: "+res.getResult()+" Expected: "+currentTest.get("result")+" [["+res.getResultChar()+"||"+res.getHeaderText()+"]]", currentTest.get("result"), res.getResult());
} else {
ArrayList results = (ArrayList) currentTest.get("result");
boolean match = false;
for (int i = 0; i < results.size(); i++) {
- if (results.get(i).equals(resultSPF) || (results.get(i).equals("permerror") && resultSPF.equals("error"))) match = true;
+ if (results.get(i).equals(resultSPF)) match = true;
System.err.println("checking "+results.get(i)+" => "+resultSPF);
}
assertTrue(match);
Modified: james/jspf/trunk/src/test/resources/org/apache/james/jspf/mailzone-tests.yml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/resources/org/apache/james/jspf/mailzone-tests.yml?view=diff&rev=449468&r1=449467&r2=449468
==============================================================================
--- james/jspf/trunk/src/test/resources/org/apache/james/jspf/mailzone-tests.yml (original)
+++ james/jspf/trunk/src/test/resources/org/apache/james/jspf/mailzone-tests.yml Sun Sep 24 12:47:04 2006
@@ -456,13 +456,13 @@
helo: 55.spf1-test.mailzone.com
host: 192.0.2.200
mailfrom: 55.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#77:
description: 'error in processing during lookup of domain of 55.spf1-test.mailzone.com: Could not find a valid SPF record'
helo: 55.spf1-test.mailzone.com
host: 192.0.2.130
mailfrom: 55.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#78:
description: 192.0.2.200 is neither permitted nor denied by domain of 56.spf1-test.mailzone.com
helo: 56.spf1-test.mailzone.com
@@ -474,25 +474,25 @@
helo: 57.spf1-test.mailzone.com
host: 192.0.2.200
mailfrom: 57.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#80:
description: 'error in processing during lookup of domain of 57.spf1-test.mailzone.com: Could not find a valid SPF record'
helo: 57.spf1-test.mailzone.com
host: 192.0.2.130
mailfrom: 57.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#81:
description: 'error in processing during lookup of domain of 58.spf1-test.mailzone.com: Mechanisms used too many DNS lookups'
helo: 58.spf1-test.mailzone.com
host: 192.0.2.200
mailfrom: 58.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#82:
description: 'error in processing during lookup of domain of 59.spf1-test.mailzone.com: Mechanisms used too many DNS lookups'
helo: 59.spf1-test.mailzone.com
host: 192.0.2.130
mailfrom: 59.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#83:
description: domain of 70.spf1-test.mailzone.com does not designate 192.0.2.103 as permitted sender
helo: 70.spf1-test.mailzone.com
@@ -696,7 +696,7 @@
helo: 99.spf1-test.mailzone.com
host: 192.0.2.1
mailfrom: 99.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#117:
description: domain of 100.spf1-test.mailzone.com does not designate 192.0.2.1 as permitted sender
helo: 100.spf1-test.mailzone.com
@@ -732,37 +732,37 @@
helo: 110.spf1-test.mailzone.com
host: 192.0.2.98
mailfrom: droid@110.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#123:
description: domain of 111.spf1-test.mailzone.com designates 192.0.2.10 as permitted sender
helo: 111.spf1-test.mailzone.com
host: 192.0.2.10
mailfrom: 111.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#124:
description: domain of 111.spf1-test.mailzone.com does not designate 192.0.2.200 as permitted sender
helo: 111.spf1-test.mailzone.com
host: 192.0.2.200
mailfrom: 111.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#125:
description: 'error in processing during lookup of domain of 111.spf1-test.mailzone.com: Unknown mechanism found'
helo: 111.spf1-test.mailzone.com
host: 1.2.3.4
mailfrom: 111.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#126:
description: 'error in processing during lookup of domain of 112.spf1-test.mailzone.com: Invalid character found'
helo: 112.spf1-test.mailzone.com
host: 1.2.3.4
mailfrom: 112.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#127:
description: 'error in processing during lookup of domain of 113.spf1-test.mailzone.com: Invalid character found'
helo: 113.spf1-test.mailzone.com
host: 1.2.3.4
mailfrom: 113.spf1-test.mailzone.com
- result: error
+ result: permerror
mailzone-#128:
description: domain of 114.spf1-test.mailzone.com designates 192.0.2.10 as permitted sender
helo: 114.spf1-test.mailzone.com
Modified: james/jspf/trunk/src/test/resources/org/apache/james/jspf/tests.yml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/resources/org/apache/james/jspf/tests.yml?view=diff&rev=449468&r1=449467&r2=449468
==============================================================================
--- james/jspf/trunk/src/test/resources/org/apache/james/jspf/tests.yml (original)
+++ james/jspf/trunk/src/test/resources/org/apache/james/jspf/tests.yml Sun Sep 24 12:47:04 2006
@@ -23,7 +23,7 @@
helo: spf5-test.foo.bar
host: 192.0.2.200
mailfrom: spf5-test.foo.bar
- result: error
+ result: permerror
explanation:
test-#5:
helo: spf7-test.foo.bar
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org