threshold 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1bada0dac9f9f832e9ffcc50fa9faea1ab14a3d
-  data.tar.gz: 30cf5b417e323b2508e3d32291809d8b6d92f4a2
+  metadata.gz: 1042eb5ce497aa4b1213a7bd3081473c582a55af
+  data.tar.gz: ceb62f177c0093fdddd44348c0ec280b70a19261
 SHA512:
-  metadata.gz: b1a99450cd9e0187944d439a0194033ddefbabac23a49f283f4e898f9f51515726751f20cc7d810774dedb10dc5e9eeeb895c0d67e2bf96d360321e2ced76fc2
-  data.tar.gz: 3144ca335eb414503518ce1b67eed32b1c0888eb49c403955338cb214b35bc948b4c3456436e0bc5bdef60bfef56f7710f06f70584d269e1e9e074c2d974b789
+  metadata.gz: d0488d7dd8cd10e7b61d5cceba50ffa3c8ae55abf6a2518c6fafe49ad476073d15e5e99842ce24aaa94bdf7cc049124466445806696db66ae0176fffbaf952ef
+  data.tar.gz: f36ee54af3b3e38cae04b603e68f97eaedc71599ff7d823b9f1d02b76190819f0ee5a31261701842cf4dff975442167d3b6fc4f8d3196c3091c23498912051d8

data/lib/threshold/event_filter.rb

@@ -77,14 +77,15 @@ module Threshold
 
     include Veto.model(EventFilterValidator.new)
     include Comparable
+    include Threshold::Standalone
 
     def initialize(line="")
       transform(line) unless line.empty?
     end
 
-  	def to_s
+  	def to_s(skip = false)
       if self.valid? 
-        if defined?(@comment) 
+        if comment?(skip)
       		"event_filter gen_id #{@gid}, sig_id #{@sid}, type #{@type}, track by_#{@track_by}, count #{@count}, seconds #{@seconds} #{@comment}"
         else
           "event_filter gen_id #{@gid}, sig_id #{@sid}, type #{@type}, track by_#{@track_by}, count #{@count}, seconds #{@seconds}" 
@@ -94,22 +95,6 @@ module Threshold
       end
   	end
 
-    #Comparable
-    def <=>(anOther)
-      #gid <=> anOther.gid
-      c = self.class.to_s <=> anOther.class.to_s
-      if c == 0 then 
-        d = self.gid <=> anOther.gid
-        if d == 0 then
-          self.sid <=> anOther.sid
-        else
-          return d
-        end   
-      else
-        return c
-      end
-    end
-
     private
 
     def transform(result)

data/lib/threshold/rate_filter.rb

@@ -101,21 +101,23 @@ module Threshold
 
     include Veto.model(RateFilterValidator.new)
     include Comparable
+    include Threshold::Standalone
 
     def initialize(line="")
       transform(line) unless line.empty?
     end
 
-  	def to_s
+  	def to_s(skip = false)
+
       if self.valid? 
          if apply_to == nil then
-           if defined?(@comment)
+           if comment?(skip)
             "rate_filter gen_id #{@gid}, sig_id #{@sid}, track by_#{@track_by}, count #{@count}, seconds #{@seconds}, new_action #{@new_action}, timeout #{@timeout} #{@comment}"
            else
             "rate_filter gen_id #{@gid}, sig_id #{@sid}, track by_#{@track_by}, count #{@count}, seconds #{@seconds}, new_action #{@new_action}, timeout #{@timeout}"
            end  
          else
-           if defined?(@comment)
+           if comment?(skip)
             "rate_filter gen_id #{@gid}, sig_id #{@sid}, count #{@count}, seconds #{@seconds}, new_action #{@new_action}, timeout #{@timeout} apply_to #{@apply_to} #{@comment}"
            else
             "rate_filter gen_id #{@gid}, sig_id #{@sid}, count #{@count}, seconds #{@seconds}, new_action #{@new_action}, timeout #{@timeout} apply_to #{@apply_to}"
@@ -125,22 +127,6 @@ module Threshold
         raise InvalidRateFilterObject, 'Rate Filter did not validate'
       end
   	end
-
-    #Comparable
-    def <=>(anOther)
-      #gid <=> anOther.gid
-      c = self.class.to_s <=> anOther.class.to_s
-      if c == 0 then 
-        d = self.gid <=> anOther.gid
-        if d == 0 then
-          self.sid <=> anOther.sid
-        else
-          return d
-        end   
-      else
-        return c
-      end
-    end
     
     private 
 

data/lib/threshold/standalone.rb

@@ -0,0 +1,34 @@
+module Threshold
+  module Standalone
+
+    # Handle Comment Skipping
+    def comment?(skip)
+      if skip
+        return false
+      else
+        if defined?(@comment)
+          return true
+        else
+          return false
+        end  
+      end
+    end
+
+    #Comparable
+    def <=>(anOther)
+      #gid <=> anOther.gid
+      c = self.class.to_s <=> anOther.class.to_s
+      if c == 0 then 
+        d = self.gid <=> anOther.gid
+        if d == 0 then
+          self.sid <=> anOther.sid
+        else
+          return d
+        end   
+      else
+        return c
+      end
+    end
+
+  end
+end

data/lib/threshold/suppression.rb

@@ -45,37 +45,22 @@ module Threshold
 
     include Veto.model(SuppressionValidator.new)
     include Comparable
+    include Threshold::Standalone
 
     def initialize(line="")
       transform(line) unless line.empty?
     end
 
-    #Comparable
-    def <=>(anOther)
-      #gid <=> anOther.gid
-      c = self.class.to_s <=> anOther.class.to_s
-      if c == 0 then 
-        d = self.gid <=> anOther.gid
-        if d == 0 then
-          self.sid <=> anOther.sid
-        else
-          return d 
-        end  
-      else
-        return c
-      end
-    end
-
-  	def to_s
+  	def to_s(skip = false)
       if self.valid?
     		if track_by == nil then
-          if defined?(@comment)
+          if comment?(skip)
     		    "suppress gen_id #{@gid}, sig_id #{@sid} #{@comment}"
           else
             "suppress gen_id #{@gid}, sig_id #{@sid}"
           end  
     		else
-    		  if defined?(@comment)
+    		  if comment?(skip)
             "suppress gen_id #{@gid}, sig_id #{@sid}, track by_#{@track_by}, ip #{@ip} #{@comment}"
           else
             "suppress gen_id #{@gid}, sig_id #{@sid}, track by_#{@track_by}, ip #{@ip}"

data/lib/threshold/thresholds.rb

@@ -75,13 +75,13 @@ module Threshold
       end
     end
     
-    def to_s
+    def to_s(skip = false)
       output = ""
 
       raise InvalidThresholdsObject, "Container object has unknown objects" unless valid?
 
       self.each do |threshold|
-        output << threshold.to_s + "\n"
+        output << threshold.to_s(skip) + "\n"
       end
       return output
     end

data/lib/threshold/version.rb

@@ -1,4 +1,4 @@
   module Threshold
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
     SNORT_VERSION='~>2.9.3'
   end

data/lib/threshold.rb

@@ -6,6 +6,8 @@ require 'digest'
 
 module Threshold
   $:.unshift(File.dirname(__FILE__))
+  #mixin Library
+  require 'threshold/standalone'
 
   #require library
   require 'threshold/suppression'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: threshold
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Shadowbq
@@ -128,6 +128,7 @@ files:
 - lib/threshold/patterns/java
 - lib/threshold/patterns/ruby
 - lib/threshold/rate_filter.rb
+- lib/threshold/standalone.rb
 - lib/threshold/suppression.rb
 - lib/threshold/thresholds.rb
 - lib/threshold/version.rb