nexpose 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba59c0bac7e5f25cdd613a70b20b71090047a7d2
-  data.tar.gz: f265a3d518dc026a7d5bfc06745020562b84daad
+  metadata.gz: edb5b752be2087e90490daa5915d7d119108b47f
+  data.tar.gz: eedd2185b13fd299dd888acacf33be3937f5095e
 SHA512:
-  metadata.gz: a374f92191a04827fa4fb570724def193cbaea92e991cb2008c7a5be47bea85ce4322fbe3c8aeb0a40605dfc5f1968d844879f3d655a15d3f9e5c93101bb3468
-  data.tar.gz: 97f09e56659a23ce47ae322adca8a159724a84a21efef4327480afa2de7bb4e781b3690196bd249922b50a9457b0bf9fd42aeada9162764169bf973db65d4d3d
+  metadata.gz: 47e3c5c57d28c16e496d57fd4a5632f114cf0adae28f140a4cc7048fb873449cdedd41d88471f960a8b9c4d4a052f11b26044e29ad601dd0389d341df06bef2b
+  data.tar.gz: 348b64a4bb09e90d58db1de3b572e09f9765c054bb9b72d1ee8a2861c20dafad6a18b2d8437f87f0387cf98f9698d4ae5ab9ec94c4093c42ecf1a95559306afb

data/lib/nexpose/ajax.rb

@@ -21,9 +21,11 @@ module Nexpose
     # @param [Connection] nsc API connection to a Nexpose console.
     # @param [String] uri Controller address relative to https://host:port
     # @param [String] content_type Content type to use when issuing the GET.
+    # @param [Hash] options Parameter options to the call.
     # @return [String|REXML::Document|Hash] The response from the call.
     #
-    def get(nsc, uri, content_type = CONTENT_TYPE::XML)
+    def get(nsc, uri, content_type = CONTENT_TYPE::XML, options = {})
+      parameterize_uri(uri, options)
       get = Net::HTTP::Get.new(uri)
       get.set_content_type(content_type)
       _request(nsc, get)
@@ -110,7 +112,7 @@ module Nexpose
     # @return [Hash] The parameterized URI.
 
     def parameterize_uri(uri, parameters)
-      uri = uri.concat(('?').concat(parameters.map { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&'))) if parameters
+      uri = uri.concat(('?').concat(parameters.map { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&'))) unless Hash(parameters).empty?
     end
 
     ###

data/lib/nexpose/report.rb

@@ -421,7 +421,7 @@ module Nexpose
     # 3. potential (The check for a potential vulnerability was positive.)
     # These values are supported for CSV and XML formats.
     attr_reader :id
-    # One of: site|group|device|scan|vuln-categories|vuln-severity|vuln-status|cyberscope-component|cyberscope-bureau|cyberscope-enclave
+    # One of: site|group|device|scan|vuln-categories|vuln-severity|vuln-status|cyberscope-component|cyberscope-bureau|cyberscope-enclave|tag
     attr_reader :type
 
     def initialize(type, id)

data/lib/nexpose/tag.rb

@@ -6,15 +6,15 @@ module Nexpose
     #
     # @return [Array[TagSummary]] List of current tags.
     #
-    def list_tags
+    def tags
       tag_summary = []
-      tags = JSON.parse(AJAX.get(self, '/api/2.0/tags'))
+      tags = JSON.parse(AJAX.get(self, '/api/2.0/tags', AJAX::CONTENT_TYPE::JSON, { per_page: 2147483647 }))
       tags['resources'].each do |json|
         tag_summary << TagSummary.parse(json)
       end
       tag_summary
     end
-    alias_method :tags, :list_tags
+    alias_method :list_tags, :tags
 
     # Deletes a tag by ID
     #
@@ -29,15 +29,15 @@ module Nexpose
     # @param [Fixnum] asset_id of the asset to list the applied tags for
     # @return [Array[TagSummary]] list of tags on asset
     #
-    def list_asset_tags(asset_id)
+    def asset_tags(asset_id)
       tag_summary = []
-      asset_tag = JSON.parse(AJAX.get(self, "/api/2.0/assets/#{asset_id}/tags"))
+      asset_tag = JSON.parse(AJAX.get(self, "/api/2.0/assets/#{asset_id}/tags", AJAX::CONTENT_TYPE::JSON, { per_page: 2147483647 }))
       asset_tag['resources'].select { |r| r['asset_ids'].find { |i| i == asset_id } }.each do |json|
         tag_summary << TagSummary.parse(json)
       end
       tag_summary
     end
-    alias_method :asset_tags, :list_asset_tags
+    alias_method :list_asset_tags, :asset_tags
 
     # Removes a tag from an asset
     #
@@ -53,14 +53,15 @@ module Nexpose
     # @param [Fixnum] site_id id of the site to get the applied tags
     # @return [Array[TagSummary]] list of tags on site
     #
-    def list_site_tags(site_id)
+    def site_tags(site_id)
       tag_summary = []
-      site_tag = JSON.parse(AJAX.get(self, "/api/2.0/sites/#{site_id}/tags"))
+      site_tag = JSON.parse(AJAX.get(self, "/api/2.0/sites/#{site_id}/tags", AJAX::CONTENT_TYPE::JSON, { per_page: 2147483647 }))
       site_tag['resources'].each do |json|
         tag_summary << TagSummary.parse(json)
       end
       tag_summary
     end
+    alias_method :list_site_tags, :site_tags
 
     # Removes a tag from a site
     #
@@ -76,16 +77,16 @@ module Nexpose
     # @param [Fixnum] asset_group_id id of the group on which tags are listed
     # @return [Array[TagSummary]] list of tags on asset group
     #
-    def list_asset_group_tags(asset_group_id)
+    def asset_group_tags(asset_group_id)
       tag_summary = []
-      asset_group_tag = JSON.parse(AJAX.get(self, "/api/2.0/asset_groups/#{asset_group_id}/tags"))
+      asset_group_tag = JSON.parse(AJAX.get(self, "/api/2.0/asset_groups/#{asset_group_id}/tags", AJAX::CONTENT_TYPE::JSON, { per_page: 2147483647 }))
       asset_group_tag['resources'].each do |json|
         tag_summary << TagSummary.parse(json)
       end
       tag_summary
     end
-    alias_method :group_tags, :list_asset_group_tags
-    alias_method :asset_group_tags, :list_asset_group_tags
+    alias_method :group_tags, :asset_group_tags
+    alias_method :list_asset_group_tags, :asset_group_tags
 
     # Removes a tag from an asset_group
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - HD Moore
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librex