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 15:17:26 UTC
svn commit: r448196 - in
/james/jspf/trunk/src/main/java/org/apache/james/jspf:
DNSServiceXBillImpl.java SPF.java core/SPF1Data.java terms/AMechanism.java
Author: bago
Date: Wed Sep 20 06:17:26 2006
New Revision: 448196
URL: http://svn.apache.org/viewvc?view=rev&rev=448196
Log:
Remove specific support for a/0 and a//0: simply removed the code and test still pass!
Splitted MAX_DEPTH into MAX_DEPTH (spf recursion) and MAX_DEPTH_DNS (dns records returned)
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/DNSServiceXBillImpl.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Data.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AMechanism.java
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=448196&r1=448195&r2=448196
==============================================================================
--- 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 06:17:26 2006
@@ -343,7 +343,7 @@
log.debug("Found " + records.length + " PTR-Records");
// check if the maximum lookup count is reached
- if (records.length >= SPF1Data.MAX_DEPTH) throw new PermErrorException("Maximum PTR lookup count reached");
+ if (records.length >= SPF1Data.MAX_DEPTH_DNS) throw new PermErrorException("Maximum PTR lookup count reached");
for (int i = 0; i < records.length; i++) {
PTRRecord ptr = (PTRRecord) records[i];
@@ -411,7 +411,7 @@
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");
+ if (records.length >= SPF1Data.MAX_DEPTH_DNS) throw new PermErrorException("Maximum MX lookup count reached");
for (int i = 0; i < records.length; i++) {
MXRecord mx = (MXRecord) records[i];
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java?view=diff&rev=448196&r1=448195&r2=448196
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java Wed Sep 20 06:17:26 2006
@@ -154,10 +154,6 @@
SPF1Record spfRecord = parser.parse(spfDnsEntry);
- //TODO: Check if this is the right place for do this
- if (spfDnsEntry.contains("a/0")) spfData.setMatchAnyARecord(true) ;
- if (spfDnsEntry.contains("a//0")) spfData.setMatchAnyAAAARecord(true);
-
String qualifier = null;
boolean hasCommand = false;
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Data.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Data.java?view=diff&rev=448196&r1=448195&r2=448196
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Data.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Data.java Wed Sep 20 06:17:26 2006
@@ -64,6 +64,8 @@
public static final int MAX_DEPTH = 10;
+ public static final int MAX_DEPTH_DNS = 10;
+
private String explanation = null;
private String currentResult = null;
@@ -71,10 +73,6 @@
private boolean match = false;
private boolean ignoreExplanation = false;
-
- private boolean matchAnyARecord = false;
-
- private boolean matchAnyAAAARecord = false;
/**
* Build the SPF1Data from the given parameters
@@ -402,42 +400,6 @@
*/
public boolean ignoreExplanation() {
return ignoreExplanation;
- }
-
- /**
- * Set to true if a match should returned if a ARecord was found
- *
- * @param matchAnyARecord true or false
- */
- public void setMatchAnyARecord(boolean matchAnyARecord) {
- this.matchAnyARecord = matchAnyARecord;
- }
-
- /**
- * Return true if a match should return if a ARecord was found
- *
- * @return true or false
- */
- public boolean matchAnyARecord() {
- return matchAnyARecord;
- }
-
- /**
- * Set to true if a match should returned if a AAAARecord was found
- *
- * @param matchAnyAAAARecord true of false
- */
- public void setMatchAnyAAAARecord(boolean matchAnyAAAARecord) {
- this.matchAnyAAAARecord = matchAnyAAAARecord;
- }
-
- /**
- * Return true if a match should return if a AAAARecord was found
- *
- * @return true or false
- */
- public boolean matchAnyAAAARecord() {
- return matchAnyAAAARecord;
}
}
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=448196&r1=448195&r2=448196
==============================================================================
--- 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 06:17:26 2006
@@ -74,10 +74,6 @@
return false;
}
-
- // We should match if any A Record was found!
- if (aRecords.size() > 0 && spfData.matchAnyARecord()) return true;
-
if (checkAddressList(checkAddress, aRecords, getIp4cidr())) {
return true;
}
@@ -98,7 +94,7 @@
}
// We should match if any A Record was found!
- if (aaaaRecords.size() > 0 && spfData.matchAnyAAAARecord()) return true;
+ //if (aaaaRecords.size() > 0 && spfData.matchAnyAAAARecord()) return true;
if (checkAddressList(checkAddress, aaaaRecords, getIp6cidr())) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org