wlvalidate 0.1.5 → 0.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/wlvalidate.rb +4 -6
- metadata +1 -1
data/lib/wlvalidate.rb
CHANGED
|
@@ -199,11 +199,6 @@ module WLValidate
|
|
|
199
199
|
arrayDKIM1 = dns.getresources(strHost, Dnsruby::Types.TXT)
|
|
200
200
|
arrayDKIM1.each do |r|
|
|
201
201
|
if boolFoundMatch == false
|
|
202
|
-
puts "DKIM data: #{r.data}"
|
|
203
|
-
r.data.split(" ").each {|k|
|
|
204
|
-
puts "#{k}"
|
|
205
|
-
}
|
|
206
|
-
puts "r.name.to_s => #{r.name.to_s}"
|
|
207
202
|
if (r.name.to_s == "dkim.sendgrid.net")
|
|
208
203
|
hashReturn = { "type" => "DKIM1", "result" => "PASS", "data" => r.name.to_s, "ext_data" => "cname" }
|
|
209
204
|
boolFoundMatch = true
|
|
@@ -233,6 +228,9 @@ module WLValidate
|
|
|
233
228
|
boolFoundMatch = false
|
|
234
229
|
strHost = "smtpapi._domainkey." + strWL + "." + strDomain
|
|
235
230
|
strDKIM = "k=rsa; t=s; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPtW5iwpXVPiH5FzJ7Nrl8USzuY9zqqzjE0D1r04xDN6qwziDnmgcFNNfMewVKN2D1O+2J9N14hRprzByFwfQW76yojh54Xu3uSbQ3JP0A7k8o8GutRF8zbFUA8n0ZH2y0cIEjMliXY4W4LwPA7m4q0ObmvSjhd63O9d8z1XkUBwIDAQAB"
|
|
231
|
+
strDKIM_k = "rsa"
|
|
232
|
+
strDKIM_t = "s"
|
|
233
|
+
strDKIM_p = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPtW5iwpXVPiH5FzJ7Nrl8USzuY9zqqzjE0D1r04xDN6qwziDnmgcFNNfMewVKN2D1O+2J9N14hRprzByFwfQW76yojh54Xu3uSbQ3JP0A7k8o8GutRF8zbFUA8n0ZH2y0cIEjMliXY4W4LwPA7m4q0ObmvSjhd63O9d8z1XkUBwIDAQAB"
|
|
236
234
|
|
|
237
235
|
if ((strWL == "") || (strDomain == ""))
|
|
238
236
|
hashReturn = { "type" => "DKIM2", "result" => "ERROR", "data" => "Missing parameters", "ext_data" => "One or more expected paramters are missing!" }
|
|
@@ -246,7 +244,7 @@ module WLValidate
|
|
|
246
244
|
if (r.name.to_s == "dkim.sendgrid.net")
|
|
247
245
|
hashReturn = { "type" => "DKIM2", "result" => "PASS", "data" => r.name.to_s, "ext_data" => "cname" }
|
|
248
246
|
boolFoundMatch = true
|
|
249
|
-
elsif ((r.name.to_s == strHost) && (r.data
|
|
247
|
+
elsif ( (r.name.to_s == strHost) && (r.data.split(" ")[0].match %r{#{Regexp.escape(strDKIM_k)}}) && (r.data.split(" ")[1].match %r{#{Regexp.escape(strDKIM_t)}}) && (r.data.split(" ")[2].match %r{#{Regexp.escape(strDKIM_p)}}) )
|
|
250
248
|
hashReturn = { "type" => "DKIM2", "result" => "PASS", "data" => r.name.to_s, "ext_data" => "txt" }
|
|
251
249
|
boolFoundMatch = true
|
|
252
250
|
else
|