Skip to content

Commit 95bcf59

Browse files
authored
Merge pull request #279 from patorash/fix-web_console-permissions
Fix initializer "web_console.permissions"
2 parents ca62054 + aa67b70 commit 95bcf59

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

lib/web_console/railtie.rb

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
module WebConsole
66
class Railtie < ::Rails::Railtie
77
config.web_console = ActiveSupport::OrderedOptions.new
8-
config.web_console.permissions = %w( 127.0.0.1 ::1 )
98

109
initializer "web_console.initialize" do
1110
require "bindex"
@@ -53,9 +52,8 @@ class Railtie < ::Rails::Railtie
5352
end
5453

5554
initializer "web_console.permissions" do
56-
if permissions = config.web_console.permissions || config.web_console.whitelisted_ips
57-
Request.permissions = Permissions.new(permissions)
58-
end
55+
permissions = config.web_console.permissions || config.web_console.whitelisted_ips
56+
Request.permissions = Permissions.new(permissions)
5957
end
6058

6159
initializer "web_console.whiny_requests" do

test/web_console/railtie_test.rb

+12
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ class RailtieTest < ActiveSupport::TestCase
2121
end
2222
end
2323

24+
test "config.permissions sets whitelisted networks by whitelisted_ips" do
25+
new_uninitialized_app do |app|
26+
app.config.web_console.whitelisted_ips = %w( 172.16.0.0/12 192.168.0.0/16 )
27+
app.initialize!
28+
29+
1.upto(255).each do |n|
30+
assert_includes Request.permissions, "172.16.0.#{n}"
31+
assert_includes Request.permissions, "192.168.0.#{n}"
32+
end
33+
end
34+
end
35+
2436
test "config.permissions always includes localhost" do
2537
new_uninitialized_app do |app|
2638
app.config.web_console.permissions = "8.8.8.8"

0 commit comments

Comments
 (0)