sqreen 1.15.7.beta1 → 1.15.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c12b98d858bc3b796b65d4cbda2f57306371958a84ef0cba7e418279527fdc2
-  data.tar.gz: 1d4e7f4994731ca11be8f5a9d14c0fc302072499490549676376ec9af811f024
+  metadata.gz: 29143768deb93b6a47c7804f971242b4700652a3e32ebd7f100346c522da5e73
+  data.tar.gz: 38eb496eb742d27392ae5587d551668fba57432d29f0dc4199e2f82d6614eb7e
 SHA512:
-  metadata.gz: ae84a664f4676c90d088f36b57db1b5de7d324df684bb544391489ac037ed8788dcc76f64f3195b04e8b6d57da1bbb990895681eedebb10508d6c0a825c41533
-  data.tar.gz: dbbe4acbc9d91b8fd79f8d1cbc20223220abcd5cbcb36b505ccdebf8b664b3dc24ecd4b8c78b852c56bff64c197eeeb3aa7a21544abf0a0a2681fa8dfe00e0cf
+  metadata.gz: 9a87ceb16ebfbfaa5039ad6425b55bc882d622a448608c7e935e9670e65482ea1d2795c8ef9854d61cfa3a8542354c73cd3e295ea5f85549fe044e60ee529ba1
+  data.tar.gz: 5dbaeadca8d7fb1f96b4b7710c8ccef57b10b45522b344f7fe2b0440f8cd8b9675e337a52e4a51efbc16d822d43f5ab9397a51ee2647dc38a0948cb7b05bad77

data/lib/sqreen/rules_callbacks/blacklist_ips.rb

@@ -1,7 +1,7 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 
-require 'ipaddr'
+require 'sqreen/trie'
 
 require 'sqreen/rule_callback'
 
@@ -11,8 +11,9 @@ module Sqreen
     class BlacklistIPsCB < RuleCB
       def initialize(klass, method, rule_hash)
         super(klass, method, rule_hash)
-        @ips = Hash[@data['values'].map { |v| [v, IPAddr.new(v)] }]
-        Sqreen.log.info 'no ips given for IP blacklisting' if @ips.empty?
+        @trie_v4 = Sqreen::Trie.new
+        @trie_v6 = Sqreen::Trie.new(nil, nil, Socket::AF_INET6)
+        insert_values(@data['values'])
       end
 
       def pre(_inst, _args, _budget = nil, &_block)
@@ -26,18 +27,33 @@ module Sqreen
         advise_action(:raise, :skip_rem_cbs => true)
       end
 
-      protected
+      private
+
+      def insert_values(ranges)
+        Sqreen.log.info 'no ips given for IP blacklisting' if ranges.empty?
+
+        ranges.map { |r| Prefix.from_str(r, r) }.each do |prefix|
+          trie_for(prefix).insert prefix
+        end
+      end
+
+      def trie_for(prefix)
+        prefix.family == Socket::AF_INET6 ? @trie_v6 : @trie_v4
+      end
 
       # Is this a blacklisted ip?
       # return the ip blacklisted range that match ip
       def find_blacklisted_ip(rip)
-        ret = (@ips || {}).find do |_, ip|
-          ip.include?(rip)
+        begin
+          ipa = IPAddr.new(rip)
+        rescue
+          Sqreen.log.info "invalid IP address given by framework: #{rip}"
+          return nil
         end
-        return nil unless ret
-        ret.first
-      rescue
-        nil
+
+        range = trie_for(ipa).search_best(ipa.to_i, ipa.family)
+        return nil unless range
+        range.data
       end
     end
   end

data/lib/sqreen/trie.rb

@@ -182,6 +182,7 @@ module Sqreen
 
     def node_to_ip_addr(node)
       ret = IPAddr.new(node.prefix.address, node.prefix.family)
+      ret.send(:mask!, node.prefix.bitlen)
       ret.singleton_class.send(:define_method, :data) { node.prefix.data }
       ret
     end

data/lib/sqreen/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 module Sqreen
-  VERSION = '1.15.7.beta1'.freeze
+  VERSION = '1.15.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.15.7.beta1
+  version: 1.15.7
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sq_mini_racer
@@ -134,9 +134,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7