truemail 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f597eb293f10835d12b766da633b9d1808424760924a89472416729e60241c23
-  data.tar.gz: a4fe4b473856a44d312bfb15fdd831a412d5764fedc33274f5923b75b59b5ce0
+  metadata.gz: 232ed298a07a579faf90cacc3026134e5ddf7115341df4f337c1108d262e284a
+  data.tar.gz: 997c3a81c6fcf3faa2e797fcd9047970a7a39f66551252529aaaa3a4ea978428
 SHA512:
-  metadata.gz: dd936cd55b94200bb344d78236527f31cb298e2a453ca660f4d825ba0538c9d6057e730b975319f68130fe64d847cdacb7937a4dbb0344f3ceaf43efb7f3b7b0
-  data.tar.gz: 3d8814c197319adb5fb8e9fb2e1c5b5d46dee8adb3bab204199d98b78137b9cbdf8ca28873405b65af8c570ff499a93981851a2bd5e962f1c5910c9303c00125
+  metadata.gz: ffa32874a430e4af6a04828744f0d5c9f1adc7d9f5a58de547c62666ecc639c7b4af2a1979368a2e1264196e391dfbfe1df33ab2fa42efef39d13447ed94c571
+  data.tar.gz: 1546da1c4106c114a0eb3180ad4361749b5334ca5c791a5f11b6f98aabffa3a4a52f57c52666b82972b7e2a75529c781ff22430180c6c8c529cf2f2a0f7450ae

data/.reek.yml

@@ -29,7 +29,7 @@ detectors:
       - Truemail::Validator#select_validation_type
       - Truemail::Validate::Mx#null_mx?
       - Truemail::Validate::Mx#a_record
-      - Truemail::Audit::Ptr#current_host_address
+      - Truemail::Audit::Base#verifier_domain
 
   ControlParameter:
     exclude:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    truemail (0.1.7)
+    truemail (0.1.8)
 
 GEM
   remote: https://rubygems.org/

data/lib/truemail/audit/base.rb

@@ -8,6 +8,10 @@ module Truemail
       def add_warning(message)
         result.warnings[self.class.name.split('::').last.downcase.to_sym] = message
       end
+
+      def verifier_domain
+        Truemail.configuration.verifier_domain
+      end
     end
   end
 end

data/lib/truemail/audit/ptr.rb

@@ -6,23 +6,32 @@ module Truemail
       require 'ipaddr'
       require 'resolv'
 
-      NOT_FOUND = 'ptr record for current host address was not found'
-      NOT_REFERENCES = 'ptr record does not reference to current verifier domain'
+      GET_MY_IP_URL = 'https://api.ipify.org'
+      IPIFY_ERROR = 'impossible to detect current host address via third party service'
+      PTR_NOT_FOUND = 'ptr record for current host address was not found'
+      PTR_NOT_REFER = 'ptr record does not reference to current verifier domain'
+      VERIFIER_DOMAIN_NOT_REFER = ''
 
       def run
-        return if ptr_records.empty? && add_warning(Truemail::Audit::Ptr::NOT_FOUND)
-        return if ptr_references_to_verifier_domain?
-        add_warning(Truemail::Audit::Ptr::NOT_REFERENCES)
+        return if !current_host_address && add_warning(Truemail::Audit::Ptr::IPIFY_ERROR)
+        return if ptr_records.empty? && add_warning(Truemail::Audit::Ptr::PTR_NOT_FOUND)
+        return if ptr_not_refer_to_verifier_domain? && add_warning(Truemail::Audit::Ptr::PTR_NOT_REFER)
+        return if verifier_domain_refer_to_current_host_address?
+        add_warning(Truemail::Audit::Ptr::VERIFIER_DOMAIN_NOT_REFER)
       end
 
       private
 
+      def detect_ip_via_ipify
+        Net::HTTP.get(URI(Truemail::Audit::Ptr::GET_MY_IP_URL))
+      end
+
       def current_host_address
-        Resolv.getaddress(Socket.gethostname)
+        @current_host_address ||= Truemail::Wrapper.call { IPAddr.new(detect_ip_via_ipify) }
       end
 
       def current_host_reverse_lookup
-        IPAddr.new(current_host_address).reverse
+        current_host_address.reverse
       end
 
       def ptr_records
@@ -33,8 +42,16 @@ module Truemail
         end || []
       end
 
-      def ptr_references_to_verifier_domain?
-        ptr_records.include?(Truemail.configuration.verifier_domain)
+      def ptr_not_refer_to_verifier_domain?
+        !ptr_records.include?(verifier_domain)
+      end
+
+      def a_record
+        Truemail::Wrapper.call { Resolv::DNS.new.getaddress(verifier_domain).to_s }
+      end
+
+      def verifier_domain_refer_to_current_host_address?
+        a_record == current_host_address.to_s
       end
     end
   end

data/lib/truemail/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Truemail
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/truemail/wrapper.rb

@@ -14,7 +14,7 @@ module Truemail
 
     def call(&block)
       Timeout.timeout(Truemail.configuration.connection_timeout, &block)
-    rescue Resolv::ResolvError
+    rescue Resolv::ResolvError, IPAddr::InvalidAddressError
       false
     rescue Timeout::Error
       retry unless (self.attempts -= 1).zero?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truemail
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: truemail