spf 0.0.25 → 0.0.26
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/spf/eval.rb +2 -2
- data/lib/spf/model.rb +1 -3
- data/lib/spf/request.rb +3 -3
- data/lib/spf/version.rb +1 -1
- data/spf.gemspec +1 -1
- metadata +1 -1
data/lib/spf/eval.rb
CHANGED
@@ -189,8 +189,8 @@ class SPF::Server
|
|
189
189
|
end
|
190
190
|
end
|
191
191
|
|
192
|
-
if (not records.any? and
|
193
|
-
@query_rr_types ==
|
192
|
+
if (not records.flatten.any? and
|
193
|
+
@query_rr_types == QUERY_RR_TYPE_ALL or
|
194
194
|
@query_rr_types & QUERY_RR_TYPE_TXT)
|
195
195
|
# NOTE:
|
196
196
|
# This deliberately violates RFC 4406 (Sender ID), 4.4/3 (4.4.1):
|
data/lib/spf/model.rb
CHANGED
@@ -494,8 +494,6 @@ class SPF::Mech < SPF::Term
|
|
494
494
|
params = @ip_network.to_addr
|
495
495
|
params += '/' + @ip_network.pfxlen.to_s if
|
496
496
|
@ip_network.pfxlen != self.default_ipv6_prefix_length
|
497
|
-
puts "params: #{params}"
|
498
|
-
puts self.inspect
|
499
497
|
return params
|
500
498
|
end
|
501
499
|
|
@@ -543,7 +541,7 @@ class SPF::Mech < SPF::Term
|
|
543
541
|
return false if
|
544
542
|
SPF::Result::Fail === result or
|
545
543
|
SPF::Result::SoftFail === result or
|
546
|
-
SPF::Result::Neutral === result
|
544
|
+
SPF::Result::Neutral === result
|
547
545
|
|
548
546
|
server.throw_result('permerror', request,
|
549
547
|
"Include domain '#{authority_domain}' has no applicable sender policy") if
|
data/lib/spf/request.rb
CHANGED
@@ -26,7 +26,7 @@ class SPF::Request
|
|
26
26
|
@versions = options[:versions]
|
27
27
|
@scope = options[:scope] || :mfrom
|
28
28
|
@scope = @scope.to_sym if String === @scope
|
29
|
-
@
|
29
|
+
@authority_domain = options[:authority_domain]
|
30
30
|
@identity = options[:identity]
|
31
31
|
@ip_address = options[:ip_address]
|
32
32
|
@helo_identity = options[:helo_identity]
|
@@ -112,7 +112,7 @@ class SPF::Request
|
|
112
112
|
end
|
113
113
|
|
114
114
|
def new_sub_request(options)
|
115
|
-
obj = self.class.new(opt.merge(options))
|
115
|
+
obj = self.class.new(@opt.merge(options))
|
116
116
|
obj.super_request = self
|
117
117
|
obj.root_request = super_request.root_request
|
118
118
|
@sub_requests << obj
|
@@ -120,7 +120,7 @@ class SPF::Request
|
|
120
120
|
end
|
121
121
|
|
122
122
|
def authority_domain
|
123
|
-
return (@
|
123
|
+
return (@authority_domain or @domain)
|
124
124
|
end
|
125
125
|
|
126
126
|
def state(field, value = nil)
|
data/lib/spf/version.rb
CHANGED
data/spf.gemspec
CHANGED