devise 4.1.1 → 4.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/CHANGELOG.md +224 -4
- data/MIT-LICENSE +2 -1
- data/README.md +275 -90
- data/app/controllers/devise/confirmations_controller.rb +2 -0
- data/app/controllers/devise/omniauth_callbacks_controller.rb +7 -5
- data/app/controllers/devise/passwords_controller.rb +3 -0
- data/app/controllers/devise/registrations_controller.rb +34 -13
- data/app/controllers/devise/sessions_controller.rb +3 -1
- data/app/controllers/devise/unlocks_controller.rb +2 -0
- data/app/controllers/devise_controller.rb +5 -3
- data/app/helpers/devise_helper.rb +23 -18
- data/app/mailers/devise/mailer.rb +10 -4
- data/app/views/devise/confirmations/new.html.erb +2 -2
- data/app/views/devise/mailer/email_changed.html.erb +7 -0
- data/app/views/devise/passwords/edit.html.erb +3 -3
- data/app/views/devise/passwords/new.html.erb +2 -2
- data/app/views/devise/registrations/edit.html.erb +9 -5
- data/app/views/devise/registrations/new.html.erb +4 -4
- data/app/views/devise/sessions/new.html.erb +4 -4
- data/app/views/devise/shared/_error_messages.html.erb +15 -0
- data/app/views/devise/shared/_links.html.erb +8 -8
- data/app/views/devise/unlocks/new.html.erb +2 -2
- data/config/locales/en.yml +5 -2
- data/lib/devise.rb +39 -17
- data/lib/devise/controllers/helpers.rb +22 -9
- data/lib/devise/controllers/rememberable.rb +3 -1
- data/lib/devise/controllers/scoped_views.rb +2 -0
- data/lib/devise/controllers/sign_in_out.rb +39 -14
- data/lib/devise/controllers/store_location.rb +25 -7
- data/lib/devise/controllers/url_helpers.rb +3 -1
- data/lib/devise/delegator.rb +2 -0
- data/lib/devise/encryptor.rb +2 -0
- data/lib/devise/failure_app.rb +63 -33
- data/lib/devise/hooks/activatable.rb +2 -0
- data/lib/devise/hooks/csrf_cleaner.rb +2 -0
- data/lib/devise/hooks/forgetable.rb +2 -0
- data/lib/devise/hooks/lockable.rb +4 -2
- data/lib/devise/hooks/proxy.rb +3 -1
- data/lib/devise/hooks/rememberable.rb +2 -0
- data/lib/devise/hooks/timeoutable.rb +4 -2
- data/lib/devise/hooks/trackable.rb +2 -0
- data/lib/devise/mailers/helpers.rb +6 -3
- data/lib/devise/mapping.rb +3 -1
- data/lib/devise/models.rb +3 -1
- data/lib/devise/models/authenticatable.rb +63 -37
- data/lib/devise/models/confirmable.rb +79 -22
- data/lib/devise/models/database_authenticatable.rb +86 -17
- data/lib/devise/models/lockable.rb +17 -3
- data/lib/devise/models/omniauthable.rb +2 -0
- data/lib/devise/models/recoverable.rb +32 -20
- data/lib/devise/models/registerable.rb +4 -0
- data/lib/devise/models/rememberable.rb +5 -3
- data/lib/devise/models/timeoutable.rb +2 -0
- data/lib/devise/models/trackable.rb +15 -1
- data/lib/devise/models/validatable.rb +10 -3
- data/lib/devise/modules.rb +2 -0
- data/lib/devise/omniauth.rb +4 -5
- data/lib/devise/omniauth/config.rb +2 -0
- data/lib/devise/omniauth/url_helpers.rb +2 -51
- data/lib/devise/orm/active_record.rb +5 -1
- data/lib/devise/orm/mongoid.rb +6 -2
- data/lib/devise/parameter_filter.rb +4 -0
- data/lib/devise/parameter_sanitizer.rb +15 -56
- data/lib/devise/rails.rb +6 -6
- data/lib/devise/rails/deprecated_constant_accessor.rb +39 -0
- data/lib/devise/rails/routes.rb +9 -7
- data/lib/devise/rails/warden_compat.rb +2 -0
- data/lib/devise/secret_key_finder.rb +27 -0
- data/lib/devise/strategies/authenticatable.rb +3 -1
- data/lib/devise/strategies/base.rb +2 -0
- data/lib/devise/strategies/database_authenticatable.rb +8 -1
- data/lib/devise/strategies/rememberable.rb +2 -0
- data/lib/devise/test/controller_helpers.rb +167 -0
- data/lib/devise/test/integration_helpers.rb +63 -0
- data/lib/devise/test_helpers.rb +7 -129
- data/lib/devise/time_inflector.rb +2 -0
- data/lib/devise/token_generator.rb +2 -0
- data/lib/devise/version.rb +3 -1
- data/lib/generators/active_record/devise_generator.rb +40 -12
- data/lib/generators/active_record/templates/migration.rb +3 -1
- data/lib/generators/active_record/templates/migration_existing.rb +2 -0
- data/lib/generators/devise/controllers_generator.rb +3 -1
- data/lib/generators/devise/devise_generator.rb +5 -3
- data/lib/generators/devise/install_generator.rb +3 -5
- data/lib/generators/devise/orm_helpers.rb +9 -3
- data/lib/generators/devise/views_generator.rb +8 -9
- data/lib/generators/mongoid/devise_generator.rb +7 -5
- data/lib/generators/templates/README +9 -8
- data/lib/generators/templates/controllers/confirmations_controller.rb +2 -0
- data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +3 -1
- data/lib/generators/templates/controllers/passwords_controller.rb +2 -0
- data/lib/generators/templates/controllers/registrations_controller.rb +4 -2
- data/lib/generators/templates/controllers/sessions_controller.rb +3 -1
- data/lib/generators/templates/controllers/unlocks_controller.rb +2 -0
- data/lib/generators/templates/devise.rb +49 -6
- data/lib/generators/templates/markerb/email_changed.markerb +7 -0
- data/lib/generators/templates/markerb/password_change.markerb +2 -2
- data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +5 -1
- data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +10 -2
- data/lib/generators/templates/simple_form_for/passwords/new.html.erb +4 -1
- data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +11 -3
- data/lib/generators/templates/simple_form_for/registrations/new.html.erb +11 -3
- data/lib/generators/templates/simple_form_for/sessions/new.html.erb +7 -2
- data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +4 -1
- metadata +16 -297
- data/.gitignore +0 -10
- data/.travis.yml +0 -44
- data/.yardopts +0 -9
- data/CODE_OF_CONDUCT.md +0 -22
- data/CONTRIBUTING.md +0 -16
- data/Gemfile +0 -30
- data/Gemfile.lock +0 -182
- data/Rakefile +0 -36
- data/bin/test +0 -13
- data/devise.gemspec +0 -26
- data/devise.png +0 -0
- data/gemfiles/Gemfile.rails-4.1-stable +0 -30
- data/gemfiles/Gemfile.rails-4.1-stable.lock +0 -170
- data/gemfiles/Gemfile.rails-4.2-stable +0 -30
- data/gemfiles/Gemfile.rails-4.2-stable.lock +0 -192
- data/gemfiles/Gemfile.rails-5.0-beta +0 -37
- data/gemfiles/Gemfile.rails-5.0-beta.lock +0 -199
- data/test/controllers/custom_registrations_controller_test.rb +0 -40
- data/test/controllers/custom_strategy_test.rb +0 -64
- data/test/controllers/helper_methods_test.rb +0 -22
- data/test/controllers/helpers_test.rb +0 -316
- data/test/controllers/inherited_controller_i18n_messages_test.rb +0 -51
- data/test/controllers/internal_helpers_test.rb +0 -127
- data/test/controllers/load_hooks_controller_test.rb +0 -19
- data/test/controllers/passwords_controller_test.rb +0 -32
- data/test/controllers/sessions_controller_test.rb +0 -106
- data/test/controllers/url_helpers_test.rb +0 -65
- data/test/delegator_test.rb +0 -19
- data/test/devise_test.rb +0 -107
- data/test/failure_app_test.rb +0 -320
- data/test/generators/active_record_generator_test.rb +0 -83
- data/test/generators/controllers_generator_test.rb +0 -48
- data/test/generators/devise_generator_test.rb +0 -39
- data/test/generators/install_generator_test.rb +0 -24
- data/test/generators/mongoid_generator_test.rb +0 -23
- data/test/generators/views_generator_test.rb +0 -103
- data/test/helpers/devise_helper_test.rb +0 -49
- data/test/integration/authenticatable_test.rb +0 -698
- data/test/integration/confirmable_test.rb +0 -324
- data/test/integration/database_authenticatable_test.rb +0 -95
- data/test/integration/http_authenticatable_test.rb +0 -106
- data/test/integration/lockable_test.rb +0 -240
- data/test/integration/omniauthable_test.rb +0 -135
- data/test/integration/recoverable_test.rb +0 -347
- data/test/integration/registerable_test.rb +0 -357
- data/test/integration/rememberable_test.rb +0 -211
- data/test/integration/timeoutable_test.rb +0 -184
- data/test/integration/trackable_test.rb +0 -92
- data/test/mailers/confirmation_instructions_test.rb +0 -115
- data/test/mailers/reset_password_instructions_test.rb +0 -96
- data/test/mailers/unlock_instructions_test.rb +0 -91
- data/test/mapping_test.rb +0 -134
- data/test/models/authenticatable_test.rb +0 -23
- data/test/models/confirmable_test.rb +0 -511
- data/test/models/database_authenticatable_test.rb +0 -269
- data/test/models/lockable_test.rb +0 -350
- data/test/models/omniauthable_test.rb +0 -7
- data/test/models/recoverable_test.rb +0 -251
- data/test/models/registerable_test.rb +0 -7
- data/test/models/rememberable_test.rb +0 -169
- data/test/models/serializable_test.rb +0 -49
- data/test/models/timeoutable_test.rb +0 -51
- data/test/models/trackable_test.rb +0 -41
- data/test/models/validatable_test.rb +0 -119
- data/test/models_test.rb +0 -153
- data/test/omniauth/config_test.rb +0 -57
- data/test/omniauth/url_helpers_test.rb +0 -51
- data/test/orm/active_record.rb +0 -17
- data/test/orm/mongoid.rb +0 -13
- data/test/parameter_sanitizer_test.rb +0 -131
- data/test/rails_app/Rakefile +0 -6
- data/test/rails_app/app/active_record/admin.rb +0 -6
- data/test/rails_app/app/active_record/shim.rb +0 -2
- data/test/rails_app/app/active_record/user.rb +0 -7
- data/test/rails_app/app/active_record/user_on_engine.rb +0 -7
- data/test/rails_app/app/active_record/user_on_main_app.rb +0 -7
- data/test/rails_app/app/active_record/user_without_email.rb +0 -8
- data/test/rails_app/app/controllers/admins/sessions_controller.rb +0 -6
- data/test/rails_app/app/controllers/admins_controller.rb +0 -6
- data/test/rails_app/app/controllers/application_controller.rb +0 -11
- data/test/rails_app/app/controllers/application_with_fake_engine.rb +0 -30
- data/test/rails_app/app/controllers/custom/registrations_controller.rb +0 -31
- data/test/rails_app/app/controllers/home_controller.rb +0 -29
- data/test/rails_app/app/controllers/publisher/registrations_controller.rb +0 -2
- data/test/rails_app/app/controllers/publisher/sessions_controller.rb +0 -2
- data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +0 -14
- data/test/rails_app/app/controllers/users_controller.rb +0 -31
- data/test/rails_app/app/helpers/application_helper.rb +0 -3
- data/test/rails_app/app/mailers/users/from_proc_mailer.rb +0 -3
- data/test/rails_app/app/mailers/users/mailer.rb +0 -3
- data/test/rails_app/app/mailers/users/reply_to_mailer.rb +0 -4
- data/test/rails_app/app/mongoid/admin.rb +0 -29
- data/test/rails_app/app/mongoid/shim.rb +0 -23
- data/test/rails_app/app/mongoid/user.rb +0 -39
- data/test/rails_app/app/mongoid/user_on_engine.rb +0 -39
- data/test/rails_app/app/mongoid/user_on_main_app.rb +0 -39
- data/test/rails_app/app/mongoid/user_without_email.rb +0 -33
- data/test/rails_app/app/views/admins/index.html.erb +0 -1
- data/test/rails_app/app/views/admins/sessions/new.html.erb +0 -2
- data/test/rails_app/app/views/home/admin_dashboard.html.erb +0 -1
- data/test/rails_app/app/views/home/index.html.erb +0 -1
- data/test/rails_app/app/views/home/join.html.erb +0 -1
- data/test/rails_app/app/views/home/private.html.erb +0 -1
- data/test/rails_app/app/views/home/user_dashboard.html.erb +0 -1
- data/test/rails_app/app/views/layouts/application.html.erb +0 -24
- data/test/rails_app/app/views/users/edit_form.html.erb +0 -1
- data/test/rails_app/app/views/users/index.html.erb +0 -1
- data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +0 -1
- data/test/rails_app/app/views/users/sessions/new.html.erb +0 -1
- data/test/rails_app/bin/bundle +0 -3
- data/test/rails_app/bin/rails +0 -4
- data/test/rails_app/bin/rake +0 -4
- data/test/rails_app/config.ru +0 -4
- data/test/rails_app/config/application.rb +0 -44
- data/test/rails_app/config/boot.rb +0 -14
- data/test/rails_app/config/database.yml +0 -18
- data/test/rails_app/config/environment.rb +0 -5
- data/test/rails_app/config/environments/development.rb +0 -30
- data/test/rails_app/config/environments/production.rb +0 -84
- data/test/rails_app/config/environments/test.rb +0 -46
- data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
- data/test/rails_app/config/initializers/devise.rb +0 -180
- data/test/rails_app/config/initializers/inflections.rb +0 -2
- data/test/rails_app/config/initializers/secret_token.rb +0 -3
- data/test/rails_app/config/initializers/session_store.rb +0 -1
- data/test/rails_app/config/routes.rb +0 -126
- data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -71
- data/test/rails_app/db/schema.rb +0 -55
- data/test/rails_app/lib/shared_admin.rb +0 -17
- data/test/rails_app/lib/shared_user.rb +0 -30
- data/test/rails_app/lib/shared_user_without_email.rb +0 -26
- data/test/rails_app/lib/shared_user_without_omniauth.rb +0 -13
- data/test/rails_app/public/404.html +0 -26
- data/test/rails_app/public/422.html +0 -26
- data/test/rails_app/public/500.html +0 -26
- data/test/rails_app/public/favicon.ico +0 -0
- data/test/rails_test.rb +0 -9
- data/test/routes_test.rb +0 -279
- data/test/support/action_controller/record_identifier.rb +0 -10
- data/test/support/assertions.rb +0 -39
- data/test/support/helpers.rb +0 -77
- data/test/support/http_method_compatibility.rb +0 -51
- data/test/support/integration.rb +0 -92
- data/test/support/locale/en.yml +0 -8
- data/test/support/mongoid.yml +0 -6
- data/test/support/webrat/integrations/rails.rb +0 -33
- data/test/test_helper.rb +0 -34
- data/test/test_helpers_test.rb +0 -178
- data/test/test_models.rb +0 -33
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Devise
|
2
4
|
module Controllers
|
3
5
|
# Create url helpers to be used with resource/scope configuration. Acts as
|
@@ -32,7 +34,7 @@ module Devise
|
|
32
34
|
end
|
33
35
|
end
|
34
36
|
|
35
|
-
def self.generate_helpers!(routes=nil)
|
37
|
+
def self.generate_helpers!(routes = nil)
|
36
38
|
routes ||= begin
|
37
39
|
mappings = Devise.mappings.values.map(&:used_helpers).flatten.uniq
|
38
40
|
Devise::URL_HELPERS.slice(*mappings)
|
data/lib/devise/delegator.rb
CHANGED
data/lib/devise/encryptor.rb
CHANGED
data/lib/devise/failure_app.rb
CHANGED
@@ -1,10 +1,12 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "action_controller/metal"
|
2
4
|
|
3
5
|
module Devise
|
4
6
|
# Failure application that will be called every time :warden is thrown from
|
5
|
-
# any strategy or hook.
|
6
|
-
# page based on current scope and mapping. If no scope is given,
|
7
|
-
# to the default_url.
|
7
|
+
# any strategy or hook. It is responsible for redirecting the user to the sign
|
8
|
+
# in page based on current scope and mapping. If no scope is given, it
|
9
|
+
# redirects to the default_url.
|
8
10
|
class FailureApp < ActionController::Metal
|
9
11
|
include ActionController::UrlFor
|
10
12
|
include ActionController::Redirecting
|
@@ -50,13 +52,11 @@ module Devise
|
|
50
52
|
end
|
51
53
|
|
52
54
|
def recall
|
53
|
-
|
54
|
-
|
55
|
-
header_info = if config.try(:relative_url_root)
|
56
|
-
base_path = Pathname.new(config.relative_url_root)
|
55
|
+
header_info = if relative_url_root?
|
56
|
+
base_path = Pathname.new(relative_url_root)
|
57
57
|
full_path = Pathname.new(attempted_path)
|
58
58
|
|
59
|
-
{ "SCRIPT_NAME" =>
|
59
|
+
{ "SCRIPT_NAME" => relative_url_root,
|
60
60
|
"PATH_INFO" => '/' + full_path.relative_path_from(base_path).to_s }
|
61
61
|
else
|
62
62
|
{ "PATH_INFO" => attempted_path }
|
@@ -66,12 +66,11 @@ module Devise
|
|
66
66
|
if request.respond_to?(:set_header)
|
67
67
|
request.set_header(var, value)
|
68
68
|
else
|
69
|
-
env[var] = value
|
69
|
+
request.env[var] = value
|
70
70
|
end
|
71
71
|
end
|
72
72
|
|
73
73
|
flash.now[:alert] = i18n_message(:invalid) if is_flashing_format?
|
74
|
-
# self.response = recall_app(warden_options[:recall]).call(env)
|
75
74
|
self.response = recall_app(warden_options[:recall]).call(request.env)
|
76
75
|
end
|
77
76
|
|
@@ -107,7 +106,7 @@ module Devise
|
|
107
106
|
options[:authentication_keys] = keys.join(I18n.translate(:"support.array.words_connector"))
|
108
107
|
options = i18n_options(options)
|
109
108
|
|
110
|
-
I18n.t(:"#{scope}.#{message}", options)
|
109
|
+
I18n.t(:"#{scope}.#{message}", **options)
|
111
110
|
else
|
112
111
|
message.to_s
|
113
112
|
end
|
@@ -135,22 +134,29 @@ module Devise
|
|
135
134
|
|
136
135
|
def scope_url
|
137
136
|
opts = {}
|
138
|
-
route = route(scope)
|
139
|
-
opts[:format] = request_format unless skip_format?
|
140
137
|
|
141
|
-
|
138
|
+
# Initialize script_name with nil to prevent infinite loops in
|
139
|
+
# authenticated mounted engines in rails 4.2 and 5.0
|
140
|
+
opts[:script_name] = nil
|
142
141
|
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
if config.relative_url_root.present? || rails_4_2
|
147
|
-
opts[:script_name] = config.relative_url_root
|
148
|
-
end
|
149
|
-
end
|
142
|
+
route = route(scope)
|
143
|
+
|
144
|
+
opts[:format] = request_format unless skip_format?
|
150
145
|
|
151
146
|
router_name = Devise.mappings[scope].router_name || Devise.available_router_name
|
152
147
|
context = send(router_name)
|
153
148
|
|
149
|
+
if relative_url_root?
|
150
|
+
opts[:script_name] = relative_url_root
|
151
|
+
|
152
|
+
# We need to add the rootpath to `script_name` manually for applications that use a Rails
|
153
|
+
# version lower than 5.1. Otherwise, it is going to generate a wrong path for Engines
|
154
|
+
# that use Devise. Remove it when the support of Rails 5.0 is dropped.
|
155
|
+
elsif root_path_defined?(context) && !rails_51_and_up?
|
156
|
+
rootpath = context.routes.url_helpers.root_path
|
157
|
+
opts[:script_name] = rootpath.chomp('/') if rootpath.length > 1
|
158
|
+
end
|
159
|
+
|
154
160
|
if context.respond_to?(route)
|
155
161
|
context.send(route, opts)
|
156
162
|
elsif respond_to?(:root_url)
|
@@ -164,12 +170,12 @@ module Devise
|
|
164
170
|
%w(html */*).include? request_format.to_s
|
165
171
|
end
|
166
172
|
|
167
|
-
# Choose whether we should respond in
|
173
|
+
# Choose whether we should respond in an HTTP authentication fashion,
|
168
174
|
# including 401 and optional headers.
|
169
175
|
#
|
170
|
-
# This method allows the user to explicitly disable
|
171
|
-
# on
|
172
|
-
# handling the errors on their own. This is useful in case your
|
176
|
+
# This method allows the user to explicitly disable HTTP authentication
|
177
|
+
# on AJAX requests in case they want to redirect on failures instead of
|
178
|
+
# handling the errors on their own. This is useful in case your AJAX API
|
173
179
|
# is the same as your public API and uses a format like JSON (so you
|
174
180
|
# cannot mark JSON as a navigational format).
|
175
181
|
def http_auth?
|
@@ -180,7 +186,7 @@ module Devise
|
|
180
186
|
end
|
181
187
|
end
|
182
188
|
|
183
|
-
# It
|
189
|
+
# It doesn't make sense to send authenticate headers in AJAX requests
|
184
190
|
# or if the user disabled them.
|
185
191
|
def http_auth_header?
|
186
192
|
scope_class.http_authenticatable && !request.xhr?
|
@@ -206,11 +212,11 @@ module Devise
|
|
206
212
|
end
|
207
213
|
|
208
214
|
def warden
|
209
|
-
request.respond_to?(:get_header) ? request.get_header("warden") : env["warden"]
|
215
|
+
request.respond_to?(:get_header) ? request.get_header("warden") : request.env["warden"]
|
210
216
|
end
|
211
217
|
|
212
218
|
def warden_options
|
213
|
-
request.respond_to?(:get_header) ? request.get_header("warden.options") : env["warden.options"]
|
219
|
+
request.respond_to?(:get_header) ? request.get_header("warden.options") : request.env["warden.options"]
|
214
220
|
end
|
215
221
|
|
216
222
|
def warden_message
|
@@ -229,10 +235,10 @@ module Devise
|
|
229
235
|
warden_options[:attempted_path]
|
230
236
|
end
|
231
237
|
|
232
|
-
# Stores requested
|
233
|
-
# scoped session provided by warden here, since the user is not
|
234
|
-
# yet, but we still need to store the
|
235
|
-
# would never use the same
|
238
|
+
# Stores requested URI to redirect the user after signing in. We can't use
|
239
|
+
# the scoped session provided by warden here, since the user is not
|
240
|
+
# authenticated yet, but we still need to store the URI based on scope, so
|
241
|
+
# different scopes would never use the same URI to redirect.
|
236
242
|
def store_location!
|
237
243
|
store_location_for(scope, attempted_path) if request.get? && !http_auth?
|
238
244
|
end
|
@@ -244,11 +250,35 @@ module Devise
|
|
244
250
|
# Check if flash messages should be emitted. Default is to do it on
|
245
251
|
# navigational formats
|
246
252
|
def is_flashing_format?
|
247
|
-
is_navigational_format?
|
253
|
+
request.respond_to?(:flash) && is_navigational_format?
|
248
254
|
end
|
249
255
|
|
250
256
|
def request_format
|
251
257
|
@request_format ||= request.format.try(:ref)
|
252
258
|
end
|
259
|
+
|
260
|
+
def relative_url_root
|
261
|
+
@relative_url_root ||= begin
|
262
|
+
config = Rails.application.config
|
263
|
+
|
264
|
+
config.try(:relative_url_root) || config.action_controller.try(:relative_url_root)
|
265
|
+
end
|
266
|
+
end
|
267
|
+
|
268
|
+
def relative_url_root?
|
269
|
+
relative_url_root.present?
|
270
|
+
end
|
271
|
+
|
272
|
+
ActiveSupport.run_load_hooks(:devise_failure_app, self)
|
273
|
+
|
274
|
+
private
|
275
|
+
|
276
|
+
def root_path_defined?(context)
|
277
|
+
defined?(context.routes) && context.routes.url_helpers.respond_to?(:root_path)
|
278
|
+
end
|
279
|
+
|
280
|
+
def rails_51_and_up?
|
281
|
+
Rails.gem_version >= Gem::Version.new("5.1")
|
282
|
+
end
|
253
283
|
end
|
254
284
|
end
|
@@ -1,7 +1,9 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
# After each sign in, if resource responds to failed_attempts, sets it to 0
|
2
4
|
# This is only triggered when the user is explicitly set (with set_user)
|
3
5
|
Warden::Manager.after_set_user except: :fetch do |record, warden, options|
|
4
|
-
if record.respond_to?(:
|
5
|
-
record.
|
6
|
+
if record.respond_to?(:reset_failed_attempts!) && warden.authenticated?(options[:scope])
|
7
|
+
record.reset_failed_attempts!
|
6
8
|
end
|
7
9
|
end
|
data/lib/devise/hooks/proxy.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Devise
|
2
4
|
module Hooks
|
3
5
|
# A small warden proxy so we can remember, forget and
|
@@ -7,7 +9,7 @@ module Devise
|
|
7
9
|
include Devise::Controllers::SignInOut
|
8
10
|
|
9
11
|
attr_reader :warden
|
10
|
-
delegate :cookies, :
|
12
|
+
delegate :cookies, :request, to: :warden
|
11
13
|
|
12
14
|
def initialize(warden)
|
13
15
|
@warden = warden
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
# Each time a record is set we check whether its session has already timed out
|
2
4
|
# or not, based on last request time. If so, the record is logged out and
|
3
5
|
# redirected to the sign in page. Also, each time the request comes and the
|
@@ -19,8 +21,8 @@ Warden::Manager.after_set_user do |record, warden, options|
|
|
19
21
|
|
20
22
|
proxy = Devise::Hooks::Proxy.new(warden)
|
21
23
|
|
22
|
-
if
|
23
|
-
|
24
|
+
if !env['devise.skip_timeout'] &&
|
25
|
+
record.timedout?(last_request_at) &&
|
24
26
|
!proxy.remember_me_is_active?(record)
|
25
27
|
Devise.sign_out_all_scopes ? proxy.sign_out : proxy.sign_out(scope)
|
26
28
|
throw :warden, scope: scope, message: :timeout
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Devise
|
2
4
|
module Mailers
|
3
5
|
module Helpers
|
@@ -5,15 +7,16 @@ module Devise
|
|
5
7
|
|
6
8
|
included do
|
7
9
|
include Devise::Controllers::ScopedViews
|
8
|
-
attr_reader :scope_name, :resource
|
9
10
|
end
|
10
11
|
|
11
12
|
protected
|
12
13
|
|
14
|
+
attr_reader :scope_name, :resource
|
15
|
+
|
13
16
|
# Configure default email options
|
14
|
-
def devise_mail(record, action, opts={})
|
17
|
+
def devise_mail(record, action, opts = {}, &block)
|
15
18
|
initialize_from_record(record)
|
16
|
-
mail headers_for(action, opts)
|
19
|
+
mail headers_for(action, opts), &block
|
17
20
|
end
|
18
21
|
|
19
22
|
def initialize_from_record(record)
|
data/lib/devise/mapping.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Devise
|
2
4
|
# Responsible for handling devise mappings and routes configuration. Each
|
3
5
|
# resource configured by devise_for in routes is actually creating a mapping
|
@@ -44,7 +46,7 @@ module Devise
|
|
44
46
|
raise "Could not find a valid mapping for #{obj.inspect}"
|
45
47
|
end
|
46
48
|
|
47
|
-
def self.find_by_path!(path, path_type
|
49
|
+
def self.find_by_path!(path, path_type = :fullpath)
|
48
50
|
Devise.mappings.each_value { |m| return m if path.include?(m.send(path_type)) }
|
49
51
|
raise "Could not find a valid mapping for path #{path.inspect}"
|
50
52
|
end
|
data/lib/devise/models.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Devise
|
2
4
|
module Models
|
3
5
|
class MissingAttribute < StandardError
|
@@ -12,7 +14,7 @@ module Devise
|
|
12
14
|
|
13
15
|
# Creates configuration values for Devise and for the given module.
|
14
16
|
#
|
15
|
-
# Devise::Models.config(Devise::DatabaseAuthenticatable, :stretches)
|
17
|
+
# Devise::Models.config(Devise::Models::DatabaseAuthenticatable, :stretches)
|
16
18
|
#
|
17
19
|
# The line above creates:
|
18
20
|
#
|
@@ -1,6 +1,8 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require 'devise/hooks/activatable'
|
3
4
|
require 'devise/hooks/csrf_cleaner'
|
5
|
+
require 'devise/rails/deprecated_constant_accessor'
|
4
6
|
|
5
7
|
module Devise
|
6
8
|
module Models
|
@@ -54,11 +56,14 @@ module Devise
|
|
54
56
|
module Authenticatable
|
55
57
|
extend ActiveSupport::Concern
|
56
58
|
|
57
|
-
|
59
|
+
UNSAFE_ATTRIBUTES_FOR_SERIALIZATION = [:encrypted_password, :reset_password_token, :reset_password_sent_at,
|
58
60
|
:remember_created_at, :sign_in_count, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip,
|
59
61
|
:last_sign_in_ip, :password_salt, :confirmation_token, :confirmed_at, :confirmation_sent_at,
|
60
62
|
:remember_token, :unconfirmed_email, :failed_attempts, :unlock_token, :locked_at]
|
61
63
|
|
64
|
+
include Devise::DeprecatedConstantAccessor
|
65
|
+
deprecate_constant "BLACKLIST_FOR_SERIALIZATION", "Devise::Models::Authenticatable::UNSAFE_ATTRIBUTES_FOR_SERIALIZATION"
|
66
|
+
|
62
67
|
included do
|
63
68
|
class_attribute :devise_modules, instance_writer: false
|
64
69
|
self.devise_modules ||= []
|
@@ -102,18 +107,27 @@ module Devise
|
|
102
107
|
# and passing a new list of attributes you want to exempt. All attributes
|
103
108
|
# given to :except will simply add names to exempt to Devise internal list.
|
104
109
|
def serializable_hash(options = nil)
|
105
|
-
options
|
106
|
-
options[:except] = Array(options[:except])
|
110
|
+
options = options.try(:dup) || {}
|
111
|
+
options[:except] = Array(options[:except]).dup
|
107
112
|
|
108
113
|
if options[:force_except]
|
109
114
|
options[:except].concat Array(options[:force_except])
|
110
115
|
else
|
111
|
-
options[:except].concat
|
116
|
+
options[:except].concat UNSAFE_ATTRIBUTES_FOR_SERIALIZATION
|
112
117
|
end
|
113
118
|
|
114
119
|
super(options)
|
115
120
|
end
|
116
121
|
|
122
|
+
# Redefine inspect using serializable_hash, to ensure we don't accidentally
|
123
|
+
# leak passwords into exceptions.
|
124
|
+
def inspect
|
125
|
+
inspection = serializable_hash.collect do |k,v|
|
126
|
+
"#{k}: #{respond_to?(:attribute_for_inspect) ? attribute_for_inspect(k) : v.inspect}"
|
127
|
+
end
|
128
|
+
"#<#{self.class} #{inspection.join(", ")}>"
|
129
|
+
end
|
130
|
+
|
117
131
|
protected
|
118
132
|
|
119
133
|
def devise_mailer
|
@@ -123,16 +137,18 @@ module Devise
|
|
123
137
|
# This is an internal method called every time Devise needs
|
124
138
|
# to send a notification/mail. This can be overridden if you
|
125
139
|
# need to customize the e-mail delivery logic. For instance,
|
126
|
-
# if you are using a queue to deliver e-mails (
|
127
|
-
# sidekiq, resque, etc), you must add the delivery to the queue
|
140
|
+
# if you are using a queue to deliver e-mails (active job, delayed
|
141
|
+
# job, sidekiq, resque, etc), you must add the delivery to the queue
|
128
142
|
# just after the transaction was committed. To achieve this,
|
129
143
|
# you can override send_devise_notification to store the
|
130
|
-
# deliveries until the after_commit callback is triggered
|
144
|
+
# deliveries until the after_commit callback is triggered.
|
145
|
+
#
|
146
|
+
# The following example uses Active Job's `deliver_later` :
|
131
147
|
#
|
132
148
|
# class User
|
133
149
|
# devise :database_authenticatable, :confirmable
|
134
150
|
#
|
135
|
-
# after_commit :
|
151
|
+
# after_commit :send_pending_devise_notifications
|
136
152
|
#
|
137
153
|
# protected
|
138
154
|
#
|
@@ -140,27 +156,45 @@ module Devise
|
|
140
156
|
# # If the record is new or changed then delay the
|
141
157
|
# # delivery until the after_commit callback otherwise
|
142
158
|
# # send now because after_commit will not be called.
|
143
|
-
#
|
144
|
-
#
|
159
|
+
# # For Rails < 6 use `changed?` instead of `saved_changes?`.
|
160
|
+
# if new_record? || saved_changes?
|
161
|
+
# pending_devise_notifications << [notification, args]
|
145
162
|
# else
|
146
|
-
#
|
163
|
+
# render_and_send_devise_message(notification, *args)
|
147
164
|
# end
|
148
165
|
# end
|
149
166
|
#
|
150
|
-
#
|
151
|
-
#
|
152
|
-
#
|
167
|
+
# private
|
168
|
+
#
|
169
|
+
# def send_pending_devise_notifications
|
170
|
+
# pending_devise_notifications.each do |notification, args|
|
171
|
+
# render_and_send_devise_message(notification, *args)
|
153
172
|
# end
|
154
173
|
#
|
155
174
|
# # Empty the pending notifications array because the
|
156
175
|
# # after_commit hook can be called multiple times which
|
157
176
|
# # could cause multiple emails to be sent.
|
158
|
-
#
|
177
|
+
# pending_devise_notifications.clear
|
178
|
+
# end
|
179
|
+
#
|
180
|
+
# def pending_devise_notifications
|
181
|
+
# @pending_devise_notifications ||= []
|
159
182
|
# end
|
160
183
|
#
|
161
|
-
# def
|
162
|
-
#
|
184
|
+
# def render_and_send_devise_message(notification, *args)
|
185
|
+
# message = devise_mailer.send(notification, self, *args)
|
186
|
+
#
|
187
|
+
# # Deliver later with Active Job's `deliver_later`
|
188
|
+
# if message.respond_to?(:deliver_later)
|
189
|
+
# message.deliver_later
|
190
|
+
# # Remove once we move to Rails 4.2+ only, as `deliver` is deprecated.
|
191
|
+
# elsif message.respond_to?(:deliver_now)
|
192
|
+
# message.deliver_now
|
193
|
+
# else
|
194
|
+
# message.deliver
|
195
|
+
# end
|
163
196
|
# end
|
197
|
+
#
|
164
198
|
# end
|
165
199
|
#
|
166
200
|
def send_devise_notification(notification, *args)
|
@@ -235,46 +269,38 @@ module Devise
|
|
235
269
|
# end
|
236
270
|
#
|
237
271
|
# Finally, notice that Devise also queries for users in other scenarios
|
238
|
-
# besides authentication, for example when retrieving
|
272
|
+
# besides authentication, for example when retrieving a user to send
|
239
273
|
# an e-mail for password reset. In such cases, find_for_authentication
|
240
274
|
# is not called.
|
241
275
|
def find_for_authentication(tainted_conditions)
|
242
276
|
find_first_by_auth_conditions(tainted_conditions)
|
243
277
|
end
|
244
278
|
|
245
|
-
def find_first_by_auth_conditions(tainted_conditions, opts={})
|
279
|
+
def find_first_by_auth_conditions(tainted_conditions, opts = {})
|
246
280
|
to_adapter.find_first(devise_parameter_filter.filter(tainted_conditions).merge(opts))
|
247
281
|
end
|
248
282
|
|
249
283
|
# Find or initialize a record setting an error if it can't be found.
|
250
|
-
def find_or_initialize_with_error_by(attribute, value, error
|
284
|
+
def find_or_initialize_with_error_by(attribute, value, error = :invalid) #:nodoc:
|
251
285
|
find_or_initialize_with_errors([attribute], { attribute => value }, error)
|
252
286
|
end
|
253
287
|
|
254
288
|
# Find or initialize a record with group of attributes based on a list of required attributes.
|
255
|
-
def find_or_initialize_with_errors(required_attributes, attributes, error
|
256
|
-
attributes
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
end
|
261
|
-
attributes.delete_if { |key, value| value.blank? }
|
289
|
+
def find_or_initialize_with_errors(required_attributes, attributes, error = :invalid) #:nodoc:
|
290
|
+
attributes.try(:permit!)
|
291
|
+
attributes = attributes.to_h.with_indifferent_access
|
292
|
+
.slice(*required_attributes)
|
293
|
+
.delete_if { |key, value| value.blank? }
|
262
294
|
|
263
295
|
if attributes.size == required_attributes.size
|
264
|
-
record = find_first_by_auth_conditions(attributes)
|
296
|
+
record = find_first_by_auth_conditions(attributes) and return record
|
265
297
|
end
|
266
298
|
|
267
|
-
|
268
|
-
record = new
|
269
|
-
|
299
|
+
new(devise_parameter_filter.filter(attributes)).tap do |record|
|
270
300
|
required_attributes.each do |key|
|
271
|
-
|
272
|
-
record.send("#{key}=", value)
|
273
|
-
record.errors.add(key, value.present? ? error : :blank)
|
301
|
+
record.errors.add(key, attributes[key].blank? ? :blank : error)
|
274
302
|
end
|
275
303
|
end
|
276
|
-
|
277
|
-
record
|
278
304
|
end
|
279
305
|
|
280
306
|
protected
|