Author: bago
Date: Mon Apr 16 11:15:26 2007
New Revision: 529347
URL: http://svn.apache.org/viewvc?view=rev&rev=529347
Log:
Removed method from the AbstractNestedPolicy: the postfilter already has the
capabilities of the fallback filter, so no need to use both.
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/AbstractNestedPolicy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NeutralIfNotMatchPolicy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NoSPFRecordFoundPolicy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/ParseRecordPolicy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/FallbackPolicy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/OverridePolicy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/TrustedForwarderPolicy.java
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/AbstractNestedPolicy.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/AbstractNestedPolicy.java?view=diff&rev=529347&r1=529346&r2=529347
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/AbstractNestedPolicy.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/AbstractNestedPolicy.java
Mon Apr 16 11:15:26 2007
@@ -40,21 +40,13 @@
SPF1Record res = getSPFRecordOverride(currentDomain);
if (res == null && childPolicy != null) {
res = childPolicy.getSPFRecord(currentDomain);
- if (res == null) {
- res = getSPFRecordFallback(currentDomain);
- } else {
- res = getSPFRecordPostFilter(currentDomain, res);
- }
+ res = getSPFRecordPostFilter(currentDomain, res);
}
return res;
}
protected SPF1Record getSPFRecordPostFilter(String currentDomain,
SPF1Record res) throws PermErrorException, TempErrorException, NoneException,
NeutralException {
return res;
- }
-
- protected SPF1Record getSPFRecordFallback(String currentDomain) throws
PermErrorException, TempErrorException, NoneException, NeutralException {
- return null;
}
protected SPF1Record getSPFRecordOverride(String currentDomain) throws
PermErrorException, TempErrorException, NoneException, NeutralException {
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NeutralIfNotMatchPolicy.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NeutralIfNotMatchPolicy.java?view=diff&rev=529347&r1=529346&r2=529347
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NeutralIfNotMatchPolicy.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NeutralIfNotMatchPolicy.java
Mon Apr 16 11:15:26 2007
@@ -37,6 +37,7 @@
* @see
org.apache.james.jspf.policies.AbstractNestedPolicy#getSPFRecordPostFilter(java.lang.String,
org.apache.james.jspf.core.SPF1Record)
*/
protected SPF1Record getSPFRecordPostFilter(String currentDomain,
SPF1Record spfRecord) throws PermErrorException, TempErrorException,
NoneException, NeutralException {
+ if (spfRecord == null) return null;
// Set the result to NEUTRAL if at least a directive is present and it
didn't match
// Maybe we should simply append a "?all" at the end, as modifier
if (spfRecord.getDirectives().size() > 0) {
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NoSPFRecordFoundPolicy.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NoSPFRecordFoundPolicy.java?view=diff&rev=529347&r1=529346&r2=529347
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NoSPFRecordFoundPolicy.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NoSPFRecordFoundPolicy.java
Mon Apr 16 11:15:26 2007
@@ -30,9 +30,13 @@
*/
public class NoSPFRecordFoundPolicy extends AbstractNestedPolicy {
/**
- * @see
org.apache.james.jspf.policies.AbstractNestedPolicy#getSPFRecordFallback(java.lang.String)
+ * @see
org.apache.james.jspf.policies.AbstractNestedPolicy#getSPFRecordPostFilter(java.lang.String,
org.apache.james.jspf.core.SPF1Record)
*/
- protected SPF1Record getSPFRecordFallback(String currentDomain) throws
PermErrorException, TempErrorException, NoneException, NeutralException {
- throw new NoneException("No SPF record found for host: " +
currentDomain);
+ protected SPF1Record getSPFRecordPostFilter(String currentDomain,
SPF1Record res) throws PermErrorException, TempErrorException, NoneException,
NeutralException {
+ if (res == null) {
+ throw new NoneException("No SPF record found for host: " +
currentDomain);
+ } else {
+ return res;
+ }
}
}
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/ParseRecordPolicy.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/ParseRecordPolicy.java?view=diff&rev=529347&r1=529346&r2=529347
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/ParseRecordPolicy.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/ParseRecordPolicy.java
Mon Apr 16 11:15:26 2007
@@ -40,6 +40,7 @@
* @see
org.apache.james.jspf.policies.AbstractNestedPolicy#getSPFRecordPostFilter(java.lang.String,
org.apache.james.jspf.core.SPF1Record)
*/
protected SPF1Record getSPFRecordPostFilter(String currentDomain,
SPF1Record spfRecord) throws PermErrorException, NoneException,
NeutralException {
+ if (spfRecord == null) return null;
// parse the record
return parser.parse(spfRecord.getRecord());
}
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java?view=diff&rev=529347&r1=529346&r2=529347
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java
Mon Apr 16 11:15:26 2007
@@ -29,8 +29,15 @@
public class BestGuessPolicy extends AbstractNestedPolicy {
- protected SPF1Record getSPFRecordFallback(String currentDomain) throws
PermErrorException, TempErrorException, NoneException, NeutralException {
- // We should use bestguess
- return new SPF1Record(SPF1Utils.BEST_GUESS_RECORD);
+ /**
+ * @see
org.apache.james.jspf.policies.AbstractNestedPolicy#getSPFRecordPostFilter(java.lang.String,
org.apache.james.jspf.core.SPF1Record)
+ */
+ protected SPF1Record getSPFRecordPostFilter(String currentDomain,
SPF1Record res) throws PermErrorException, TempErrorException, NoneException,
NeutralException {
+ if (res == null) {
+ // We should use bestguess
+ return new SPF1Record(SPF1Utils.BEST_GUESS_RECORD);
+ } else {
+ return res;
+ }
}
}
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java?view=diff&rev=529347&r1=529346&r2=529347
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java
Mon Apr 16 11:15:26 2007
@@ -61,6 +61,7 @@
* @see
org.apache.james.jspf.policies.AbstractNestedPolicy#getSPFRecordPostFilter(java.lang.String,
org.apache.james.jspf.core.SPF1Record)
*/
protected SPF1Record getSPFRecordPostFilter(String currentDomain,
SPF1Record spfRecord) throws PermErrorException, TempErrorException,
NoneException, NeutralException {
+ if (spfRecord == null) return null;
// Default explanation policy.
spfRecord.getModifiers().add(new SPFChecker() {
public void checkSPF(SPF1Data spfData) throws PermErrorException,
NoneException, TempErrorException, NeutralException {
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/FallbackPolicy.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/FallbackPolicy.java?view=diff&rev=529347&r1=529346&r2=529347
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/FallbackPolicy.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/FallbackPolicy.java
Mon Apr 16 11:15:26 2007
@@ -27,7 +27,11 @@
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.SPF1Record;
import org.apache.james.jspf.core.SPFRecordParser;
+import org.apache.james.jspf.exceptions.NeutralException;
+import org.apache.james.jspf.exceptions.NoneException;
+import org.apache.james.jspf.exceptions.PermErrorException;
import org.apache.james.jspf.exceptions.SPFResultException;
+import org.apache.james.jspf.exceptions.TempErrorException;
import org.apache.james.jspf.policies.AbstractNestedPolicy;
/**
@@ -109,10 +113,14 @@
}
/**
- * @see
org.apache.james.jspf.policies.AbstractNestedPolicy#getSPFRecordFallback(java.lang.String)
+ * @see
org.apache.james.jspf.policies.AbstractNestedPolicy#getSPFRecordPostFilter(java.lang.String,
org.apache.james.jspf.core.SPF1Record)
*/
- public SPF1Record getSPFRecordFallback(String host) {
- return getMySPFRecord(host);
+ protected SPF1Record getSPFRecordPostFilter(String currentDomain,
SPF1Record res) throws PermErrorException, TempErrorException, NoneException,
NeutralException {
+ if (res == null) {
+ return getMySPFRecord(currentDomain);
+ } else {
+ return res;
+ }
}
/**
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/OverridePolicy.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/OverridePolicy.java?view=diff&rev=529347&r1=529346&r2=529347
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/OverridePolicy.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/OverridePolicy.java
Mon Apr 16 11:15:26 2007
@@ -22,6 +22,10 @@
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.SPF1Record;
import org.apache.james.jspf.core.SPFRecordParser;
+import org.apache.james.jspf.exceptions.NeutralException;
+import org.apache.james.jspf.exceptions.NoneException;
+import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.exceptions.TempErrorException;
public class OverridePolicy extends FallbackPolicy {
@@ -31,15 +35,14 @@
/**
- * @see
org.apache.james.jspf.policies.AbstractNestedPolicy#getSPFRecordFallback(java.lang.String)
+ * @see
org.apache.james.jspf.policies.AbstractNestedPolicy#getSPFRecordPostFilter(java.lang.String,
org.apache.james.jspf.core.SPF1Record)
*/
- public SPF1Record getSPFRecordFallback(String host) {
- return null;
+ protected SPF1Record getSPFRecordPostFilter(String currentDomain,
SPF1Record res) throws PermErrorException, TempErrorException, NoneException,
NeutralException {
+ return res;
}
-
/**
- * @see
org.apache.james.jspf.policies.AbstractNestedPolicy#getSPFRecordFallback(java.lang.String)
+ * @see
org.apache.james.jspf.policies.AbstractNestedPolicy#getSPFRecordOverride(java.lang.String)
*/
public SPF1Record getSPFRecordOverride(String host) {
return getMySPFRecord(host);
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/TrustedForwarderPolicy.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/TrustedForwarderPolicy.java?view=diff&rev=529347&r1=529346&r2=529347
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/TrustedForwarderPolicy.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/TrustedForwarderPolicy.java
Mon Apr 16 11:15:26 2007
@@ -47,6 +47,7 @@
}
protected SPF1Record getSPFRecordPostFilter(String currentDomain,
SPF1Record spfRecord) throws PermErrorException, TempErrorException,
NoneException, NeutralException {
+ if (spfRecord == null) return null;
String mechanism = ((Directive)
spfRecord.getDirectives().get(spfRecord.getDirectives().size())).toString();
if (mechanism.equals("-all") || mechanism.equals("?all")) {
log.debug("Add TrustedForwarderPolicy =
include:"+TRUSTED_FORWARDER_HOST);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
