wlvalidate 0.1.5 → 0.1.6

data/lib/wlvalidate.rb

@@ -199,11 +199,6 @@ module WLValidate
                arrayDKIM1 = dns.getresources(strHost, Dnsruby::Types.TXT)
                arrayDKIM1.each do |r|
                   if boolFoundMatch == false
-                     puts "DKIM data: #{r.data}"
-                     r.data.split(" ").each {|k|
-                       puts "#{k}"
-                     }
-                     puts "r.name.to_s => #{r.name.to_s}"
                      if (r.name.to_s == "dkim.sendgrid.net") 
                         hashReturn = { "type" => "DKIM1", "result" => "PASS", "data" => r.name.to_s, "ext_data" => "cname" }
                         boolFoundMatch = true
@@ -233,6 +228,9 @@ module WLValidate
          boolFoundMatch = false
          strHost = "smtpapi._domainkey." + strWL + "." + strDomain
          strDKIM = "k=rsa; t=s; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPtW5iwpXVPiH5FzJ7Nrl8USzuY9zqqzjE0D1r04xDN6qwziDnmgcFNNfMewVKN2D1O+2J9N14hRprzByFwfQW76yojh54Xu3uSbQ3JP0A7k8o8GutRF8zbFUA8n0ZH2y0cIEjMliXY4W4LwPA7m4q0ObmvSjhd63O9d8z1XkUBwIDAQAB"
+         strDKIM_k = "rsa"
+         strDKIM_t = "s"
+         strDKIM_p = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPtW5iwpXVPiH5FzJ7Nrl8USzuY9zqqzjE0D1r04xDN6qwziDnmgcFNNfMewVKN2D1O+2J9N14hRprzByFwfQW76yojh54Xu3uSbQ3JP0A7k8o8GutRF8zbFUA8n0ZH2y0cIEjMliXY4W4LwPA7m4q0ObmvSjhd63O9d8z1XkUBwIDAQAB"
 
          if ((strWL == "") || (strDomain == ""))
             hashReturn = { "type" => "DKIM2", "result" => "ERROR", "data" => "Missing parameters", "ext_data" => "One or more expected paramters are missing!" }
@@ -246,7 +244,7 @@ module WLValidate
                      if (r.name.to_s == "dkim.sendgrid.net")
                         hashReturn = { "type" => "DKIM2", "result" => "PASS", "data" => r.name.to_s, "ext_data" => "cname" }
                         boolFoundMatch = true
-                     elsif ((r.name.to_s == strHost) && (r.data == strDKIM))
+                     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)}}) )
                         hashReturn = { "type" => "DKIM2", "result" => "PASS", "data" => r.name.to_s, "ext_data" => "txt" }
                         boolFoundMatch = true
                      else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wlvalidate
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors: