nexpose 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a14fda65d152d074a2adba56c7180417b04c9569
-  data.tar.gz: 6e349f9013e13f8b2972ada209543dee513d612a
+  metadata.gz: 2d155da8a6809996a0d6b256536545a3c45554be
+  data.tar.gz: 2ef562dc10924617e59593730c587791c3226523
 SHA512:
-  metadata.gz: aaf259cadc6172ca32f9a07d6a15240dab9c0baf0f565ffe070c16472c7d3c0768ae86850cc4850eaf9221bf292d00f9c5619566fa62f447e83289e930ef0b04
-  data.tar.gz: a7b6825ce9cd0898acdd6784e106c7a3823c88ec1bf227ccd13de18d0355132aea1532d14cf3b458af9f412bb7561a9f900d02715a745edaab7b9f9f6e9724f0
+  metadata.gz: 084f5d5a5bded5948d052145cff788905552b745f2898dbb013da506d1affeaf36d5913f1bebaebb95fc339401f97ebda6e4742b2815a7f5bf239716daf47564
+  data.tar.gz: abd42a4cf1f65811dacc7533f811566f3d18fff448af16028d97cdab659a1a0f4a343d0c0b97bab9d3aa970320b94c5678e5258c2759db60baec330b33bb7e33

data/lib/nexpose/discovery.rb

@@ -35,11 +35,6 @@ module Nexpose
       HTTPS = 'HTTPS'
     end
 
-    module Type
-      V_SPHERE = 'VSPHERE'
-      AWS = 'AWS'
-    end
-
     # A unique identifier for this connection.
     attr_accessor :id
 
@@ -47,7 +42,6 @@ module Nexpose
     attr_accessor :name
 
     # The IP address or fully qualified domain name of the server.
-    # For AWS connections, this is the address of the regional server.
     attr_accessor :address
 
     # A user name that can be used to log into the server.
@@ -62,12 +56,6 @@ module Nexpose
     # The port used for connecting to the server. A valid port from 1 to 65535.
     attr_accessor :port
 
-    # The type of discovery connection.
-    attr_accessor :type
-    
-    # Whether the console and scan engine are inside the AWS network.
-    attr_accessor :inside_network
-
     # Whether or not the connection is active.
     # Discovery is only possible when the connection is active.
     attr_accessor :status
@@ -85,7 +73,6 @@ module Nexpose
       @id = -1
       @port = 443
       @protocol = Protocol::HTTPS
-      @type = Type::V_SPHERE
     end
 
     # Save this discovery connection to a Nexpose console.
@@ -143,35 +130,13 @@ module Nexpose
     end
 
     def as_xml
-      # TODO
-      # <DiscoveryConfig id="-1" name="aws" port="443" protocol="HTTPS" username="asdf" type="AWS" usePrivateIPAddress="0" engineid="2" region="ec2.us-west-1.amazonaws.com" password="asdf"> </DiscoveryConfig>
-      # <DiscoveryConfig id="-1" name="external AWS" port="443" protocol="HTTPS" username="acess-key-id" type="AWS" usePrivateIPAddress="0" engineid="2" region="ec2.sa-east-1.amazonaws.com" password="secret Access Key">
-      # <DiscoveryConfig id="-1" name="internal-aws" port="443" protocol="HTTPS" username=" " type="AWS" usePrivateIPAddress="1" engineid="2" region="ec2.ap-northeast-1.amazonaws.com" password="Not required">
-      # <DiscoveryConfig id="-1" name="V the Final Battle" fqdn="vcenter001.osdc.lax.rapid7.com" port="443" protocol="HTTPS" username="TOR\lmnexpose" type="VSPHERE" usePrivateIPAddress="0" engineid="2" region="ec2.us-east-1.amazonaws.com" password="22yQCA0P8nSvfrE">
-      # <DiscoveryConfig id="-1" name="duplicate vSphere" fqdn="vcenter001.osdc.lax.rapid7.com" port="443" protocol="HTTPS" username="blah" type="VSPHERE" usePrivateIPAddress="0" engineid="2" region="ec2.us-east-1.amazonaws.com" password="blah">
-      # <DiscoveryConfig id="10" name ="vCenter" fqdn ="vcenter001.osdc.lax.rapid7.com" port ="443" protocol ="HTTPS" username ="TOR\lmnexpose" type="VSPHERE" usePrivateIPAddress="0"> </DiscoveryConfig>
       xml = REXML::Element.new('DiscoveryConnection')
-      xml.add_attributes({ 'id' => @id,
-                           'name' => @name,
+      xml.add_attributes({ 'name' => @name,
+                           'address' => @address,
                            'port' => @port,
-                           'protocol' => @protocol })
-      case @type
-      when Type::AWS
-        xml.add_attributes({ 'region' => @address })
-        if @inside_network
-          xml.add_attributes({ 'usePrivateIPAddress' => 1,
-                               'username' => ' ',
-                               'password' => 'Not required' })
-        else
-          xml.add_attributes({ 'usePrivateIPAddress' => 0,
-                               'username' => @user,
-                               'password' => @password })
-        end
-      when Type::V_SPHERE
-        xml.add_attributes({ 'fqdn' => @address,
-                             'username' => @user,
-                             'password' => @password })
-      end
+                           'protocol' => @protocol,
+                           'user-name' => @user,
+                           'password' => @password })
       xml
     end
 
@@ -180,9 +145,6 @@ module Nexpose
     end
 
     def self.parse(xml)
-      # <DiscoveryConfig id="10" name ="vCenter" fqdn ="vcenter001.osdc.lax.rapid7.com" port ="443" protocol ="HTTPS" username ="TOR\lmnexpose" type="VSPHERE" usePrivateIPAddress="0"> </DiscoveryConfig>
-      # <DiscoveryConfig id="34" name ="external AWS" region ="ec2.sa-east-1.amazonaws.com" port ="443" protocol ="HTTPS" username ="acess-key-id" type="AWS" usePrivateIPAddress="0">
-      # <DiscoveryConfig id="32" name ="my-aws" region ="ec2.ap-northeast-1.amazonaws.com" port ="443" protocol ="HTTPS" username =" " type="AWS" usePrivateIPAddress="1">
       conn = new(xml.attributes['name'],
                  xml.attributes['address'],
                  xml.attributes['user-name'])

data/lib/nexpose/filter.rb

@@ -329,7 +329,9 @@ module Nexpose
     end
 
     def self.parse(json)
-      ret = Criteria.new([], json['operator'])
+      # The call returns empty JSON, so default to 'AND' if not present.
+      operator = json['operator'] || 'AND'
+      ret = Criteria.new([], operator)
       json['criteria'].each do |c|
         ret.criteria << Criterion.parse(c)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - HD Moore
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rex