rack_attack_admin 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b25176b34b9df57026a574d6d1906baa6f38c807ba0390106df0753e57c16f2e
-  data.tar.gz: 1524e2a57ea8c775e6a8085bc10a29c6ed50b98aff069e0d3e0cb2bca6cb7359
+  metadata.gz: 9ecd6ce1a1b78254993c7d6b6e72b23c7e0aeea62268282666ff3f9c55177f35
+  data.tar.gz: fb1449910735e43bff061886f9d362c0358b8f37b8de2332701864b3d123f859
 SHA512:
-  metadata.gz: 984d71bfb9849fb22794beb7614a92c27466f5ace13700bc5e608afe4b5a0f913239766345dcda4b98cfbcb3f23587be3617e23eae798199549245d9c059affe
-  data.tar.gz: b8e4996db88b3eb01808f85ed1fa4e6407694fc3488ca9fb7ea1cb475531ca201398089426a64599f82e578f982938e18e7bf4250bff9aaf272a97c1c6f64f79
+  metadata.gz: d5cb6070210f2b5ba29f3d2c219d9ec3574df58e3e56f0f87294cc60be6c20f719b94379079e3736093a4411584c171445ef2f435e0958d519fee76808ff84c1
+  data.tar.gz: eb24534ef311d712d43647d0804f04ddf193d8f3b623e54bafa80be491e353d83897a05138add8106e0a859f9be8eecc7885d42c0e1318f34c70fde94fe2ff11

data/app/controllers/rack_attack_admin/banned_ips_controller.rb

@@ -19,10 +19,11 @@ module RackAttackAdmin
       end
       if ban.valid?
         Rack::Attack::BannedIps.ban! ban.ip, ban.bantime
-        redirect_to root_path, success: "Added: #{ban.ip}"
+        flash[:success] = "Added #{ban.ip}"
       else
-        redirect_to root_path, alert: "Failed to add: #{ban.errors.full_messages}"
+        flash[:alert] = "Failed to add: #{ban.errors.full_messages.join('. ')}"
       end
+      redirect_to root_path
     end
   end
 end

data/app/controllers/rack_attack_admin/keys_controller.rb

@@ -4,7 +4,8 @@ module RackAttackAdmin
       orig_key = params[:id]
       unprefixed_key = Rack::Attack.unprefix_key(orig_key)
       Rack::Attack.cache.delete unprefixed_key
-      redirect_to root_path, success: "Deleted: #{unprefixed_key}"
+      flash[:success] = "Deleted #{unprefixed_key}"
+      redirect_to root_path
     end
   end
 end

data/app/views/rack_attack_admin/banned_ips/_banned_ip.html.haml

@@ -11,6 +11,6 @@
       - interval = Rack::Attack.cache.store.ttl("#{Rack::Attack.cache.prefix}:#{key}")
       - if interval
         =# distance_of_time_in_words(interval)
-        in #{ActiveSupport::Duration.build(interval)&.human_to_s}
+        in #{ActiveSupport::Duration.build(interval)&.human_str}
 
   %td= link_to 'Delete', rack_attack_admin.banned_ip_path(key), method: :delete, class: 'btn'

data/app/views/rack_attack_admin/rack_attack/index.html.haml

@@ -44,12 +44,12 @@
     %tr
       %th Type:Name
       %th Discriminator
-      %th
-        Expires<br/>
-        (Time bucket)
       %th
         Value<br/>
         \/Limit
+      %th
+        Expires<br/>
+        (Time bucket)
       %th Actions
   - @counters_h.each do |key, value|
     %tr
@@ -63,6 +63,14 @@
           %code= rule.inspect_with_options
 
       %td= parsed[:discriminator]
+
+      - limit = parsed && (rule = parsed[:rule]) && rule.limit.to_i
+      - over_limit = value >= limit
+      %td{class: ('over_limit' if over_limit), style: ('color: red' if over_limit)}
+        = value
+        - if limit
+          = "/#{limit}"
+
       %td
         -# We can get expires_in from redis or directly from the mached throttle rule
         :ruby
@@ -73,7 +81,7 @@
               (time_range.end - Time.now)
             end
         - if interval
-          in #{ActiveSupport::Duration.build(interval)&.human_to_s}<br/>
+          in #{ActiveSupport::Duration.build(interval)&.human_str}<br/>
 
         - if parsed and time_range = parsed[:time_range]
           %small
@@ -81,14 +89,8 @@
             %span><
               \-
             #{time_range.end  .to_s(:time_with_s)}
-            \= #{time_range.duration&.human_to_s})
+            \= #{time_range.duration&.human_str})
 
-      - limit = parsed && (rule = parsed[:rule]) && rule.limit.to_i
-      - over_limit = value >= limit
-      %td{class: ('over_limit' if over_limit), style: ('color: red' if over_limit)}
-        = value
-        - if limit
-          = "/#{limit}"
       %td= link_to 'Delete', rack_attack_admin.key_path(key), method: :delete, class: 'btn'
 .current_time.mb-2 (Current time: #{Time.now.to_s(:time_with_s)})
 

data/lib/rack/attack_extensions.rb

@@ -1,22 +1,6 @@
 require 'memoist'
 require 'active_model'
 
-ActiveSupport::Duration.class_eval do
-  # Returns a concise and human-readable string, like '3 h' or '3 h, 5 m, 7 s'
-  # This is unlike #to_s, which is concise but not very human-readable (gives time in seconds even for large durations),
-  # This is unlike #to_s, which is concise but not very human-readable ("P3Y6M4DT12H30M5S").
-  def human_to_s
-    iso8601.
-      sub('P', '').
-      sub('T', '').
-      downcase.
-      gsub(/
-        \D    # Not a digit
-        (?!$) # Not at end
-      /x) { |m| " #{m}, " }
-  end
-end
-
       Rack::Attack
 class Rack::Attack
   class << self

data/lib/rack_attack_admin/version.rb

@@ -1,5 +1,5 @@
 module RackAttackAdmin
     def self.version
-      "0.1.0"
+      "0.1.1"
     end
 end

data/lib/rack_attack_admin.rb

@@ -1,5 +1,6 @@
 require 'rails'
 require 'rack/attack'
+require 'active_support/duration/human_string'
 
 # TODO: Figure out why renaming it to be this (consistent) path causes it to not load
 # config/routes.rb and to not add routes even if we force it to be loaded.

data/rack_attack_admin.gemspec

@@ -4,37 +4,38 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "rack_attack_admin/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "rack_attack_admin"
+  spec.name          = 'rack_attack_admin'
   spec.version       = RackAttackAdmin.version
-  spec.authors       = ["Tyler Rick"]
-  spec.email         = ["tyler@tylerrick.com"]
-  spec.license       = "MIT"
+  spec.authors       = ['Tyler Rick']
+  spec.email         = ['tyler@tylerrick.com']
+  spec.license       = 'MIT'
 
   spec.summary       = %q{A Rack::Attack admin dashboard}
   spec.description   = %q{Lets you see the current state of all throttles and bans. Delete existing keys/bans. Manually add bans.}
-  spec.homepage      = "https://github.com/TylerRick/rack_attack_admin"
+  spec.homepage      = 'https://github.com/TylerRick/rack_attack_admin'
 
-  spec.metadata["homepage_uri"]    = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "#{spec.metadata["source_code_uri"]}/blob/master/Changelog.md"
+  spec.metadata['homepage_uri']    = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata['changelog_uri'] = "#{spec.metadata['source_code_uri']}/blob/master/Changelog.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.required_ruby_version = ">= 2.3.0"
-  spec.add_dependency "activesupport", [">= 4.2", "< 5.3"]
-  spec.add_dependency "haml"
-  spec.add_dependency "memoist"
-  spec.add_dependency "rack-attack"
-  spec.add_dependency "rails",         [">= 4.2", "< 5.3"]
+  spec.required_ruby_version = '>= 2.3.0'
+  spec.add_dependency 'activesupport', ['>= 4.2', '< 5.3']
+  spec.add_dependency 'activesupport-duration-human_string', '>= 0.1.1'
+  spec.add_dependency 'haml'
+  spec.add_dependency 'memoist'
+  spec.add_dependency 'rack-attack'
+  spec.add_dependency 'rails',         ['>= 4.2', '< 5.3']
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack_attack_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tyler Rick
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: activesupport-duration-human_string
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement