Author: bago
Date: Thu Nov 29 04:12:53 2007
New Revision: 599404
URL: http://svn.apache.org/viewvc?rev=599404&view=rev
Log:
Updated rfc4408-tests.yml to openspf BSD licensed one (JSPF-58).
The rfc4408-tests.* have been downloaded from
http://www.openspf.org/source/project/test-suite/.
The LICENSE file says it's BSD, The copyright for the files is:
(C) 2006-2007 Stuart D Gathman <[EMAIL PROTECTED]>
2007 Julian Mehnle <[EMAIL PROTECTED]>
Added:
james/jspf/trunk/src/test/resources/org/apache/james/jspf/rfc4408-tests.LICENSE
Modified:
james/jspf/trunk/pom.xml
james/jspf/trunk/src/test/resources/org/apache/james/jspf/rfc4408-tests.yml
Modified: james/jspf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/pom.xml?rev=599404&r1=599403&r2=599404&view=diff
==============================================================================
--- james/jspf/trunk/pom.xml (original)
+++ james/jspf/trunk/pom.xml Thu Nov 29 04:12:53 2007
@@ -334,11 +334,16 @@
and copyright by Wayne Schlitt, Shevek.
(see src\test\resources\org\apache\james\jspf\libspf2.LICENSE)
-This product contains resources (tests.yml, pyspf-tests.yml and
-rfc4408-tests.yml) from the pyspf library
-(http://cheeseshop.python.org/pypi/pyspf) distributed under
-the Python Software Foundation License and copyright by Terence Way,
-Stuart Gathman ([EMAIL PROTECTED]) and Scott Kitterman.
+This product contains resources (rfc4408-tests.yml) from the
+openspf group, distributed under the BSD license and copyright
+by Stuart D. Gathman and Julian Mehnle.
+(see src\test\resources\org\apache\james\jspf\rfc4408-tests.LICENSE)
+
+This product contains resources (tests.yml, pyspf-tests.yml)
+from the pyspf library (http://cheeseshop.python.org/pypi/pyspf)
+distributed under the Python Software Foundation License and
+copyright by Terence Way, Stuart Gathman ([EMAIL PROTECTED]) and
+Scott Kitterman.
(see src\test\resources\org\apache\james\jspf\pyspf.LICENSE)
This file is automatically generated by dependencies declared in pom.xml
Added:
james/jspf/trunk/src/test/resources/org/apache/james/jspf/rfc4408-tests.LICENSE
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/test/resources/org/apache/james/jspf/rfc4408-tests.LICENSE?rev=599404&view=auto
==============================================================================
---
james/jspf/trunk/src/test/resources/org/apache/james/jspf/rfc4408-tests.LICENSE
(added)
+++
james/jspf/trunk/src/test/resources/org/apache/james/jspf/rfc4408-tests.LICENSE
Thu Nov 29 04:12:53 2007
@@ -0,0 +1,26 @@
+The RFC 4408 test-suite (rfc4408-tests.yml) is
+(C) 2006-2007 Stuart D Gathman <[EMAIL PROTECTED]>
+ 2007 Julian Mehnle <[EMAIL PROTECTED]>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified:
james/jspf/trunk/src/test/resources/org/apache/james/jspf/rfc4408-tests.yml
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/test/resources/org/apache/james/jspf/rfc4408-tests.yml?rev=599404&r1=599403&r2=599404&view=diff
==============================================================================
--- james/jspf/trunk/src/test/resources/org/apache/james/jspf/rfc4408-tests.yml
(original)
+++ james/jspf/trunk/src/test/resources/org/apache/james/jspf/rfc4408-tests.yml
Thu Nov 29 04:12:53 2007
@@ -277,7 +277,7 @@
- SPF: v=spf1 -all
- SPF: v=spf1 -all
example8.com:
- - SPF: v=spf1 +all
+ - SPF: V=spf1 -all
- SPF: v=spf1 -all
- TXT: v=spf1 +all
example9.com:
@@ -1464,23 +1464,51 @@
mailfrom: [EMAIL PROTECTED]
result: fail
explanation: DEFAULT
+ exp-no-txt:
+ description: |
+ Ignore exp if no TXT records.
+ comment: >-
+ If domain-spec is empty, or there are any DNS processing errors (any
+ RCODE other than 0), or if no records are returned, or if more than one
+ record is returned, or if there are syntax errors in the explanation
+ string, then proceed as if no exp modifier was given.
+ spec: 6.2/4
+ helo: mail.example.com
+ host: 1.2.3.4
+ mailfrom: [EMAIL PROTECTED]
+ result: fail
+ explanation: DEFAULT
+ exp-dns-error:
+ description: |
+ Ignore exp if DNS error.
+ comment: >-
+ If domain-spec is empty, or there are any DNS processing errors (any
+ RCODE other than 0), or if no records are returned, or if more than one
+ record is returned, or if there are syntax errors in the explanation
+ string, then proceed as if no exp modifier was given.
+ spec: 6.2/4
+ helo: mail.example.com
+ host: 1.2.3.4
+ mailfrom: [EMAIL PROTECTED]
+ result: fail
+ explanation: DEFAULT
exp-empty-domain:
description: |
- Ignore exp if domain-spec is empty.
+ PermError if exp= domain-spec is empty.
comment: >-
Section 6.2/4 says, "If domain-spec is empty, or there are any DNS
processing errors (any RCODE other than 0), or if no records are
returned, or if more than one record is returned, or if there are syntax
errors in the explanation string, then proceed as if no exp modifier was
given." However, "if domain-spec is empty" conflicts with the grammar
- given for the exp modifier. If you fix the grammar to make
- domain-spec optional, result is fail. Otherwise, result is Permerror.
+ given for the exp modifier. This was reported as an errata, and the
+ solution chosen was to report explicit exp= as PermError, but ignore
+ problems due to macro expansion, DNS, or invalid explanation string.
spec: 6.2/4
helo: mail.example.com
host: 1.2.3.4
mailfrom: [EMAIL PROTECTED]
- result: [ fail, permerror ]
- explanation: DEFAULT
+ result: permerror
explanation-syntax-error:
description: |
Ignore exp if the explanation string has a syntax error.
@@ -1636,6 +1664,12 @@
- SPF: v=spf1 default=pass
e20.example.com:
- SPF: "v=spf1 default=+"
+ e21.example.com:
+ - SPF: v=spf1 exp=e21msg.example.com -all
+ e21msg.example.com:
+ - TIMEOUT
+ e22.example.com:
+ - SPF: v=spf1 exp=mail.example.com -all
---
description: Macro expansion rules
tests:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
