intrusion 0.1.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6151639617a3b7284f48de675227ab59c8150b42b8134f697ebc8328b997984
-  data.tar.gz: 7ca22d37ccf3c3bf0acbea7d18515a4933c173b458d950c9e5cb975a19765529
+  metadata.gz: 943e04b12f074446b6d07fecd57c158945586b81f96fcab783747530564ef905
+  data.tar.gz: 631bbc1a142fa86c1f0e42c43199add90dea0e9aee934c342c8d96ef746be028
 SHA512:
-  metadata.gz: d9fe80409942f12b85c4f2234550568b7d6a83b8b69ac4f8a60ec48dab59c98f8f58b7beb68cd40ef6b7dd3be804e0efb1aa659debde26a0e2dea5dc417f046f
-  data.tar.gz: 874aecd912cf2217d4c776393eae257c9e9debf75b24bbec577b51e6dfe8aec3186ce569c338717ff06cd5aad252c95669e60e1b3868b1fbd37162a320347a7c
+  metadata.gz: 89d672e112dd6bcb025c1ab21eb5e47baa6dd301094922b9c2e2dbaa092491039f9ecd44b803043e1a2af840c555458fdd9f0e5b78e7cd8947f6b01edb22ed25
+  data.tar.gz: de59a116b9f48b3e1373f537658f557f236e91a5683fe743b0e8b360e2a19ea6703430c37e2fff1516fc71488f412db3802019141a830a974b7b8f7b7ce2df5f

data/lib/intrusion.rb

@@ -1,9 +1,32 @@
 # Intrusion main module
+
 module Intrusion
+
+  DefaultConfig = Struct.new(:threshold) do
+    def initialize
+      self.threshold = 10
+    end
+  end
+
+  def self.configure
+    @config = DefaultConfig.new
+    yield(@config) if block_given?
+    @config
+  end
+
+  def self.config
+    @config || configure
+  end
+
+  def self.reset
+    @config = nil
+    @cache = nil
+  end
+
   # check if ip is blocked
   def ids_is_blocked?(address)
     ids_load.each do |d|
-      return true if d[:ip] == address && d[:counter] > 9
+      return true if d[:ip] == address && d[:counter] >= Intrusion.config.threshold
     end
     false
   end
@@ -20,13 +43,11 @@ module Intrusion
     found = nil
     dt.each { |d| found = d if d[:ip] == address }
     if found
-      block ? found[:counter] = 10 : found[:counter] += 1
+      block ? found[:counter] = Intrusion.config.threshold : found[:counter] += 1
     else
-      dt << { ip: address, counter: block ? 10 : 1 }
+      dt << { ip: address, counter: block ? Intrusion.config.threshold : 1 }
     end
-
-    # update record
-    update_attributes(ids: dt.to_yaml)
+    ids_save!(dt)
   end
 
   # reset counter and stay
@@ -37,16 +58,23 @@ module Intrusion
 
     if found
       dt.delete(found)
-      # update
-      return update_attributes(ids: dt.to_yaml)
+      return ids_save!(dt)
     end
     false
   end
 
   # convert yaml string helper
   def ids_load
-    dt = ids.blank? ? [] : YAML.load(ids, Intrusion) rescue []
-    dt = [] unless dt.class == Array
-    dt
+    data = ids.blank? ? [] : YAML.safe_load(ids, [Symbol])
+    raise 'invalid data in ids field' unless data.is_a?(Array)
+    data
+  rescue RuntimeError
+    []
+  end
+  
+  # save current state to object or file
+  def ids_save!(dt)
+    update(ids: dt.to_yaml)
   end
+
 end

metadata

@@ -1,26 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: intrusion
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.1
 platform: ruby
 authors:
 - Simon Duncombe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies: []
 description: Intrusion is a gem helping you to block objects for IP addresses within
   your Ruby on Rails Application.
-email: sd@netsense.ch
+email: simon@duncom.be
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/intrusion.rb
-homepage: http://github.com/symontech/intrusion
-licenses: []
-metadata: {}
+homepage: https://github.com/symontech/intrusion
+licenses:
+- MIT
+metadata:
+  source_code_uri: https://github.com/symontech/intrusion
+  documentation_uri: https://github.com/symontech/intrusion#readme
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -36,8 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.2.29
 signing_key: 
 specification_version: 4
 summary: intrusion detection and prevention for rails applications