unimedia_ip_checker 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzQ0YmFkY2JlNDk0ODc3OWEwNDkzMWFkMDlhMjc3NTM3ZjlmOTQ4Nw==
+    YzNiNzM1ZGZiNjM1ODkzNDg1MmY3OTkyNDFlYzAyOWU2ZDc2ZmU3Yg==
   data.tar.gz: !binary |-
-    ZmNiYmFjZDJjMmIwYjY2N2YwNGUzOWEyOGUzNzAyY2Y4YWVkYThhZg==
+    YjU4ZGQ4NGRmNTY2YmYwZDIxZDI1Y2JkMzQ2OTNmYjdlMWY0MDFkNg==
 SHA512:
   metadata.gz: !binary |-
-    MDFmYTVkYzEwYTRkZTQyNWE0NTMyY2RjNTA2Yjk0MzYzMzM2NzU4YjY0YmM4
-    ZjI4YzM4ZGQ3MmMxNjJjYmI2NmM3NzM0MmEzYWNjYmQzY2M0ZTc3OGFkN2Jj
-    ZDM5Y2ZlZjhhOWJhZGE3OTBmYzk4YjhhNjIyZWRhMWMzYTcxMTg=
+    NzhlZmJhYmQ4NmYxOWNhMzM2ZDczYjAxZTk0OTExNDZkZGMxZGNiZDY4ZDlk
+    MmJkZGI4YTI1OTVkNzJiNjY4OGM1ZDBjNmU5ZThhYWZlY2YyNTExZDUxNmU0
+    NzVlMzk0MmU0Y2FkMTQ2YWI2NmI4NmQyYTQzZDMwOWZiZjdjOTc=
   data.tar.gz: !binary |-
-    ZjY3ZmRmNGEwOTVlNTIwMDYwOGI0ZDIwMmM3OTEzMDg5OWY1MTVlZGE3OTkw
-    NjBjZDE0MGFhMjhlMTE3MTYzYTQyZTNlZWIwNTQ5N2IyZDk2NzFhMDBmNTEx
-    NTg1MzdiNjQ3YzgwMjgyZGVhYjFiNDE0YjJkMDYwNDRkYjZhYzc=
+    ZDIwNmEzZTQyMTI4MWVlZGM5ODJmMTMyNjMwYTc2NGY1NzhlNTM5Mjg2MWYz
+    NjIwYzIyMjRiZTc1NjI2MWZjODA4MTdlMzdmYjQ3OTNmZWQwYmNiODU5ZmVl
+    NTk5YTBlNWRlZjRmMGI3MzhiMzQ4YzBlYjBiMTU1ZjViN2FjMzg=

data/lib/ip_checker.rb

@@ -3,35 +3,44 @@ class IpChecker
     @project_name = project_name
   end
 
-  def is_block_ip(request)
-      ip = request.env["HTTP_X_FORWARDED_FOR"] || request.remote_ip
-      # :auth_type = 1 block
-      # :auth_type = 0 allow
-      connection = ActiveRecord::Base.connection()
-      any_ip = connection.execute("SELECT *              
-          FROM
-              dtb_ip_address_block
-          WHERE
-              dtb_ip_address_block.ip_address = 'all'
-                  AND dtb_ip_address_block.auth_type = 1
-                  AND dtb_ip_address_block.project = '#{@project_name}';")
-      
-      white_list_ip = any_ip.first && any_ip.first[2].to_s == '1' ? true : false
-        
-      ip_address = connection.execute(" SELECT *
-          FROM
-              dtb_ip_address_block
-          WHERE
-              dtb_ip_address_block.ip_address = '#{ip}'
-                  AND dtb_ip_address_block.project = '#{@project_name}'")
-    
-      if white_list_ip 
-          return true if ip_address.first
-        else
-          return true unless ip_address.first
-      end 
-      return false
+   def is_block_ip(request)
+    ip_range = []
+    cidr = []
     
+    user_ip = request.env["HTTP_X_FORWARDED_FOR"] || request.remote_ip
+    connection = ActiveRecord::Base.connection()
+
+    is_black_list = is_black_list(connection)
+
+    any_ip = connection.execute("SELECT * FROM dtb_ip_address_block
+                                    WHERE dtb_ip_address_block.ip_address != 'all'
+                                    AND dtb_ip_address_block.project = '#{@project_name}';")
+
+    any_ip.each do |ip|
+      begin
+        cidr = NetAddr::CIDR.create(ip[1]).enumerate
+        ip_range = ip_range + cidr
+      rescue
+      end
+    end
+
+    if ip_range.include?(user_ip)
+      return is_black_list ? false : true
+    else
+      return is_black_list ? true : false
+    end
   end
+
+  def is_black_list(connection)
+    auth_type_ip = connection.execute("SELECT *
+        FROM
+            dtb_ip_address_block
+        WHERE
+            dtb_ip_address_block.ip_address = 'all'
+                AND dtb_ip_address_block.auth_type = 1
+                AND dtb_ip_address_block.project = '#{@project_name}';")
+
+    auth_type_ip.first && auth_type_ip.first[2].to_s == '1' ? true : false
+  end  
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unimedia_ip_checker
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Zulnemekh Bekhbat
@@ -18,7 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ip_checker.rb
-homepage: https://github.com/zulnemekh/unimedia_ip_checker
+homepage: http://gitlab.unimedia.mn/crowdsourcing/unimedia_ip_checker
 licenses:
 - Unimedia solutions
 metadata: {}