rodsec 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3477d1c971df8c9705a43c33d749da2bcf32957b
-  data.tar.gz: 7a4533d4fbd215efaab0bad3c880c13765dcd77a
+  metadata.gz: ac2432e156ba0488621acc680796b095b29593c0
+  data.tar.gz: be4ecc12f5e5f56b4831e329da176f53d754c4b2
 SHA512:
-  metadata.gz: eaa19ddd357c6b7689c4a73e33fe7293f31f4a054f1459784f14b5dcce1a8ef5fb1f9afdcb5cbab0fdb4868e1f85a08d724a1f52c0dcce133ac414d3c253df83
-  data.tar.gz: 9fe83d648ab87829346874ac39dd37a2d1b9a795e152e5b35914af6e05e6eb31a49a0a3c223461ed22a38f4b2b3fff9bcc2bb64f93b5289a8447c21447874de7
+  metadata.gz: 6cce1ddf8cc5277f245dab788578c6d9f3849f9fe665818bb0f9eda8895ed4d650392fab60434d31a7ed4dd4e7dcb06b946094104ddce0f80b77cf3794937de2
+  data.tar.gz: 19c75b3098c58fd0a4fb363be350e84bc12e6bdf362bc72e7372f4844714fa2656f157e7d4786903715adb50ea5c333fd505d120d7c24ac465032c2d5f74d200

data/.gitignore

@@ -13,3 +13,4 @@
 
 # local c extensions
 lib/rodsec/*.so
+lib/rodsec/modsec_lib.rb

data/ext/msc_intervention/extconf.rb

@@ -1,5 +1,81 @@
 require 'mkmf'
-pkg_config 'modsecurity'
+
+MODSECURITY_LIB_NAME = 'modsecurity'
+SO_FUNC = 'msc_init'
+
+def so_name
+  @so_name ||= "lib#{MODSECURITY_LIB_NAME}.#{CONFIG['DLEXT']}"
+end
+
+def intervention_header_name
+  @intervention_header_name ||= 'modsecurity/intervention.h'
+end
+
+# raise an exception if one of the paths doesn't exist
+def confirm_include_lib include_dir, lib_dir
+  File.realpath(File.join include_dir, intervention_header_name)
+  File.realpath(File.join lib_dir, so_name)
+end
+
+def create_modsec_lib_rb so_lib_path, dst_ruby_file: 'modsec_lib.rb'
+  puts "runtime loads #{so_lib_path}"
+
+  # create a direct path to the library, because it's often in a nonstandard location
+  ruby_lib_dir = File.join CONFIG['srcdir'], '..', '..', 'lib', 'rodsec'
+  File.open File.join(ruby_lib_dir,dst_ruby_file), 'w' do |io|
+    io.write <<~EOS
+      # Generated by extconf.rb
+      module Rodsec
+        MODSECURITY_SO_PATH = '#{so_lib_path}'
+      end
+    EOS
+  end
+end
+
+def find_header_and_library include_dir, lib_dir
+  ok = true
+  ok &&= find_header intervention_header_name, include_dir
+  ok &&= find_library MODSECURITY_LIB_NAME, SO_FUNC, lib_dir
+  ok or abort
+end
+
+STANDARD_DIRS = [
+  %w[/usr/local/include /usr/local/lib],
+  %w[/usr/include       /usr/lib],
+]
+
+# get the user config, or failing that the default ModSecurity installation paths
+custom_dirs = dir_config 'modsecurity', '/usr/local/modsecurity'
+
+found_dirs = ([custom_dirs] + STANDARD_DIRS).find do |(include_dir, lib_dir)|
+  # try to find files from config
+  begin
+    confirm_include_lib include_dir, lib_dir
+    [include_dir, lib_dir]
+  rescue
+    puts "#{[include_dir, lib_dir]} not found. Continuing..."
+  end
+end
+
+unless found_dirs
+  puts 'Cannot locate libmodsecurity.so'
+  abort
+end
+
+so_lib_path =
+if found_dirs == custom_dirs
+  # we have custom dirs, set a specific path for the dlload in Wrapper
+  File.join found_dirs.last, so_name
+else
+  # standard dirs, so do not use a specific path in Wrapper
+  so_name
+end
+
+# create the file so Wrapper knows where to load the .so
+create_modsec_lib_rb so_lib_path
+
+# finally, use find_header and find_library to add the paths to the Makefile
+find_header_and_library *found_dirs
 
 # don't need piles of debug info. Or maybe we do. Dunno.
 CONFIG['debugflags'] = ''

data/lib/rodsec/version.rb

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

data/lib/rodsec/wrapper.rb

@@ -1,13 +1,15 @@
 require 'fiddle'
 require 'fiddle/import'
 
+require_relative 'modsec_lib.rb'
+
 module Rodsec
   module Wrapper
     extend Fiddle::Importer
 
     dlext = RbConfig::CONFIG['DLEXT']
     msc_intervention = dlopen File.join __dir__, "msc_intervention.#{dlext}"
-    dlload msc_intervention, "libmodsecurity.#{dlext}"
+    dlload msc_intervention, MODSECURITY_SO_PATH
 
     ###########################
     # from modsecurity/modsecurity.h

data/rodsec.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec(?!/config)|features)/})
+    f.match(%r{^(test|spec(?!/config)|features|modsec_lib)/})
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodsec
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - John Anderson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler