sqreen 1.15.7.beta1-java → 1.15.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce7a33c0d45ac85cb7b769691ef02e4bff94a935192059d8e9caae7e442e4c42
-  data.tar.gz: f5bcab2aa9ce1a2afc5804adf14e0523048ad0ba66a89cb9e794ef2da60323f7
+  metadata.gz: ab0f7f327746411e048e85c39d5a85eb0e5160de4561d9dd996b689313db356e
+  data.tar.gz: a6b48b211b1694a109e57e394ceec8c678b31585a3313211d028ab0798467b2d
 SHA512:
-  metadata.gz: 6a8eceb60dcfa234f27af93c4fbdc1d9ec6e8ce4857d4d415f16c654f1b35af3bb520892e6557776ff85a40b68bc59063f13804fc31e335a7338a6fba4df13a8
-  data.tar.gz: ba74c1bb2880372953f0571e8fdc3ab95b975e8a55efe36760c0e874c0e5526ee1d7bc632a84e0e318b88fc5ce353e53721d6d78a4ca64dde8b5b5e38848304b
+  metadata.gz: 3e951226c019ee021a9203609971bef97b9bc738f43a624c41e4eedae17803009f3d6232f336422522b6f9b0453b631423674327c5f3ebb78db1e7a7f0506905
+  data.tar.gz: 19297ce483987c4c714a76b76409ca7139ebda5ec01f4da7ca79ce5d80a6faa1b37d732df9548037c00319ac1b82e40f906c384e29dfb9a869c088fc0010cd89

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: java
 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
   requirement: !ruby/object:Gem::Requirement
@@ -148,9 +148,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