Skip to content

remove auth_dsl_file '.freeze' so that Engines can also load auth info #3

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
btihen wants to merge 1 commit into
base: allow_rails_5
Choose a base branch
from
Open

remove auth_dsl_file '.freeze' so that Engines can also load auth info #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion lib/declarative_authorization/authorization.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ class AuthorizationUsageError < AuthorizationError; end
# The exception is raised to ensure that the entire rule is invalidated.
class NilAttributeValueError < AuthorizationError; end

AUTH_DSL_FILES = [Pathname.new(Rails.root || '').join('config', 'authorization_rules.rb').to_s].freeze unless defined? AUTH_DSL_FILES
# although .freeze is a good idea, unfortunately this breaks when engines
# add information after 'AUTH_DSL_FILES' is defined by rails core
AUTH_DSL_FILES = [ Pathname.new(Rails.root || '')
.join('config', 'authorization_rules.rb')
.to_s
] unless defined? AUTH_DSL_FILES

# Controller-independent method for retrieving the current user.
# Needed for model security where the current controller is not available.
Expand Down