nexpose 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b36711705abe08891f4b9a2a91e2661b660f589
-  data.tar.gz: b23983acf0e13451dd48f2028decf89b5363c439
+  metadata.gz: 7623dcceb5d3d3c27dc38ec36c4d79e337ff1044
+  data.tar.gz: 44a91ad0a5b482f9b4e2ff249405fc8bf1855595
 SHA512:
-  metadata.gz: 6918bea23f955aa033e9e61cd9249da0257daf89a422dbd714d63906e595a89ed60607067ab074b66a500946e3b3b73d6410186bc4570e5140c910b2941c14f5
-  data.tar.gz: a47dca8c883ae9a5319f6d54d59ab3179e7d94562e7f962c07f33050f872b5c0dfa2ff5c041d411301e6ac199053ac43ed5d2d881cc7d12948937fe71297bb64
+  metadata.gz: d6dbf1f038b82d96689c56aa58caed2502b0e2021c7b3b8e5fd9a0099fa487c93fad78cb61b28892cd582e23332f15facd48c54664d64a2b560b8f8da726ea10
+  data.tar.gz: 8078c7d299558f71874710768a19541283901c4045efa571f17e8e2869ea1033b9a89866463bb08bf4b42d264c21c3d0390f96d0e6d465876656d6191608505d

data/Gemfile.lock

@@ -1,46 +1,46 @@
 PATH
   remote: .
   specs:
-    nexpose (5.0.0)
+    nexpose (5.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.7)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
+    addressable (2.3.8)
+    ast (2.2.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    multi_json (1.10.1)
-    parser (2.2.0.3)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.0)
+    multi_json (1.11.2)
+    parser (2.3.1.2)
+      ast (~> 2.2)
+    powerpack (0.1.1)
     rainbow (2.0.0)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.1)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     rubocop (0.29.1)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.1)
+    ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
     simplecov (0.9.2)
       docile (~> 1.1.0)
@@ -60,10 +60,7 @@ DEPENDENCIES
   codeclimate-test-reporter (~> 0.4.6)
   nexpose!
   rspec (~> 3.2)
-  rubocop (~> 0.29.0)
+  rubocop
   simplecov (~> 0.9.1)
   vcr (~> 2.9.3)
   webmock (~> 1.20.4)
-
-BUNDLED WITH
-   1.12.2

data/lib/nexpose/asset.rb

@@ -38,6 +38,8 @@ module Nexpose
     attr_reader :group_accounts
     # Files and directories that have been enumerated on the asset. [Lazy]
     attr_reader :files
+    # Unique system identifiers on the asset.
+    attr_accessor :unique_identifiers
 
     def initialize
       @addresses = []
@@ -47,7 +49,7 @@ module Nexpose
     # Load an asset from the provided console.
     #
     # @param [Connection] nsc Active connection to a Nexpose console.
-    # @param [String] id Unique identifier of an asset.
+    # @param [Fixnum] id Unique identifier of an asset.
     # @return [Asset] The requested asset, if found.
     #
     def self.load(nsc, id)
@@ -263,6 +265,39 @@ module Nexpose
     end
   end
 
+  # Unique system identifiers on an asset.
+  #
+  class UniqueIdentifier < APIObject
+    # The source name for the uniuqe identifier.
+    attr_reader :source
+    # Unique identifier of the user as determined by the asset (not Nexpose).
+    attr_reader :id
+
+    def initialize(source = nil, id = nil)
+      @id = id
+      @source = source
+    end
+
+    def to_h
+      { source: source,
+        id: id }
+    end
+
+    def <=>(other)
+      c = source <=> other.source
+      return c unless c == 0
+      id <=> other.id
+    end
+
+    def ==(other)
+      eql?(other)
+    end
+
+    def eql?(other)
+      source.eql?(other.source) && id.eql?(other.id)
+    end
+  end
+
   # Assessment statistics for an asset.
   #
   class Assessment < APIObject

data/lib/nexpose/blackout.rb

@@ -15,17 +15,25 @@ module Nexpose
     attr_accessor :blackout_duration
 
     def initialize(start, enabled=true, duration, type, interval)
-      @blackout_start = start
-      @enabled =enabled
+      @blackout_start    = start
+      @enabled           = enabled
       @blackout_duration = duration.to_i
-      @blackout_type = type
+      @blackout_type     = type
       @blackout_interval = interval.to_i
     end
 
     def self.from_hash(hash)
       repeat_blackout_hash = hash[:repeat_blackout]
-      blackout = new(hash[:start_date], hash[:blackout_duration], repeat_blackout_hash[:type], repeat_blackout_hash[:interval])
-      blackout
+
+      if repeat_blackout_hash.nil?
+        type     = 'daily'
+        interval = 0
+      else
+        type     = repeat_blackout_hash[:type]
+        interval = repeat_blackout_hash[:interval]
+      end
+
+      new(hash[:start_date], hash[:blackout_duration], type, interval)
     end
 
     def to_h
@@ -42,4 +50,4 @@ module Nexpose
       blackout_hash
     end
   end
-end
+end

data/lib/nexpose/external.rb

@@ -79,6 +79,8 @@ module Nexpose
       attr_accessor :groups
       # Files and directories on the asset.
       attr_accessor :files
+      # Unique system identifiers on the asset.
+      attr_accessor :unique_identifiers
       # A list of key-value attributes associated with the asset.
       attr_accessor :attributes
       # Asset-level vulnerabilities.
@@ -92,6 +94,7 @@ module Nexpose
         @users = []
         @groups = []
         @files = []
+        @unique_identifiers = []
         @vulnerabilities = []
       end
 
@@ -113,6 +116,7 @@ module Nexpose
           users: users.map(&:to_h),
           groups: groups.map(&:to_h),
           files: files.map(&:to_h),
+          unique_identifiers: unique_identifiers.map(&:to_h),
           vulnerabilities: vulnerabilities.map(&:to_h),
           attributes: Attributes.to_hash(attributes) }
       end

data/lib/nexpose/version.rb

@@ -1,4 +1,4 @@
 module Nexpose
   # The latest version of the Nexpose gem
-  VERSION = '5.0.0'
+  VERSION = '5.1.0'
 end

data/nexpose.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('codeclimate-test-reporter', '~> 0.4.6')
   s.add_development_dependency('simplecov', '~> 0.9.1')
   s.add_development_dependency('rspec', '~> 3.2')
-  s.add_development_dependency('rubocop', '~> 0.29.0')
+  s.add_development_dependency('rubocop')
   s.add_development_dependency('webmock', '~> 1.20.4')
   s.add_development_dependency('vcr', '~> 2.9.3')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - HD Moore
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,16 +75,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -214,8 +214,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby API for Rapid7 Nexpose
 test_files: []
+has_rdoc: