threshold 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a595437c5a3c85288a7dfba97a0359719fec9757
-  data.tar.gz: 5a0c0e9290e14a89ff58dc9dc9ea79092348fd5a
+  metadata.gz: 33c2806304e5938f76507449b1594424ba47403e
+  data.tar.gz: 99a23f1a99c452b1149375098162e6bd8cd9a32e
 SHA512:
-  metadata.gz: 889e86ab47cc43a20f2b66428ecc3c521cb319db2efa8193eac0145e366cbb054618313ab4f6a200e390ffc33daaf838089bf348fea96b3daa104d958734aebf
-  data.tar.gz: 99f4949c3c0b4d60a049516ffc4cbf305bfdae37302ba92f577ed989e16b809dd6485f24c47c63a7e0548ddc949293417dad1b7f0bbe9a3f8b0cffcdd48a427a
+  metadata.gz: 6e121ca66252cdce457ef1dc97ba83caca4e2d293a0e21a5883a811d92a639c2dc0cde5363866a8a9e12391968e87ee5455f044366e7cb9a1007ac7e9f1dd87a
+  data.tar.gz: 3579311658b35e1a86440239a5d3f364fa52d382382c7f7d02c5b15ed85035d23b72bfcc89be1a15133441082c8ac34ceb1a4ff7cc7ae8c21244518e9d62bd77

data/lib/threshold/event_filter.rb

@@ -88,12 +88,12 @@ module Threshold
       end
   	end
 
-    private
-
     def state
       [@gid, @sid, @type, @track_by, @count, @seconds]
     end
 
+    private
+
     def transform(result)
       begin
         self.gid = result["GID"].compact.first.to_i

data/lib/threshold/rate_filter.rb

@@ -128,13 +128,13 @@ module Threshold
       end
   	end
     
-    private 
-
     #State does not track comments
     def state
       [@gid, @sid, @track_by, @count, @seconds, @new_action, @timeout, @apply_to]
     end
 
+    private
+
     def transform(result)
       begin 
         self.gid = result["GID"].compact.first.to_i

data/lib/threshold/standalone.rb

@@ -25,6 +25,18 @@ module Threshold
       state.hash
     end
 
+    def include?(an0ther)
+      return false unless an0ther.class == self.class
+
+      state.zip(an0ther.state).each{ |item| 
+        if !(item[1].nil?)
+          return false unless item[0] == item[1] 
+        end  
+      }
+
+      return true
+    end  
+
     #Comparable
     def <=>(anOther)
       #gid <=> anOther.gid

data/lib/threshold/suppression.rb

@@ -71,13 +71,13 @@ module Threshold
       end
   	end
 
-    private
-
     #State does not track comments
     def state
       [@gid, @sid, @track_by, @ip]
     end
 
+    private
+
     def transform(result)
       begin 
         self.gid = result["GID"].compact.first.to_i

data/lib/threshold/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: threshold
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Shadowbq
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement