ruby-nessus 0.1.2 → 0.1.3

data/lib/ruby-nessus/xml.rb

@@ -25,25 +25,38 @@ module Nessus
 
       block.call(self) if block
     end
-    
+
     # Return the nessus report title.
     # @return [String]
     #   The Nessus Report Title
     # @example
     #   scan.report_name #=> "My Super Cool Nessus Report"
     def report_name
-      @report_name ||= @xml.xpath("//NessusClientData//Report//ReportName").inner_text
+      @report_name ||= @xml.xpath("//NessusClientData//Report//ReportName").inner_text.split(' - ').last
     end
     alias name report_name
     alias title report_name
-    
+
+    # Return the nessus report time.
+    # @return [String]
+    #   The Nessus Report Time
+    # @example
+    #   scan.report_time #=> "09/11/08 02:21:22 AM"
+    def report_time
+      #09/11/08 02:21:22 AM
+      datetime = @xml.xpath("//NessusClientData//Report//ReportName").inner_text.split(' - ').first
+      @report_time ||= DateTime.strptime(datetime, fmt='%y/%m/%d %I:%M:%S %p')
+    end
+    alias time report_time
+    alias date report_time
+
     # Return the scan start time.
     # @return [DateTime]
     #   The Nessus Scan Start Time
     # @example
     #   scan.start_time #=> 'Fri Nov 11 23:36:54 1985'
     def start_time
-      @start_time = @xml.xpath("//NessusClientData//Report//StartTime").inner_text
+      @start_time = DateTime.strptime(@xml.xpath("//NessusClientData//Report//StartTime").inner_text, fmt='%a %b %d %H:%M:%S %Y')
     end
 
     # Return the scan stop time.
@@ -52,7 +65,7 @@ module Nessus
     # @example
     #   scan.stop_time #=> 'Mon Nov 11 23:36:54 1985'
     def stop_time
-      @stop_time = @xml.xpath("//NessusClientData//Report//StopTime").inner_text
+      @stop_time = DateTime.strptime(@xml.xpath("//NessusClientData//Report//StopTime").inner_text, fmt='%a %b %d %H:%M:%S %Y')
     end
 
     # Return the scan run time.
@@ -61,9 +74,9 @@ module Nessus
     # @example
     #   scan.runtime #=> '2 hours 5 minutes and 16 seconds'
     def runtime
-      h = ("#{Time.parse(stop_time).strftime('%H').to_i - Time.parse(start_time).strftime('%H').to_i}").gsub('-', '')
-      m = ("#{Time.parse(stop_time).strftime('%M').to_i - Time.parse(start_time).strftime('%M').to_i}").gsub('-', '')
-      s = ("#{Time.parse(stop_time).strftime('%S').to_i - Time.parse(start_time).strftime('%S').to_i}").gsub('-', '')
+      h = ("#{Time.parse(stop_time.to_s).strftime('%H').to_i - Time.parse(start_time.to_s).strftime('%H').to_i}").gsub('-', '')
+      m = ("#{Time.parse(stop_time.to_s).strftime('%M').to_i - Time.parse(start_time.to_s).strftime('%M').to_i}").gsub('-', '')
+      s = ("#{Time.parse(stop_time.to_s).strftime('%S').to_i - Time.parse(start_time.to_s).strftime('%S').to_i}").gsub('-', '')
       return "#{h} hours #{m} minutes and #{s} seconds"
     end
 
@@ -97,7 +110,7 @@ module Nessus
 
       @plugin_ids
     end
-    
+
     # Returns and array of the plugin names userd for the passed .nessus scan.
     # @return [Array]
     #   The Nessus Scan Plugin Names
@@ -145,7 +158,7 @@ module Nessus
       hosts.size
     end
 
-    # Retunrs an array of all unique ports. 
+    # Retunrs an array of all unique ports.
     # @return [Array]
     # @example
     #   scan.unique_ports #=> 234
@@ -226,7 +239,7 @@ module Nessus
         raise "Error: #{type} is not an acceptable severity. Possible options include: all, high, medium, low and informational."
       end
     end
-    
+
     # Creates a new Host object to be parser from a passed search param.
     # @param [String] hostname the hostname to build a Host object for.
     # @yield [prog] If a block is given, it will be passed the newly
@@ -257,24 +270,18 @@ module Nessus
         @medium = 0
         @high = 0
 
-        @xml.xpath("//ReportItem//severity").each do |s|
-          case s.inner_text.to_i
-          when 0
-            @open_ports += 1
-          when 1
-            @low += 1
-          when 2
-            @medium += 1
-          when 3
-            @high += 1
-          end
+        @xml.xpath("//ReportHost").each do |s|
+          @open_ports += s.at('num_ports').inner_text.to_i
+          @low += s.at('num_lo').inner_text.to_i
+          @medium += s.at('num_med').inner_text.to_i
+          @high += s.at('num_hi').inner_text.to_i
         end
-        
-        @count = { :open_ports => @open_ports, 
-          :low => @low, 
-          :medium => @medium, 
-          :high => @high, 
-          :all => (@low + @medium + @high) }
+
+        @count = { :open_ports => @open_ports,
+          :low => @low,
+          :medium => @medium,
+          :high => @high,
+        :all => (@low + @medium + @high) }
       end
 
       return @count

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-nessus
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Dustin Willis Webber
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 -06:00
+date: 2009-11-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,7 +67,6 @@ files:
 - lib/ruby-nessus/host.rb
 - lib/ruby-nessus/nessus.rb
 - lib/ruby-nessus/port.rb
-- lib/ruby-nessus/scan.rb
 - lib/ruby-nessus/xml.rb
 - spec/ruby-nessus_spec.rb
 - spec/spec.opts

data/lib/ruby-nessus/scan.rb

@@ -1,13 +0,0 @@
-module Nessus
-  
-  class Scan
-    
-    # 
-    def initialize
-      
-    end
-    
-    
-  end
-  
-end