nexpose 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70c4f4ef8d091956dabc195132a8e03576941c1f
-  data.tar.gz: 1026e14754b114bec2c0195d4aa0d0e8d1be1e80
+  metadata.gz: 5a180ab3eff433d31088604fa0cbebe07a7be22c
+  data.tar.gz: b50d30db2b8eb0d351dae295214cdd0f8e63c803
 SHA512:
-  metadata.gz: cd109c671af57fca71f584e99604f4c81bbfbe5bac8f15981542e7a0398e28c53438d057380f80eef2bb4cb91158033a45b5a763f7e3588a3867415657aad367
-  data.tar.gz: 0ce383fa6a43b85dcc0550751b442462ee5ef415abe01ed48d96f64cccf2c45778c85bef5b895995d6cb0afecf2a89bbfb7e6a9bffcabdc9a6857bce8eefe422
+  metadata.gz: 63bc634571fb06d9b4a40870b9e102cc8d53d67375052e34295a4e0f1c37167f24912a30b2c1b2d3dd205f8d60af091905fa8027b0b54bfd8a3cd0923f9e8488
+  data.tar.gz: 3fecd48a480fd0cb88a855e08dea01ef80beeb25cbbfd189a77fda8bc2fff716d8b4fe564265df41d55c2e81caf330784a39f3bc465bfcec3582fa303abbd4bd

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    nexpose (2.1.3)
-      multipart-post (~> 2.0.0)
+    nexpose (3.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -17,8 +16,7 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    multi_json (1.11.0)
-    multipart-post (2.0.0)
+    multi_json (1.10.1)
     parser (2.2.0.3)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.0)
@@ -27,7 +25,7 @@ GEM
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.2)
+    rspec-core (3.2.1)
       rspec-support (~> 3.2.0)
     rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)

data/lib/nexpose/connection.rb

@@ -36,6 +36,8 @@ module Nexpose
     attr_reader :password
     # The URL for communication
     attr_reader :url
+    # The token used to login to the NSC
+    attr_reader :token
 
     # The last XML request sent by this object, useful for debugging.
     attr_reader :request_xml
@@ -43,17 +45,18 @@ module Nexpose
     attr_reader :response_xml
 
     # A constructor to load a Connection object from a URI
-    def self.from_uri(uri, user, pass, silo_id = nil)
+    def self.from_uri(uri, user, pass, silo_id = nil, token = nil)
       uri = URI.parse(uri)
-      new(uri.host, user, pass, uri.port, silo_id)
+      new(uri.host, user, pass, uri.port, silo_id, token)
     end
 
     # A constructor for Connection
-    def initialize(ip, user, pass, port = 3780, silo_id = nil)
+    def initialize(ip, user, pass, port = 3780, silo_id = nil, token = nil)
       @host = ip
       @port = port
       @username = user
       @password = pass
+      @token = token
       @silo_id = silo_id
       @session_id = nil
       @url = "https://#{@host}:#{@port}/api/API_VERSION/xml"
@@ -62,7 +65,7 @@ module Nexpose
     # Establish a new connection and Session ID
     def login
       begin
-        login_hash = {'sync-id' => 0, 'password' => @password, 'user-id' => @username}
+        login_hash = {'sync-id' => 0, 'password' => @password, 'user-id' => @username, 'token' => @token}
         login_hash['silo-id'] = @silo_id if @silo_id
         r = execute(make_xml('LoginRequest', login_hash))
         if r.success

data/lib/nexpose/user.rb

@@ -90,15 +90,16 @@ module Nexpose
     # but caller can override (e.g., using LDAP authenticator).
     attr_accessor :authsrcid
     # Optional fields
-    attr_accessor :email, :password, :sites, :groups
+    attr_accessor :email, :password, :sites, :groups, :token
     # 1 to enable this user, 0 to disable
     attr_accessor :enabled
     # Boolean values
     attr_accessor :all_sites, :all_groups
 
-    def initialize(name, full_name, password, role_name = 'user', id = -1, enabled = 1, email = nil, all_sites = false, all_groups = false)
+    def initialize(name, full_name, password, role_name = 'user', id = -1, enabled = 1, email = nil, all_sites = false, all_groups = false, token = nil)
       @name = name
       @password = password
+      @token = token
       @role_name = role_name
       @authsrcid = ('global-admin'.eql? @role_name) ? '1' : '2'
       @id = id
@@ -119,6 +120,7 @@ module Nexpose
       xml << %Q{ fullname="#{replace_entities(@full_name)}"}
       xml << %Q{ role-name="#{replace_entities(@role_name)}"}
       xml << %Q{ password="#{replace_entities(@password)}"} if @password
+      xml << %Q{ token="#{replace_entities(@token)}"} if @token
       xml << %Q{ email="#{replace_entities(@email)}"} if @email
       xml << %Q{ enabled="#{@enabled}"}
       # These two fields are keying off role_name to work around a defect.
@@ -166,12 +168,13 @@ module Nexpose
 
           email = config.attributes['email']
           password = config.attributes['password']
+          token = config.attributes['token']
           enabled = config.attributes['enabled'].to_i
           all_sites = config.attributes['allSites'] == 'true' ? true : false
           all_groups = config.attributes['allGroups'] == 'true' ? true : false
           # Not trying to load sites and groups.
           # Looks like API currently doesn't return that info to load.
-          return User.new(name, fullname, password, role_name, id, enabled, email, all_sites, all_groups)
+          return User.new(name, fullname, password, role_name, id, enabled, email, all_sites, all_groups, token)
         end
       end
     end

data/lib/nexpose/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - HD Moore
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -212,9 +212,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby API for Rapid7 Nexpose
 test_files: []
-has_rdoc: