nexpose 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4397794b70770fea503a7f1613d55350ecdb34e4
-  data.tar.gz: 94ca3aff891805148565fe6b868ea2c22f847038
+  metadata.gz: c5104a1f9ff2537b542608d4c5c8d42418bb42ca
+  data.tar.gz: 6c5315d6fde97465c5d1120d15990562b518c91d
 SHA512:
-  metadata.gz: 2c274049ae4574d6201fe233221c729aa23ab9a5df81397cfda75601f3f3cd59ce830bd8fd43573879b29ea6f74f7e18bca3fe6ce8da9f2e549c9efb0dbb7e15
-  data.tar.gz: c2113f68a3c3c06e6c3f070ed9114f8351b7b01948dfa540e12558b6157d2e5eb17a85f2e9276314f7dfb64147ec5b7f7e8651dbc85180b69cf18c84d4524381
+  metadata.gz: bfe59dabbed124dbb3f0ab2e40b37bfe1a37252fc7b68c479dc1c0ebad8da7726a40074e20ca6b4cd99b1767a23fab33ac293cfac31f95a59067e10abb404a35
+  data.tar.gz: 32b85bfd2c1f0f281a2d02302d8381639af4a728dbd6c3b193b5dc633117edc2470767bbc50c4c09b3ae739bbdd8a714f650a3f1c1f3b4ebdd57def0445b34dd

data/lib/nexpose/common.rb

@@ -163,4 +163,54 @@ module Nexpose
       MONTHLY_DAY = 'monthly-day'
     end
   end
+
+  class Organization
+    attr_accessor :name
+    attr_accessor :url
+    attr_accessor :primary_contact
+    attr_accessor :job_title
+    attr_accessor :email
+    attr_accessor :telephone
+    attr_accessor :address
+    attr_accessor :state
+    attr_accessor :city
+    attr_accessor :zip
+    attr_accessor :country
+
+    def initialize(&block)
+      instance_eval &block if block_given?
+    end
+
+    def self.parse(xml)
+      new do |org|
+        org.name = xml.attributes['name']
+        org.url = xml.attributes['url']
+        org.primary_contact = xml.attributes['primaryContact']
+        org.job_title = xml.attributes['jobTitle']
+        org.email = xml.attributes['email']
+        org.telephone = xml.attributes['telephone']
+        org.address = xml.attributes['businessAddress']
+        org.state = xml.attributes['state']
+        org.city = xml.attributes['city']
+        org.zip = xml.attributes['zip']
+        org.country = xml.attributes['country']
+      end
+    end
+
+    def as_xml
+      xml = REXML::Element.new('Organization')
+      xml.add_attribute('name', @name)
+      xml.add_attribute('url', @url)
+      xml.add_attribute('primaryContact', @primary_contact)
+      xml.add_attribute('jobTitle', @job_title)
+      xml.add_attribute('email', @email)
+      xml.add_attribute('telephone', @telephone)
+      xml.add_attribute('businessAddress', @address)
+      xml.add_attribute('state', @state)
+      xml.add_attribute('city', @city)
+      xml.add_attribute('zip', @zip)
+      xml.add_attribute('country', @country)
+      xml
+    end
+  end
 end

data/lib/nexpose/site.rb

@@ -113,6 +113,10 @@ module Nexpose
     # @see SyslogAlert
     attr_accessor :alerts
 
+    # Information about the organization that this site belongs to.
+    # Used by some reports.
+    attr_accessor :organization
+
     # [Array] List of user IDs for users who have access to the site.
     attr_accessor :users
 
@@ -272,6 +276,8 @@ module Nexpose
         xml.add_element(elem)
       end
 
+      xml.add_element(@organization.as_xml) if @organization
+
       elem = REXML::Element.new('Hosts')
       @assets.each { |a| elem.add_element(a.as_xml) }
       xml.add_element(elem)
@@ -328,6 +334,10 @@ module Nexpose
           site.users << user.attributes['id'].to_i
         end
 
+        s.elements.each('Organization') do |org|
+          site.organization = Organization.parse(org)
+        end
+
         s.elements.each('Hosts/range') do |r|
           site.assets << IPRange.new(r.attributes['from'], r.attributes['to'])
         end

metadata

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