Merge pull request rapid7#300 from rapid7/conn_timeout_fixes

Some methods were not honoring custom Connection Timeouts
CyberSME · Sep 28, 2017 · e84e383 · e84e383
2 parents ef9d9e6 + 9ee7203
commit e84e383
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/nexpose/connection.rb b/lib/nexpose/connection.rb
@@ -57,11 +57,11 @@ class Connection
     attr_reader :response_xml
     # The trust store to validate connections against if any
     attr_reader :trust_store
-    # The main HTTP read_timeout value
+    # The main HTTP read_timeout value, in seconds
     # For more information visit the link below:
     # https://ruby-doc.org/stdlib/libdoc/net/http/rdoc/Net/HTTP.html#read_timeout-attribute-method
     attr_accessor :timeout
-    # The optional HTTP open_timeout value
+    # The optional HTTP open_timeout value, in seconds
     # For more information visit the link below:
     # http://ruby-doc.org/stdlib/libdoc/net/http/rdoc/Net/HTTP.html#open_timeout-attribute-method
     attr_accessor :open_timeout

diff --git a/lib/nexpose/group.rb b/lib/nexpose/group.rb
@@ -159,7 +159,7 @@ def rescan_assets(connection)
     #
     def self.load(connection, id)
       xml = %(<AssetGroupConfigRequest session-id="#{connection.session_id}" group-id="#{id}"/>)
-      r   = APIRequest.execute(connection.url, xml)
+      r   = APIRequest.execute(connection.url, xml, '1.1', { timeout: connection.timeout, open_timeout: connection.open_timeout })
       parse(r.res)
     end
 

diff --git a/lib/nexpose/role.rb b/lib/nexpose/role.rb
@@ -157,7 +157,7 @@ def initialize(name, full_name, id = -1, enabled = true, scope = Scope::SILO)
     def self.load(nsc, name, scope = Scope::SILO)
       xml = nsc.make_xml('RoleDetailsRequest')
       xml.add_element('Role', { 'name' => name, 'scope' => scope })
-      response = APIRequest.execute(nsc.url, xml, '1.2')
+      response = APIRequest.execute(nsc.url, xml, '1.2', { timeout: nsc.timeout, open_timeout: nsc.open_timeout })
 
       if response.success
         elem = REXML::XPath.first(response.res, 'RoleDetailsResponse/Role/')
@@ -179,7 +179,7 @@ def save(nsc)
       end
       xml.add_element(as_xml)
 
-      response  = APIRequest.execute(nsc.url, xml, '1.2')
+      response  = APIRequest.execute(nsc.url, xml, '1.2', { timeout: nsc.timeout, open_timeout: nsc.open_timeout })
       xml       = REXML::XPath.first(response.res, 'RoleCreateResponse')
       @id       = xml.attributes['id'].to_i unless @existing
       @existing = true

diff --git a/lib/nexpose/site.rb b/lib/nexpose/site.rb
@@ -550,7 +550,7 @@ def scan(connection, sync_id = nil, blackout_override = false)
                            'sync-id' => sync_id })
 
       xml.add_attributes({ 'force' => true }) if blackout_override
-      response = connection.execute(xml, '1.1', timeout: 60)
+      response = connection.execute(xml, '1.1', timeout: connection.timeout)
       Scan.parse(response.res) if response.success
     end
   end