RubyGems - deepsecurity - Versions diffs - 0.0.20 → 0.0.21 - Mend

deepsecurity 0.0.20 → 0.0.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

data/CHANGELOG.md +7 -0
data/Rakefile +15 -0
data/generate_s3_links.sh +21 -0
data/lib/deepsecurity/enums.rb +1 -1
data/lib/deepsecurity/transport_objects/time_filter.rb +18 -7
data/lib/deepsecurity/version.rb +1 -1
data/lib/dsc/command.rb +5 -2
data/lib/savon_helper/dsl.rb +19 -19
data/lib/savon_helper/type_mappings.rb +76 -11
data/lib/savon_helper.rb +15 -0
data/test/test_dsc_command.rb +34 -0
data/test/test_savon_helper.rb +20 -0
metadata +14 -3

data/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,12 @@
 ## CHANGELOG (notable new features or fixes)
+### 0.0.21
+* Extended `-fields` to accept a filename to read the fields from
+* Added warning for unparseable entries
 ### 0.0.20
 * `dsc` command refactoring
@@ -10,6 +16,7 @@
 * Added `--detail_level` flag for `host_detail` command
 * Added `-time_format` flag to specifiy time format
 ### 0.0.19
 * Updated documentation

data/Rakefile CHANGED Viewed

@@ -1,5 +1,6 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rake/testtask'
 desc "create a new version, create tag and push to github"
 task :github_and_tag do
@@ -15,4 +16,18 @@ task :windows_installer => :build do
   system("./windows-installer/iscc windows-installer/dsc.iss /dgemVersion=\"#{GEM_VERSION}\" /drubyVersion=\"#{RUBY_INSTALLER_VERSION}\"")
 end
+Rake::TestTask.new do |t|
+ t.libs << 'test'
+ require "bundler/setup"
+ gem 'deepsecurity', :path => "~/Documents/Development/deepsecurity"
+end
+desc "Run tests"
+task :default => :test
+desc "Build index.html for S3 Bucket"
+task :s3_index do
+  system("./generate_s3_links.sh > index.html")
+end

data/generate_s3_links.sh ADDED Viewed

@@ -0,0 +1,21 @@
+#!/bin/sh
+cat <<EOF
+<html>
+<head>
+<title>DeepSecurity gem downloads</title>
+</head>
+<body>
+<ul>
+EOF
+for path in $( ls pkg/*gem ; ls windows-installer/Output/*exe ); do
+    file=$( basename $path )
+	echo "<li><a href=\"$file\">$file</a></li>"
+done
+cat <<EOF
+</ul>
+</body>
+</head>
+EOF

data/lib/deepsecurity/enums.rb CHANGED Viewed

@@ -497,7 +497,7 @@ module DeepSecurity
       "LAST_24_HOURS" => :last_24_hours,
       "LAST_7_DAYS" => :last_7_days,
       "CUSTOM_RANGE" => :custom_range,
-      "SPECIFIC_TIME" => :specificTime
+      "SPECIFIC_TIME" => :specific_time
   }
   # General filter operator enumeration. Used when filtering retrieved events by event ID that are greater than, less

data/lib/deepsecurity/transport_objects/time_filter.rb CHANGED Viewed

@@ -6,11 +6,14 @@ module DeepSecurity
   class TimeFilter < TransportObject
     attr_datetime_accessor :rangeFrom,
-                           "Time range start to filter computers by."
+                           "Time range start to filter computers by." ,
+                           :range_from
     attr_datetime_accessor :rangeTo,
-                           "Time range end to filter computers by."
+                           "Time range end to filter computers by.",
+                           :range_to
     attr_datetime_accessor :specificTime,
-                           "Specific time to filter computers by."
+                           "Specific time to filter computers by.",
+                           :specific_time
     # attr_integer_accessor :host_group_id
     # attr_integer_accessor :host_id
     # attr_integer_accessor :security_profile_id
@@ -50,18 +53,26 @@ module DeepSecurity
     def self.custom_range(datetime_range)
       instance = self.new()
       instance.type = :custom_range
-      instance.rangeFrom = datetime_range.first
-      instance.rangeTo = datetime_range.last
+      instance.range_from = datetime_range.first
+      instance.range_to = datetime_range.last
       instance
     end
     # Return a new instance for the given datetime.
+    # @deprecated Please use {#specific_time} instead
     # @param datetime [DateTime]
     # @return [TimeFilter]
     def self.specificTime(datetime)
+      self.specific_time(datetime)
+    end
+    # Return a new instance for the given datetime.
+    # @param datetime [DateTime]
+    # @return [TimeFilter]
+    def self.specific_time(datetime)
       instance = self.new()
-      instance.type = :specificTime
-      instance.specificTime = datetime
+      instance.type = :specific_time
+      instance.specific_time = datetime
       instance
     end

data/lib/deepsecurity/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module DeepSecurity
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

data/lib/dsc/command.rb CHANGED Viewed

@@ -269,11 +269,14 @@ module Dsc
     def parse_fields(fields_string_or_filename_argument)
       filename = File.absolute_path(fields_string_or_filename_argument)
       if File.exists?(filename)
-        fields_string = File.read(filename)
+        fields_string = ""
+        File.readlines(filename).each do |line|
+          fields_string = fields_string + " " + line.strip_comments
+        end
       else
         fields_string = fields_string_or_filename_argument
       end
-      fields = fields_string.split(",").map(&:strip)
+      fields = fields_string.split(/[\s,]/).map(&:strip).reject(&:blank?)
       unknown_fields = fields.reject { |each| self.class.transport_class.has_attribute_chain(each) }
       raise "Unknown filename or field found (#{unknown_fields.join(', ')}) - known fields are: #{self.class.valid_fields.join(', ')}" unless unknown_fields.empty?
       fields

data/lib/savon_helper/dsl.rb CHANGED Viewed

@@ -16,7 +16,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def attr_boolean_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, BooleanMapping.new(description))
+      create_accessor(accessor, alias_accessor, BooleanMapping.new(alias_accessor, description))
     end
     # @macro [attach] array_boolean_accessor
@@ -29,7 +29,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def array_boolean_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, ArrayMapping.new(BooleanMapping.new, description))
+      create_accessor(accessor, alias_accessor, ArrayMapping.new(BooleanMapping.new, alias_accessor, description))
     end
     # @macro [attach] attr_integer_accessor
@@ -42,7 +42,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def attr_integer_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, IntegerMapping.new(description))
+      create_accessor(accessor, alias_accessor, IntegerMapping.new(alias_accessor, description))
     end
     # @macro [attach] array_integer_accessor
@@ -55,7 +55,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def array_integer_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, ArrayMapping.new(IntegerMapping.new, description))
+      create_accessor(accessor, alias_accessor, ArrayMapping.new(IntegerMapping.new(), alias_accessor, description))
     end
     # @macro [attach] attr_float_accessor
@@ -68,7 +68,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def attr_float_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, FloatMapping.new(description))
+      create_accessor(accessor, alias_accessor, FloatMapping.new(alias_accessor, description))
     end
     # @macro [attach] array_float__accessor
@@ -81,7 +81,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def array_float__accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, ArrayMapping.new(FloatMapping.new, description))
+      create_accessor(accessor, alias_accessor, ArrayMapping.new(FloatMapping.new(), alias_accessor, description))
     end
     # @macro [attach] attr_double_accessor
@@ -94,7 +94,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def attr_double_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, FloatMapping.new(description))
+      create_accessor(accessor, alias_accessor, FloatMapping.new(alias_accessor, description))
     end
     # @macro [attach] array_double__accessor
@@ -107,7 +107,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def array_double_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, ArrayMapping.new(FloatMapping.new, description))
+      create_accessor(accessor, alias_accessor, ArrayMapping.new(FloatMapping.new(), alias_accessor, description))
     end
     # @macro [attach] attr_string_accessor
@@ -120,7 +120,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def attr_string_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, StringMapping.new(description))
+      create_accessor(accessor, alias_accessor, StringMapping.new(alias_accessor, description))
     end
     # @macro [attach] array_string_accessor
@@ -133,7 +133,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def array_string_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, ArrayMapping.new(StringMapping.new, description))
+      create_accessor(accessor, alias_accessor, ArrayMapping.new(StringMapping.new(), alias_accessor, description))
     end
     # @macro [attach] attr_ip_address_accessor
@@ -146,7 +146,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def attr_ip_address_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, IPAddressMapping.new(description))
+      create_accessor(accessor, alias_accessor, IPAddressMapping.new(alias_accessor, description))
     end
     # @macro [attach] array_ip_address_accessor
@@ -159,7 +159,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def array_ip_address_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, ArrayMapping.new(IPAddressMapping.new, description))
+      create_accessor(accessor, alias_accessor, ArrayMapping.new(IPAddressMapping.new(), alias_accessor, description))
     end
     # @macro [attach] attr_datetime_accessor
@@ -172,7 +172,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def attr_datetime_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, DatetimeMapping.new(description))
+      create_accessor(accessor, alias_accessor, DatetimeMapping.new(alias_accessor, description))
     end
     # @macro [attach] array_datetime_accessor
@@ -185,7 +185,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def array_datetime_accessor(accessor, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, ArrayMapping.new(DatetimeMapping.new, description))
+      create_accessor(accessor, alias_accessor, ArrayMapping.new(DatetimeMapping.new(), alias_accessor, description))
     end
     # @macro [attach] attr_enum_accessor
@@ -199,7 +199,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def attr_enum_accessor(accessor, enum, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, EnumMapping.new(enum, description))
+      create_accessor(accessor, alias_accessor, EnumMapping.new(enum, alias_accessor, description))
     end
     # @macro [attach] array_enum_accessor
@@ -213,7 +213,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def array_enum_accessor(accessor, enum, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, ArrayMapping.new(EnumMapping.new(enum), description))
+      create_accessor(accessor, alias_accessor, ArrayMapping.new(EnumMapping.new(enum), alias_accessor, description))
     end
     # @macro [attach] hint_object_accessor
@@ -226,7 +226,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def hint_object_accessor(accessor, klass, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, HintMapping.new(klass, description))
+      create_accessor(accessor, alias_accessor, HintMapping.new(klass, alias_accessor, description))
     end
     # @macro [attach] attr_object_accessor
@@ -240,7 +240,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def attr_object_accessor(accessor, klass, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, ObjectMapping.new(klass, description))
+      create_accessor(accessor, alias_accessor, ObjectMapping.new(klass, alias_accessor, description))
     end
     # @macro [attach] array_object_accessor
@@ -254,7 +254,7 @@ module SavonHelper
     # @param alias_accessor [Symbol] An Alias for the accessor
     # @return [void]
     def array_object_accessor(accessor, klass, description='', alias_accessor=accessor)
-      create_accessor(accessor, alias_accessor, ArrayMapping.new(ObjectMapping.new(klass, description)))
+      create_accessor(accessor, alias_accessor, ArrayMapping.new(ObjectMapping.new(klass, alias_accessor, description)))
     end
     private

data/lib/savon_helper/type_mappings.rb CHANGED Viewed

@@ -8,7 +8,8 @@ module SavonHelper
     # A new instance of TypeMapping with description
     # @param description [String] A String describing the mapping.
     # @return [TypeMapping]
-    def initialize(description='')
+    def initialize(name='', description='')
+      @name = name
       @description = description
     end
@@ -48,6 +49,21 @@ module SavonHelper
       raise "#{self.class}##{__method__}() not implemented!"
     end
+    # @abstract Return the default value the mapping.
+    # @return [Object]
+    def default_value
+      raise "#{self.class}##{__method__}() not implemented!"
+    end
+    # Warn about unparsable mapping
+    # @todo Check if mappings can be derived from klass
+    # @param data [Hash, Object] Source Savon data
+    def warn_unparseable_data(data, interface)
+      message = "Can't parse #{type_string} #{@name.inspect}: #{data.inspect}"
+      interface.logger.warn(message)
+      self.default_value()
+    end
   end
   # BooleanMapping maps Savon data to Ruby Booleans.
@@ -84,6 +100,12 @@ module SavonHelper
       "bool"
     end
+    # @abstract Return the default value the mapping.
+    # @return [Object]
+    def default_value
+      false
+    end
   end
   # IntegerMapping maps Savon data to Ruby integers.
@@ -118,6 +140,13 @@ module SavonHelper
     def type_string
       "int"
     end
+    # @abstract Return the default value the mapping.
+    # @return [Object]
+    def default_value
+      0
+    end
   end
   # FloatMapping maps Savon data to Ruby floats.
@@ -153,6 +182,12 @@ module SavonHelper
       "float"
     end
+    # @abstract Return the default value the mapping.
+    # @return [Object]
+    def default_value
+      0.0
+    end
   end
   # StringMapping maps Savon data to Ruby strings.
@@ -189,6 +224,12 @@ module SavonHelper
       "String"
     end
+    # @abstract Return the default value the mapping.
+    # @return [Object]
+    def default_value
+      ""
+    end
   end
   # IPAddressMapping maps Savon data to Ruby IP Address String.
@@ -201,6 +242,12 @@ module SavonHelper
       "IPAddress"
     end
+    # @abstract Return the default value the mapping.
+    # @return [Object]
+    def default_value
+      "255.255.255.255"
+    end
   end
   # DatetimeMapping maps Savon data to Ruby DateTimes.
@@ -236,6 +283,12 @@ module SavonHelper
       "datetime"
     end
+    # @abstract Return the default value the mapping.
+    # @return [Object]
+    def default_value
+      DateTime.now()
+    end
   end
   # EnumMapping maps Savon integers to Ruby symbols.
@@ -244,9 +297,9 @@ module SavonHelper
     # A new instance of EnumMapping with description and enum hash enum.
     # @param enum [Hash{String => Symbol}] Mapping between Savon Strings and Ruby Symbols.
     # @param description [String]
-    # @return [ArrayMapping]
-    def initialize(enum, description='')
-      super(description)
+    # @return [EnumMapping]
+    def initialize(enum, name='', description='')
+      super(name, description)
       @enum = enum
     end
@@ -274,6 +327,12 @@ module SavonHelper
       "enum<#{@enum.values.join(', ')}>"
     end
+    # @abstract Return the default value the mapping.
+    # @return [Object]
+    def default_value
+      :none
+    end
   end
   # HintMapping maps Savon data to Ruby objects of type klass (r/o).
@@ -283,8 +342,8 @@ module SavonHelper
     # @param klass [Class] A class returned by the hint accessor
     # @param description [String]
     # @return [HintMapping]
-    def initialize(klass, description='')
-      super(description)
+    def initialize(klass, name='', description='')
+      super(name, description)
       @klass = klass
     end
@@ -319,8 +378,8 @@ module SavonHelper
     # @param klass [Class, #to_native] A class which can create instances from Savon data and provide Savon data for export.
     # @param description [String]
     # @return [ObjectMapping]
-    def initialize(klass, description='')
-      super(klass, description)
+    def initialize(klass, name='', description='')
+      super(klass, name, description)
     end
     # @!group Converting
@@ -358,7 +417,7 @@ module SavonHelper
           result = to_native(element_mapping, item, interface)
         end
       else
-        raise "Unknown Array mapping"
+        result = warn_unparseable_data(data, interface)
       end
       result
     end
@@ -367,8 +426,8 @@ module SavonHelper
     # @param element_mapping [TypeMapping]  A TypeMapping for elements
     # @param description [String]
     # @return [ArrayMapping]
-    def initialize(element_mapping, description='')
-      super(description)
+    def initialize(element_mapping, name='', description='')
+      super(name, description)
       @element_mapping = element_mapping
     end
@@ -395,6 +454,12 @@ module SavonHelper
       "Array<#{@element_mapping.type_string}>"
     end
+    # @abstract Return the default value the mapping.
+    # @return [Object]
+    def default_value
+      []
+    end
   end
   # MissingMapping maps Savon data to itself (no conversion).

data/lib/savon_helper.rb CHANGED Viewed

@@ -17,6 +17,10 @@ unless String.respond_to? :blank
     def blank?
       empty?()
     end
+    def strip_comments
+      self.match(/^([^#]*)(#.*$)?/).to_a[1]
+    end
   end
   class NilClass
@@ -34,3 +38,14 @@ class Object
   end
 end
+module Kernel
+  alias :oldwarn :warn
+  def warn (msg = "", fulltrace = false)
+    trace = caller(1)
+    where = trace[0].sub(/:in.*/, '')
+    $stderr.puts "#{where}: Warning: #{msg}"
+    $stderr.puts trace.map { |t| "\tfrom #{t}" } if fulltrace
+  end
+end

data/test/test_dsc_command.rb ADDED Viewed

@@ -0,0 +1,34 @@
+require 'test/unit'
+require 'dsc'
+class TestDscCommand < Test::Unit::TestCase
+  def test_timesfilter_last_hour
+    command = Dsc::Command.new()
+    assert_equal DeepSecurity::TimeFilter.last_hour, command.parse_time_filter("last_hour")
+  end
+  def test_timesfilter_last_24_hours
+    command = Dsc::Command.new()
+    assert_equal DeepSecurity::TimeFilter.last_hour, command.parse_time_filter("last_hour")
+  end
+  def test_timesfilter_last_7_days
+    command = Dsc::Command.new()
+    assert_equal DeepSecurity::TimeFilter.last_7_days, command.parse_time_filter("last_7_days")
+  end
+  def test_timesfilter_last_day
+    command = Dsc::Command.new()
+    assert_equal DeepSecurity::TimeFilter.last_day, command.parse_time_filter("last_day")
+  end
+  def test_timesfilter_timestamp
+    command = Dsc::Command.new()
+    time = Time.new(2002, 10, 31, 2, 2, 2, "+02:00")
+    command.parse_time_format("%Y-%m-%d %H:%M-%S %z")
+    assert_equal "2002-10-31 02:02:02 +0200", command.to_display_string(time)
+  end
+end

data/test/test_savon_helper.rb ADDED Viewed

@@ -0,0 +1,20 @@
+require 'test/unit'
+require 'deepsecurity'
+class TestSavonHelper < Test::Unit::TestCase
+  def test_blank
+    assert_equal false, "abc".blank?
+    assert_equal true, "".blank?
+    assert_equal true, nil.blank?
+  end
+  def test_strip_comments
+    assert_equal "test", "test".strip_comments
+    assert_equal "test ", "test #123".strip_comments
+    assert_equal "", "#123".strip_comments
+  end
+  def test_name_without_namespace
+    assert_equal "HostDetail", DeepSecurity::HostDetail.name_without_namespace
+  end
+end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deepsecurity
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -157,6 +157,7 @@ files:
 - bin/dsc
 - deepsecurity.gemspec
 - dsc.md
+- generate_s3_links.sh
 - lib/deepsecurity.rb
 - lib/deepsecurity/enums.rb
 - lib/deepsecurity/exceptions/authentication_failed_exception.rb
@@ -196,6 +197,8 @@ files:
 - lib/savon_helper/soap_exception.rb
 - lib/savon_helper/soap_interface.rb
 - lib/savon_helper/type_mappings.rb
+- test/test_dsc_command.rb
+- test/test_savon_helper.rb
 - windows-installer/WizModernImage-IS.bmp
 - windows-installer/WizModernImage.bmp
 - windows-installer/WizModernSmallImage-IS.bmp
@@ -216,17 +219,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3193197376613847506
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3193197376613847506
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: Trend Micro DeepSecurity Wrapper
-test_files: []
+test_files:
+- test/test_dsc_command.rb
+- test/test_savon_helper.rb
 has_rdoc: