nexpose 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edb5b752be2087e90490daa5915d7d119108b47f
-  data.tar.gz: eedd2185b13fd299dd888acacf33be3937f5095e
+  metadata.gz: 4489a1cf24aae595c8e33906c072e337e2e3fe3b
+  data.tar.gz: 43bd09c01a8f777a1da5545f92c5e41da3f6e99e
 SHA512:
-  metadata.gz: 47e3c5c57d28c16e496d57fd4a5632f114cf0adae28f140a4cc7048fb873449cdedd41d88471f960a8b9c4d4a052f11b26044e29ad601dd0389d341df06bef2b
-  data.tar.gz: 348b64a4bb09e90d58db1de3b572e09f9765c054bb9b72d1ee8a2861c20dafad6a18b2d8437f87f0387cf98f9698d4ae5ab9ec94c4093c42ecf1a95559306afb
+  metadata.gz: 5bcef060fd7b3b78d811863560bb5bcb3437a75f3b7a2368e0182abc31b2c1ddbb15962e1d55c2fc712d6ce7b4764178d97550328ca6c11ad769567caa7ac41b
+  data.tar.gz: 4ef93a44863abf77d5c51cee2899e0a420b83b633a7f8c7add3d8e76bdadf3363a10908bab6995f343600f37101cef06249f3f5c5421ead06095b8c833c56b25

data/lib/nexpose/scan_template.rb

@@ -155,6 +155,13 @@ module Nexpose
       REXML::XPath.first(service_ports, './portList').text = ports.join(",")
     end
 
+    # Exclude TCP ports when scanning for services
+    # @param [Array] ports to exclude from scan
+    def exclude_tcp_service_ports=(ports)
+      service_ports = REXML::XPath.first(@xml, 'ScanTemplate/ServiceDiscovery/ExcludedTCPPortScan')
+      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)
@@ -170,6 +177,13 @@ module Nexpose
       REXML::XPath.first(service_ports, './portList').text = ports.join(",")
     end
 
+    # Exclude UDP ports when scanning for services
+    # @param [Array] ports to exclude from scan
+    def exclude_udp_service_ports=(ports)
+      service_ports = REXML::XPath.first(@xml, 'ScanTemplate/ServiceDiscovery/ExcludedUDPPortScan')
+      REXML::XPath.first(service_ports, './portList').text = ports.join(",")
+    end
+
     # Disable UDP port scanning.
     # @param [Boolean] enable or disable UDP ports
     def enable_udp_ports=(enable)

data/lib/nexpose/tag.rb

@@ -167,15 +167,22 @@ module Nexpose
         LOCATION = 'LOCATION'
         CRITICALITY = 'CRITICALITY'
       end
-    end
 
-    DEFAULT_COLOR = '#f6f6f6'
+      module Color
+        BLUE = "#496a77"
+        DEFAULT = "#f6f6f6"
+        GREEN = "#7d8a58"
+        ORANGE = "#de7200"
+        PURPLE = "#844f7d"
+        RED = "#a0392e"
+      end
+    end
 
     # Creation source
     attr_accessor :source
 
     # HEX color code of tag
-    attr_accessor :color
+    attr_reader :color
 
     # Risk modifier
     attr_accessor :risk_modifier
@@ -200,9 +207,19 @@ module Nexpose
     def initialize(name, type, id = -1)
       @name, @type, @id = name, type, id
       @source = 'nexpose-client'
-      @color = @type == Type::Generic::CUSTOM ? DEFAULT_COLOR : nil
+      @color = @type == Type::Generic::CUSTOM ? Type::Color::DEFAULT : nil
     end
 
+    # Set the color but validate it
+    def color=(hex)
+      valid_colors = Type::Color::constants.map { |c| Type::Color.const_get(c) }
+      unless hex.nil? || valid_colors.include?(hex.to_s.downcase)
+        raise ArgumentError, "Unable to set color to an invalid color.\nUse one of #{valid_colors}"
+      end 
+
+      @color = hex 
+    end 
+
     # Creates and saves a tag to Nexpose console
     #
     # @param [Connection] connection Nexpose connection

metadata

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