Skip to content

Make RackAttackAdmin usable #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make RackAttackAdmin usable #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b293977
Make RackAttackAdmin usable
Nowaker Nov 25, 2020
5f68296
Allow any Rails version
Nowaker Jun 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/rack_attack_admin/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module RackAttackAdmin
class ApplicationController < ::ApplicationController
class ApplicationController < ActionController::Base
skip_authorization_check if respond_to? :skip_authorization_check
before_action :require_admin, except: [:current_request] if method_defined?(:require_admin)
before_action :toggle_flags
Expand All @@ -13,7 +13,7 @@ def toggle_flags

helper_method \
def is_redis?
Rack::Attack.cache.respond.store.to_s.match?(/Redis/)
Rack::Attack.cache.store.to_s.match?(/Redis/)
end

helper_method \
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/rack_attack_admin/banned_ips_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def create
else
flash[:alert] = "Failed to add: #{ban.errors.full_messages.join('. ')}"
end
redirect_to root_path
redirect_to rack_attack_admin.root_path
end
end
end
2 changes: 1 addition & 1 deletion app/controllers/rack_attack_admin/keys_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def destroy
unprefixed_key = Rack::Attack.unprefix_key(orig_key)
Rack::Attack.cache.delete unprefixed_key
flash[:success] = "Deleted #{unprefixed_key}"
redirect_to root_path
redirect_to rack_attack_admin.root_path
end
end
end
3 changes: 1 addition & 2 deletions app/controllers/rack_attack_admin/rack_attack_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ class RackAttackController < RackAttackAdmin::ApplicationController
# Web version of lib/tasks/rack_attack_admin_tasks.rake
def index
@default_banned_ip = Rack::Attack::BannedIp.new(bantime: '60 m')
@counters_h = Rack::Attack.counters_h.
without(*Rack::Attack::BannedIps.keys)
@counters_h = Rack::Attack.counters_h.with_indifferent_access.except(*Rack::Attack::BannedIps.keys)
render
end

Expand Down
4 changes: 2 additions & 2 deletions rack_attack_admin.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ Gem::Specification.new do |spec|
spec.require_paths = ['lib']

spec.required_ruby_version = '>= 2.3.0'
spec.add_dependency 'activesupport', ['>= 4.2', '< 5.3']
spec.add_dependency 'activesupport', '>= 4.2'
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_dependency 'rails', '>= 4.2'

spec.add_development_dependency 'bundler', '~> 2.0'
spec.add_development_dependency 'rake', '~> 10.0'
Expand Down