modsecurity_audit_log_parser 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fde4e6ff7aa635c2e8a201d4dc084b98137cf50
-  data.tar.gz: b572628e316eac2d617af827c3cd3b01d6978d8c
+  metadata.gz: 0bea7e861234b29f8067d0cea8f53d18c72cde3b
+  data.tar.gz: 35941aff0bee85e3123b5a4b53990f08e2630f7e
 SHA512:
-  metadata.gz: c9dd71d05960a666d82a5f773dd4dc2ba3ad28ae9e57aca275c1c614241fb045cd8bb44bbb05697ee835b5596f306f77a017fba64391dbf27bd27d5214fc228f
-  data.tar.gz: 16688e2e480054bc6ec21ff62e4c47e85041d45a7269a37659e3c2ee1add75e558b3264c101c1f9b8af9c98fb5ec2f5fe9c288b102d342e1b834f56c4efd8f44
+  metadata.gz: 2f61b8a6ad41b42e325a28c2f42a5297fea066d1b43da3096733fda1f226511e49909627242832c53bf729cc18e84839cfa3dda579ed69dbc61c46e82dfc08b2
+  data.tar.gz: 7401e6dfccc01b8ec9c56a8b658bcc2f4f8703f77db5b31b785ec190f6c7457c3c051fd0c0eb06d586146cebacd80fb93acdc8c78fb0d97f7cc3f64ab30ac91b

data/.travis.yml

@@ -1,5 +1,8 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.0
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 before_install: gem install bundler -v 1.14.3

data/lib/modsecurity_audit_log_parser.rb

@@ -16,27 +16,29 @@ class ModsecurityAuditLogParser
 
     MODSEC_TIMESTAMP_FORMAT = '%d/%b/%Y:%H:%M:%S %z'
     def time
-      if ts = audit_log_header&.timestamp
-        DateTime.strptime(ts, MODSEC_TIMESTAMP_FORMAT).to_time.to_i rescue 0
+      if ah = audit_log_header
+        if ts = ah.timestamp
+          DateTime.strptime(ts, MODSEC_TIMESTAMP_FORMAT).to_time.to_i rescue 0
+        end
       end
     end
 
     [:timestamp, :unique_transaction_id, :source_ip_address, :source_port, :destination_ip_address, :destination_port].each do |name|
       define_method(name) do
-        audit_log_header&.send(name)
+        audit_log_header.send(name)
       end
     end
 
     def trailers
-      audit_log_trailer&.trailers
+      audit_log_trailer.trailers
     end
 
     def rules
-      audit_log_trailer&.rules
+      audit_log_trailer.rules
     end
 
     def audit_log_header
-      @parts['A']
+      @parts['A'] || EMPTY_AUDIT_LOG_HEADER
     end
 
     def request_headers
@@ -56,7 +58,7 @@ class ModsecurityAuditLogParser
     end
 
     def audit_log_trailer
-      @parts['H']
+      @parts['H'] || EMPTY_AUDIT_LOG_TRAILER
     end
 
     def reduced_multipart_request_body
@@ -154,6 +156,7 @@ class ModsecurityAuditLogParser
       hash[:destination_port] = @destination_port
     end
   end
+  EMPTY_AUDIT_LOG_HEADER = AuditLogHeaderPart.new
 
   class RequestHeadersPart < ContentPart
     register('B', self)
@@ -206,11 +209,13 @@ class ModsecurityAuditLogParser
     end
 
     def rules
-      if pairs = @trailers[:Message]&.scan(/\[(\w+) "([^\\"]*(?:\\.[^\\"]*)*)"\]/)
-        pairs.inject({}) { |r, (k, v)|
-          r["rule_#{k}".intern] = v
-          r
-        }
+      if message = @trailers[:Message]
+        if pairs = message.scan(/\[(\w+) "([^\\"]*(?:\\.[^\\"]*)*)"\]/)
+          pairs.inject({}) { |r, (k, v)|
+            r["rule_#{k}".intern] = v
+            r
+          }
+        end
       end
     end
 
@@ -221,6 +226,7 @@ class ModsecurityAuditLogParser
       end
     end
   end
+  EMPTY_AUDIT_LOG_TRAILER = AuditLogTrailerPart.new
 
   class ReducedMultipartRequestBodyPart < ContentPart
     register('I', self)
@@ -269,8 +275,8 @@ class ModsecurityAuditLogParser
         id, type = $1, $2
         if @log.nil? or @log.id != id
           @log = Log.new(id)
-          @records << @log
         end
+        @records << @log if type == 'Z'
         unless @targets.include?(type)
           @part = nil
           next

data/lib/modsecurity_audit_log_parser/version.rb

@@ -1,3 +1,3 @@
 class ModsecurityAuditLogParser
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/modsecurity_audit_log_parser.gemspec

@@ -16,8 +16,6 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modsecurity_audit_log_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hiroshi Nakamura
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Modsecurity AuditLog parser library.