rodsec 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac2432e156ba0488621acc680796b095b29593c0
-  data.tar.gz: be4ecc12f5e5f56b4831e329da176f53d754c4b2
+  metadata.gz: 1924f01c61f44cdbbfe0fe31597887f0c7711fe7
+  data.tar.gz: a7ed7ab4ab2eef261eeb3b6035ad48efa75ad8ff
 SHA512:
-  metadata.gz: 6cce1ddf8cc5277f245dab788578c6d9f3849f9fe665818bb0f9eda8895ed4d650392fab60434d31a7ed4dd4e7dcb06b946094104ddce0f80b77cf3794937de2
-  data.tar.gz: 19c75b3098c58fd0a4fb363be350e84bc12e6bdf362bc72e7372f4844714fa2656f157e7d4786903715adb50ea5c333fd505d120d7c24ac465032c2d5f74d200
+  metadata.gz: 4de064f346d044c84008d29c16d1ac8178c00d73fe4cc03c07af0d3cc95c0edfdae1efe3d717141b43e8dfb9b88c77300566220e9002e09e24fbe857796889d2
+  data.tar.gz: d6844f3d327c7a0cca05dcf525e28c18be589d858a837d6827d3677ed7cc587374373d1e694b253db28a123190bcd84baa448b6e179d30de910a3773ea4551d1

data/examples/modsec.ru

@@ -33,7 +33,8 @@ fn = Proc.new do |env|
     body = YAML.load_file Pathname(__dir__) + 'body.yml'
     ['200', {'Content-Type' => 'text/plain'}, body]
   else
-    ['200', {}, []]
+    # older rack eg 1.4.7 Lint insists on a Content-Type here
+    ['200', {'Content-Type' => 'text/plain'}, ["This is a nonspecific response."]]
   end
 end
 

data/lib/rodsec/rack.rb

@@ -22,8 +22,6 @@ module Rodsec
     #             structured and you might want to parse them, so the tag
     #             helps disambiguate the source of the logs.
     #
-    #   ? :msi_blk  called with [status, headers, body] if there's an intervention from ModSecurity.
-    #
     #
     # === Examples:
     #
@@ -32,11 +30,10 @@ module Rodsec
     def initialize app, config:, rules: nil, logger: nil, log_blk: nil
       @app = app
 
+      @logger = logger || StringIO.new
       @log_blk = log_blk || -> _tag, str{self.logger.puts str}
       @msc = Rodsec::Modsec.new{|tag,str| @log_blk.call tag, str}
 
-      @logger = logger || StringIO.new
-
       @log_blk.call self.class, "#{self.class} starting with #{@msc.version_info}"
 
       set_rules config, rules

data/lib/rodsec/version.rb

@@ -1,3 +1,3 @@
 module Rodsec
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/rodsec/wrapper.rb

@@ -11,6 +11,9 @@ module Rodsec
     msc_intervention = dlopen File.join __dir__, "msc_intervention.#{dlext}"
     dlload msc_intervention, MODSECURITY_SO_PATH
 
+    # required library version - RubyGems style
+    REQUIRED_MODSECURITY_VERSION = '~> 3.0.2'
+
     ###########################
     # from modsecurity/modsecurity.h
     typealias 'ModSecurity', 'void'
@@ -27,6 +30,27 @@ module Rodsec
     typealias 'ModSecLogCb', 'void (*) (void *, const void *)'
     extern 'void msc_set_log_cb(ModSecurity *msc, ModSecLogCb cb)'
 
+    # make sure the version of the library matches the version we need NOTE this
+    # duplicates some of the code in Rodsec::Modsec#version_info. But we need an
+    # instance of msc to get the version, and it's better to check the version
+    # here. lambda is just for local variable scoping.
+    lambda do
+      msc_ptr = Wrapper.msc_init
+      msc_ptr.free = Wrapper['msc_cleanup']
+
+      # This is the ModSecurity version required by this gem, in RubyGems format.
+      required_version = Gem::Requirement.new REQUIRED_MODSECURITY_VERSION
+      # parse actual version from library info
+      version_info = (Wrapper.msc_who_am_i msc_ptr).to_s
+      /v([\-\.\d]+)/ =~ version_info
+      actual_version = Gem::Version.new $1
+
+      # check that the library meets the required version
+      unless required_version.satisfied_by? actual_version
+        raise "#{Rodsec} needs ModSecurity #{required_version}, which doesn't match '#{version_info}' from #{Rodsec::MODSECURITY_SO_PATH}"
+      end
+    end.call
+
     ###########################
     # from modsecurity/rules.h
     typealias 'Rules', 'void'

data/rodsec.gemspec

@@ -31,10 +31,10 @@ Gem::Specification.new do |spec|
 
   spec.extensions << %q[ext/msc_intervention/extconf.rb]
 
+  spec.add_dependency 'rack', '>= 1.4.7'
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rack', '~> 2'
   spec.add_development_dependency 'rake-compiler', '>= 1.0.5'
 end

data/spec/config/modsecurity.conf

@@ -254,7 +254,9 @@ SecCookieFormat 0
 # to properly map encoded data to your language. Properly setting
 # these directives helps to reduce false positives and negatives.
 #
-SecUnicodeMapFile unicode.mapping 20127
+# commented out for now, because it triggers an error
+#  "Rules error. File: rodsec/spec/config/modsecurity.conf. Line: 238. Column: 17. Failed to load locate the unicode map file from: unicode.mapping 20127 Looking at: 'unicode.mapping 20127', 'unicode.mapping 20127', 'rodsec/spec/config/unicode.mapping 20127', 'rodsec/spec/config/unicode.mapping 20127'. "]
+# SecUnicodeMapFile unicode.mapping 20127
 
 # Improve the quality of ModSecurity by sharing information about your
 # current ModSecurity version and dependencies versions.

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rodsec
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - John Anderson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement