snort-rule 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a7273283fb3e512503887be54a2f8fe2f9db0ba
-  data.tar.gz: c9805f7672b3d5728ec5c81e57189f5864ee9ab4
+  metadata.gz: 2edb46ba49f19aed8a02939baca0f4fcc36f1513
+  data.tar.gz: 50fc0ba0b7bda87b7b48da6f9e17f9e8b46ee8b2
 SHA512:
-  metadata.gz: 54ee379bd8b7f69ffd9e67e836b6e04446d9742670d2bd44563056c93368cb01434d64c2d1675b73169d282638d17a47a3eb67d411e8988909a35b4d7505c7f6
-  data.tar.gz: 5782bd0aa94129664cca222ad73ebea3a84bc158d656881364c54be3700a8225db5404ee60d8fce4ca6b6ce4c1ec6ac7e28d0a5dc9281664512fedba62ff027a
+  metadata.gz: 4518b8425bc07539da1c942024fbc82ff05e87c55777bc2736a7c77752abdeabf4c84f836e0f1c43552b2f85e9cf719e9a9bff12b4482062aa93ac11dd2841e9
+  data.tar.gz: b9e67ac011c246d1322c42aaf724c5990ee372456e35740603558df8a41516fb80b729d8e2b2e63b9d848ce0d12003a7661b624dda1714416d7ea45782af006f

data/lib/snort/rule.rb

@@ -10,25 +10,9 @@ require "snort/rule/option"
 # License::   Distributes under the same terms as Ruby
 module Snort
   
-  class Comment
-    def initialize(comment)
-      @comment = comment
-    end
-    
-    def to_s
-      @comment
-    end
-    
-    def enable
-    end
-    
-    def disable
-    end
-  end
-
   # This class stores and generates the features of a snort rule
   class Rule
-    attr_accessor :enabled, :action, :proto, :src, :sport, :dir, :dst, :dport, :options_hash
+    attr_accessor :enabled, :action, :proto, :src, :sport, :dir, :dst, :dport, :options_hash, :comments
     attr_reader :options
     
     # Initializes the Rule
@@ -62,13 +46,17 @@ module Snort
           add_option(opt)
         end
       end
+      @comments = kwargs[:comments]
     end
 
     # Output the current object into a snort rule
     def to_s(options_only=false)
       rule = ""
+      if @comments
+        rule += @comments
+      end
       if not @enabled
-        rule = "#"
+        rule += "#"
       end
       rule += [@action, @proto, @src, @sport, @dir, @dst, @dport].join(" ") unless options_only
       if @options.any?

data/lib/snort/rule/version.rb

@@ -1,5 +1,5 @@
 module Snort
   class Rule
-    VERSION = "1.5.3"
+    VERSION = "1.5.4"
   end
 end

data/lib/snort/ruleset.rb

@@ -28,20 +28,25 @@ module Snort
     
     def RuleSet::from_filehandle(fh)
       rules = RuleSet.new
+      comments = ""
       fh.each_line do |line|
         if line =~ /(alert|log|pass|activate|dynamic|drop|reject|sdrop)/
           begin
             rule = Snort::Rule.parse(line)
             if rule
+              if comments.length > 0
+                rule.comments = comments
+                comments = ""
+              end
               rules << rule
             else
-              rules << Snort::Comment.new(line.strip)
+              comments << line
             end
           rescue ArgumentError => e
           rescue NoMethodError => e
           end
         else
-          rules << Snort::Comment.new(line.strip)
+          comments << line
         end
       end
       rules
@@ -80,16 +85,16 @@ module Snort
     end
     
     def length
-      @ruleset.find_all {|r| r.class == Snort::Rule}.length
+      @ruleset.length
     end
     
     def count(&block)
-      @ruleset.find_all {|r| r.class == Snort::Rule}.count(&block)
+      @ruleset.count(&block)
     end
     
     def enable(&block)
       count = 0
-      @ruleset.find_all {|r| r.class == Snort::Rule}.each do |rule|
+      @ruleset.each do |rule|
         if block.call(rule)
           rule.enable
           count += 1
@@ -100,7 +105,7 @@ module Snort
     
     def disable(&block)
       count = 0
-      @ruleset.find_all {|r| r.class == Snort::Rule}.each do |rule|
+      @ruleset.each do |rule|
         if block.call(rule)
           rule.disable
           count += 1
@@ -112,7 +117,6 @@ module Snort
     def delete(&block)
       len = @ruleset.length
       @ruleset.each do |rule|
-        next if rule.class == Snort::Comment
         if block.call(rule)
           @ruleset -= [rule]
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snort-rule
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - chrislee35