nexpose 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28266093c49d6743e5a662298252c67779d54659
-  data.tar.gz: e1525369d7ee0b2052c87c0b3d14f763085f5276
+  metadata.gz: a42c70664170fab14be9e4ae17903c81da5360ff
+  data.tar.gz: 6938f2319a3f111f57384e07031b7fa88e69e7fa
 SHA512:
-  metadata.gz: baa5a71852ad9259b8086ad9e0a6983cedd152f6da5efbbd3278070e4b633c4c81abd1eeb414aacb33a9010705df40ba30a46e30d85e103028a796f0c3883e10
-  data.tar.gz: 481d97ce05e9b5976a3f679dcc502d6f071db593e28dab6fd4be00ccfc365680405c2eda62cb5bdb897059e1de1e78e830043e05b52089cf8303efc684b51c79
+  metadata.gz: 717acb49d1c6b133d706fb17de051f03995176acc032e94a129ac4af50860acff3a616ca3af5e87879d075772690a7f30399ff93983a531e1f20f841bfff6d87
+  data.tar.gz: 5b9c431a8f4c16b17e2decc10bcdd7039fbff6b142a8a3b52adc3875a99e3219d145c3c0a21a29d7288f26a20a7e9d194622e44e9265cce2797bc863a1272a44

data/lib/nexpose.rb

@@ -55,6 +55,7 @@ require 'uri'
 require 'rex/mime'
 require 'ipaddr'
 require 'json'
+require 'cgi'
 require 'nexpose/error'
 require 'nexpose/util'
 require 'nexpose/alert'

data/lib/nexpose/ajax.rb

@@ -107,9 +107,9 @@ module Nexpose
     # @param [String] uri Controller address relative to https://host:port
     # @param [Hash] parameters Hash of attributes that need to be sent
     #    to the controller.
-    # @return [Hash] The parametrized URI.
+    # @return [Hash] The parameterized URI.
 
-    def parametrize_uri(uri, parameters)
+    def parameterize_uri(uri, parameters)
       uri = uri.concat(('?').concat(parameters.map { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&'))) if parameters
     end
 

data/lib/nexpose/dag.rb

@@ -32,7 +32,7 @@ module Nexpose
       admins = nsc.users.select { |u| u.is_admin }.map { |u| u.id }
       @users.reject! { |id| admins.member? id }
       params = @id ? { 'entityid' => @id, 'mode' => 'edit' } : { 'entityid' => false, 'mode' => false } 
-      uri = AJAX.parametrize_uri('/data/assetGroup/saveAssetGroup', params)
+      uri = AJAX.parameterize_uri('/data/assetGroup/saveAssetGroup', params)
       data = JSON.parse(AJAX.post(nsc, uri, _to_entity_details, AJAX::CONTENT_TYPE::JSON))
       data['response'] == 'success.'
     end

data/lib/nexpose/multi_tenant_user.rb

@@ -17,6 +17,7 @@ module Nexpose
       end
       arr
     end
+    alias_method :silo_users, :list_silo_users
 
     # Delete the specified silo user
     #
@@ -216,4 +217,4 @@ module Nexpose
       end
     end
   end
-end
+end

data/lib/nexpose/report.rb

@@ -85,6 +85,8 @@ module Nexpose
 
     # The report definition (config) ID.
     attr_reader :config_id
+    # The report config name.
+    attr_reader :name
     # The ID of the report template.
     attr_reader :template_id
     # The current status of the report.
@@ -98,8 +100,9 @@ module Nexpose
     # One of: (global|silo).
     attr_reader :scope
 
-    def initialize(config_id, template_id, status, generated_on, uri, scope)
+    def initialize(config_id, name, template_id, status, generated_on, uri, scope)
       @config_id = config_id.to_i
+      @name = name
       @template_id = template_id
       @status = status
       @generated_on = generated_on
@@ -109,6 +112,7 @@ module Nexpose
 
     def self.parse(xml)
       ReportConfigSummary.new(xml.attributes['cfg-id'].to_i,
+                              xml.attributes['name'],
                               xml.attributes['template-id'],
                               xml.attributes['status'],
                               xml.attributes['generated-on'],

data/lib/nexpose/scan_template.rb

@@ -155,6 +155,13 @@ module Nexpose
       REXML::XPath.first(service_ports, './portList').text = ports.join(",")
     end
 
+    # Disable TCP port scanning.
+    # @param [Boolean] enable or disable TCP ports
+    def enable_tcp_ports=(enable)
+      service_ports = REXML::XPath.first(@xml, 'ScanTemplate/ServiceDiscovery/TCPPortScan')
+      service_ports.attributes['mode'] = 'none' unless enable
+    end
+
     # Add custom UDP ports to scan for services
     # @param [Array] posts to scan
     def udp_service_ports=(ports)
@@ -163,7 +170,7 @@ module Nexpose
       REXML::XPath.first(service_ports, './portList').text = ports.join(",")
     end
 
-    # Disable UDP port scan
+    # Disable UDP port scanning.
     # @param [Boolean] enable or disable UDP ports
     def enable_udp_ports=(enable)
       service_ports = REXML::XPath.first(@xml, 'ScanTemplate/ServiceDiscovery/UDPPortScan')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - HD Moore
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librex