tdi 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d0c80dd475a561817fc1f62ba2f576abad3b5ab
-  data.tar.gz: febd8a7c033de2392ab1f5b1e82e8e7bde7a7da5
+  metadata.gz: 9ace014ad816a976c9ca34af587c453b3855039b
+  data.tar.gz: 9f884036570d63cbddb5bb9e13798b5457d2259c
 SHA512:
-  metadata.gz: 3e3562d2e19a778229d38e2bc195592a123e2ee99388bd4dabbce660329ff1bacfa766333db8bf04ed9e7ce31e47320860a278d14bdd4094ca6c6852fbf20211
-  data.tar.gz: 0a775bcfb7363ebd187bb9604dc2c1a7f241e93098c03e3861dcb582cc94e3592f04cf2800fb6b8fc9de56f632c0f92717963b9a4c5e5cec50eb9784d7643f9c
+  metadata.gz: 2e22075e3756151860807f0c6e94dfceb19fcfe63757de885b491d6166f98013fa7317bb1d29836ee960c4c48d9f05c6e6decbc6eb0779df91da34fd11005302
+  data.tar.gz: b2b39a09a8c839f7f24e2277f3a4f4cdc2ebedb1d661f183bb9c507000d4522b6f542b506699713911da836598ce7aa2dff60044c6adbaea1d3fb9ff676d738f

data/bin/tdi

@@ -42,6 +42,7 @@
 ## REQUIRES ##
 ##############
 
+require 'etc'
 require 'slop'
 require 'json'
 require 'colorize'

data/helper/acl.rb

@@ -19,7 +19,7 @@
 
 require 'socket'
 require 'timeout'
-require 'etc'
+require 'resolv'
 
 class TDIPlan < TDI
   def acl(plan)
@@ -39,6 +39,8 @@ class TDIPlan < TDI
         begin
           timeout(timeout_limit) do
             begin
+
+              Resolv.getaddress(host)
               sock = TCPSocket.open(host, port)
               sock.close
               success "ACL (#{user}): #{host}:#{port}"
@@ -46,6 +48,10 @@ class TDIPlan < TDI
               warning "ACL (#{user}): #{host}:#{port}"
             rescue Errno::ECONNRESET, Errno::ETIMEDOUT
               failure "ACL (#{user}): Connection Refused #{host}:#{port}"
+            rescue Resolv::ResolvError => re
+              failure "ACL (#{user}): #{re.message}"
+            rescue Resolv::ResolvTimeou => rt
+              failure "ACL (#{user}): #{rt.message}"
             end
           end
         rescue Timeout::Error

data/helper/http.rb

@@ -20,8 +20,8 @@
 require 'net/http'
 require "net/https"
 require 'timeout'
-require 'etc'
 require 'uri'
+require 'resolv'
 
 class TDIPlan < TDI
 
@@ -60,18 +60,19 @@ class TDIPlan < TDI
 
       host, port, path, proxy_addr, proxy_port, code, match, ssl, timeout_limit = _parse(case_name,case_content)
 
-      # User.
+      # User
       user = Etc.getpwuid(Process.euid).name
      
       response = nil
 
       if not proxy_addr.nil? and not proxy_port.nil?
-
-        http = Net::HTTP::Proxy(proxy_addr, proxy_port)
-
         begin
+          Resolv.getaddress(proxy_addr)
+          http = Net::HTTP::Proxy(proxy_addr, proxy_port)
+
           timeout(timeout_limit) do
             begin
+              Resolv.getaddress(host)
               http.start(host,port,:use_ssl => ssl, :verify_mode => OpenSSL::SSL::VERIFY_NONE) { |http|
                 response = http.get(path)
               }
@@ -79,20 +80,24 @@ class TDIPlan < TDI
               warning "HTTP (#{user}): #{case_name} - Connection reset or refused."
             end
           end
+        rescue Resolv::ResolvError => re
+          failure "HTTP (#{user}): #{re.message}"
+        rescue Resolv::ResolvTimeout => rt
+          failure "HTTP (#{user}): #{rt.message}"
         rescue Timeout::Error
           failure "HTTP (#{user}): #{case_name} - Timed out (#{timeout_limit}s)."
         end
         
       else
+        begin
+          Resolv.getaddress(host)
+          http = Net::HTTP.new(host, port)
 
-        http = Net::HTTP.new(host, port)
-
-        if ssl
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end 
+          if ssl
+              http.use_ssl = true
+              http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
 
-        begin        
           timeout(timeout_limit) do
             begin
               http.start() { |http|
@@ -102,6 +107,10 @@ class TDIPlan < TDI
               warning "HTTP (#{user}): #{case_name} - Connection reset or refused."
             end
           end
+        rescue Resolv::ResolvError => re
+          failure "HTTP (#{user}): #{re.message}"
+        rescue Resolv::ResolvTimeout => rt
+          failure "HTTP (#{user}): #{rt.message}"
         rescue Timeout::Error
           failure "HTTP (#{user}): #{case_name} - Timed out."
         end

data/helper/ssh.rb

@@ -18,7 +18,7 @@
 # along with TDI.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'net/ssh'
-require 'etc'
+require 'resolv'
 
 class TDIPlan < TDI
   def ssh(plan)
@@ -59,12 +59,17 @@ class TDIPlan < TDI
 
         begin
           timeout(5) do
+            Resolv.getaddress(host)
             ssh_session = Net::SSH.start(host,
                                          remote_user,
                                          :auth_methods => ['publickey'])
             ssh_session.close
             success "SSH (#{local_user}): #{remote_user}@#{host}"
           end
+        rescue Resolv::ResolvError => re
+          failure "SSH (#{local_user}): #{re.message}"
+        rescue Resolv::ResolvTimeout => rt
+          failure "SSH (#{local_user}): #{rt.message}"
         rescue
           failure "SSH (#{local_user}): #{remote_user}@#{host}"
         end

data/lib/tdi/version.rb

@@ -18,5 +18,5 @@
 # along with TDI.  If not, see <http://www.gnu.org/licenses/>.
 
 module Tdi
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/tdi.rb

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with TDI.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'tdi/version'
+require_relative 'tdi/version'
 
 class TDI
   attr_accessor :passed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Rogério Carvalho Schneider
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler