devise 3.5.1 → 4.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
- data/CHANGELOG.md +259 -1076
- data/MIT-LICENSE +1 -1
- data/README.md +256 -68
- data/app/controllers/devise/confirmations_controller.rb +3 -1
- data/app/controllers/devise/omniauth_callbacks_controller.rb +8 -6
- data/app/controllers/devise/passwords_controller.rb +10 -7
- data/app/controllers/devise/registrations_controller.rb +39 -18
- data/app/controllers/devise/sessions_controller.rb +9 -7
- data/app/controllers/devise/unlocks_controller.rb +4 -2
- data/app/controllers/devise_controller.rb +23 -10
- data/app/helpers/devise_helper.rb +12 -19
- data/app/mailers/devise/mailer.rb +10 -0
- 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/mailer/password_change.html.erb +3 -0
- data/app/views/devise/passwords/edit.html.erb +5 -5
- 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 +6 -1
- data/lib/devise/controllers/helpers.rb +35 -26
- data/lib/devise/controllers/rememberable.rb +11 -2
- data/lib/devise/controllers/scoped_views.rb +2 -0
- data/lib/devise/controllers/sign_in_out.rb +35 -18
- data/lib/devise/controllers/store_location.rb +25 -7
- data/lib/devise/controllers/url_helpers.rb +2 -0
- data/lib/devise/delegator.rb +2 -0
- data/lib/devise/encryptor.rb +6 -4
- data/lib/devise/failure_app.rb +84 -27
- 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 +6 -1
- data/lib/devise/hooks/proxy.rb +3 -1
- data/lib/devise/hooks/rememberable.rb +2 -0
- data/lib/devise/hooks/timeoutable.rb +7 -7
- data/lib/devise/hooks/trackable.rb +2 -0
- data/lib/devise/mailers/helpers.rb +7 -4
- data/lib/devise/mapping.rb +2 -0
- data/lib/devise/models/authenticatable.rb +51 -26
- data/lib/devise/models/confirmable.rb +106 -33
- data/lib/devise/models/database_authenticatable.rb +97 -21
- data/lib/devise/models/lockable.rb +15 -5
- data/lib/devise/models/omniauthable.rb +2 -0
- data/lib/devise/models/recoverable.rb +32 -24
- data/lib/devise/models/registerable.rb +4 -0
- data/lib/devise/models/rememberable.rb +42 -26
- data/lib/devise/models/timeoutable.rb +2 -6
- data/lib/devise/models/trackable.rb +15 -1
- data/lib/devise/models/validatable.rb +10 -3
- data/lib/devise/models.rb +3 -1
- data/lib/devise/modules.rb +2 -0
- data/lib/devise/omniauth/config.rb +2 -0
- data/lib/devise/omniauth/url_helpers.rb +14 -5
- data/lib/devise/omniauth.rb +2 -0
- 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 +139 -65
- data/lib/devise/rails/routes.rb +67 -47
- data/lib/devise/rails/warden_compat.rb +3 -10
- data/lib/devise/rails.rb +7 -16
- data/lib/devise/secret_key_finder.rb +27 -0
- data/lib/devise/strategies/authenticatable.rb +5 -3
- data/lib/devise/strategies/base.rb +2 -0
- data/lib/devise/strategies/database_authenticatable.rb +11 -4
- data/lib/devise/strategies/rememberable.rb +5 -6
- data/lib/devise/test/controller_helpers.rb +165 -0
- data/lib/devise/test/integration_helpers.rb +63 -0
- data/lib/devise/test_helpers.rb +7 -124
- data/lib/devise/time_inflector.rb +2 -0
- data/lib/devise/token_generator.rb +3 -41
- data/lib/devise/version.rb +3 -1
- data/lib/devise.rb +73 -46
- data/lib/generators/active_record/devise_generator.rb +29 -10
- data/lib/generators/active_record/templates/migration.rb +4 -2
- data/lib/generators/active_record/templates/migration_existing.rb +4 -2
- data/lib/generators/devise/controllers_generator.rb +3 -1
- data/lib/generators/devise/devise_generator.rb +4 -2
- data/lib/generators/devise/install_generator.rb +17 -0
- data/lib/generators/devise/orm_helpers.rb +10 -21
- data/lib/generators/devise/views_generator.rb +21 -11
- data/lib/generators/mongoid/devise_generator.rb +7 -5
- data/lib/generators/templates/README +1 -8
- data/lib/generators/templates/controllers/README +1 -1
- data/lib/generators/templates/controllers/confirmations_controller.rb +2 -0
- data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +2 -0
- data/lib/generators/templates/controllers/passwords_controller.rb +2 -0
- data/lib/generators/templates/controllers/registrations_controller.rb +6 -4
- data/lib/generators/templates/controllers/sessions_controller.rb +4 -2
- data/lib/generators/templates/controllers/unlocks_controller.rb +2 -0
- data/lib/generators/templates/devise.rb +52 -22
- data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
- data/lib/generators/templates/markerb/email_changed.markerb +7 -0
- data/lib/generators/templates/markerb/password_change.markerb +3 -0
- data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
- data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
- 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 +15 -301
- data/.gitignore +0 -10
- data/.travis.yml +0 -45
- data/.yardopts +0 -9
- data/CONTRIBUTING.md +0 -14
- data/Gemfile +0 -29
- data/Gemfile.lock +0 -191
- data/Rakefile +0 -36
- data/devise.gemspec +0 -29
- data/devise.png +0 -0
- data/gemfiles/Gemfile.rails-3.2-stable +0 -29
- data/gemfiles/Gemfile.rails-3.2-stable.lock +0 -169
- data/gemfiles/Gemfile.rails-4.0-stable +0 -29
- data/gemfiles/Gemfile.rails-4.0-stable.lock +0 -163
- data/gemfiles/Gemfile.rails-4.1-stable +0 -29
- data/gemfiles/Gemfile.rails-4.1-stable.lock +0 -169
- data/gemfiles/Gemfile.rails-4.2-stable +0 -29
- data/gemfiles/Gemfile.rails-4.2-stable.lock +0 -191
- data/script/cached-bundle +0 -49
- data/script/s3-put +0 -71
- data/test/controllers/custom_registrations_controller_test.rb +0 -40
- data/test/controllers/custom_strategy_test.rb +0 -62
- 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 -129
- data/test/controllers/load_hooks_controller_test.rb +0 -19
- data/test/controllers/passwords_controller_test.rb +0 -31
- data/test/controllers/sessions_controller_test.rb +0 -103
- 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 -298
- data/test/generators/active_record_generator_test.rb +0 -109
- 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 -13
- data/test/generators/mongoid_generator_test.rb +0 -23
- data/test/generators/views_generator_test.rb +0 -96
- data/test/helpers/devise_helper_test.rb +0 -49
- data/test/integration/authenticatable_test.rb +0 -729
- 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 -105
- data/test/integration/lockable_test.rb +0 -239
- data/test/integration/omniauthable_test.rb +0 -133
- data/test/integration/recoverable_test.rb +0 -347
- data/test/integration/registerable_test.rb +0 -359
- data/test/integration/rememberable_test.rb +0 -176
- data/test/integration/timeoutable_test.rb +0 -189
- 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 -468
- data/test/models/database_authenticatable_test.rb +0 -249
- data/test/models/lockable_test.rb +0 -328
- data/test/models/omniauthable_test.rb +0 -7
- data/test/models/recoverable_test.rb +0 -228
- data/test/models/registerable_test.rb +0 -7
- data/test/models/rememberable_test.rb +0 -204
- 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 -127
- data/test/models_test.rb +0 -144
- data/test/omniauth/config_test.rb +0 -57
- data/test/omniauth/url_helpers_test.rb +0 -54
- data/test/orm/active_record.rb +0 -10
- data/test/orm/mongoid.rb +0 -13
- data/test/parameter_sanitizer_test.rb +0 -81
- 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 -6
- 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/controllers/admins/sessions_controller.rb +0 -6
- data/test/rails_app/app/controllers/admins_controller.rb +0 -11
- data/test/rails_app/app/controllers/application_controller.rb +0 -12
- 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 -25
- 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/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/application.rb +0 -40
- 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 -41
- 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 -8
- data/test/rails_app/config/initializers/session_store.rb +0 -1
- data/test/rails_app/config/routes.rb +0 -122
- data/test/rails_app/config.ru +0 -4
- 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 -29
- 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 -264
- data/test/support/action_controller/record_identifier.rb +0 -10
- data/test/support/assertions.rb +0 -39
- data/test/support/helpers.rb +0 -73
- 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 -24
- 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
|
# Those helpers are convenience methods added to ApplicationController.
|
@@ -7,7 +9,9 @@ module Devise
|
|
7
9
|
include Devise::Controllers::StoreLocation
|
8
10
|
|
9
11
|
included do
|
10
|
-
|
12
|
+
if respond_to?(:helper_method)
|
13
|
+
helper_method :warden, :signed_in?, :devise_controller?
|
14
|
+
end
|
11
15
|
end
|
12
16
|
|
13
17
|
module ClassMethods
|
@@ -28,8 +32,8 @@ module Devise
|
|
28
32
|
# current_bloggers # Currently signed in user and admin
|
29
33
|
#
|
30
34
|
# Use:
|
31
|
-
#
|
32
|
-
#
|
35
|
+
# before_action :authenticate_blogger! # Redirects unless either a user or an admin are authenticated
|
36
|
+
# before_action ->{ authenticate_blogger! :admin } # Redirects to the admin login page
|
33
37
|
# current_blogger :user # Preferably returns a User if one is signed in
|
34
38
|
#
|
35
39
|
def devise_group(group_name, opts={})
|
@@ -69,7 +73,9 @@ module Devise
|
|
69
73
|
end.compact
|
70
74
|
end
|
71
75
|
|
72
|
-
|
76
|
+
if respond_to?(:helper_method)
|
77
|
+
helper_method "current_#{group_name}", "current_#{group_name.to_s.pluralize}", "#{group_name}_signed_in?"
|
78
|
+
end
|
73
79
|
METHODS
|
74
80
|
end
|
75
81
|
|
@@ -80,7 +86,7 @@ module Devise
|
|
80
86
|
end
|
81
87
|
|
82
88
|
# Define authentication filters and accessor helpers based on mappings.
|
83
|
-
# These filters should be used inside the controllers as
|
89
|
+
# These filters should be used inside the controllers as before_actions,
|
84
90
|
# so you can control the scope of the user who should be signed in to
|
85
91
|
# access that specific controller/action.
|
86
92
|
# Example:
|
@@ -100,8 +106,8 @@ module Devise
|
|
100
106
|
# admin_session # Session data available only to the admin scope
|
101
107
|
#
|
102
108
|
# Use:
|
103
|
-
#
|
104
|
-
#
|
109
|
+
# before_action :authenticate_user! # Tell devise to use :user map
|
110
|
+
# before_action :authenticate_admin! # Tell devise to use :admin map
|
105
111
|
#
|
106
112
|
def self.define_helpers(mapping) #:nodoc:
|
107
113
|
mapping = mapping.name
|
@@ -126,33 +132,31 @@ module Devise
|
|
126
132
|
METHODS
|
127
133
|
|
128
134
|
ActiveSupport.on_load(:action_controller) do
|
129
|
-
|
135
|
+
if respond_to?(:helper_method)
|
136
|
+
helper_method "current_#{mapping}", "#{mapping}_signed_in?", "#{mapping}_session"
|
137
|
+
end
|
130
138
|
end
|
131
139
|
end
|
132
140
|
|
133
141
|
# The main accessor for the warden proxy instance
|
134
142
|
def warden
|
135
|
-
request.env['warden']
|
143
|
+
request.env['warden'] or raise MissingWarden
|
136
144
|
end
|
137
145
|
|
138
146
|
# Return true if it's a devise_controller. false to all controllers unless
|
139
147
|
# the controllers defined inside devise. Useful if you want to apply a before
|
140
148
|
# filter to all controllers, except the ones in devise:
|
141
149
|
#
|
142
|
-
#
|
150
|
+
# before_action :my_filter, unless: :devise_controller?
|
143
151
|
def devise_controller?
|
144
152
|
is_a?(::DeviseController)
|
145
153
|
end
|
146
154
|
|
147
|
-
#
|
155
|
+
# Set up a param sanitizer to filter parameters using strong_parameters. See
|
148
156
|
# lib/devise/parameter_sanitizer.rb for more info. Override this
|
149
157
|
# method in your application controller to use your own parameter sanitizer.
|
150
158
|
def devise_parameter_sanitizer
|
151
|
-
@devise_parameter_sanitizer ||=
|
152
|
-
Devise::ParameterSanitizer.new(resource_class, resource_name, params)
|
153
|
-
else
|
154
|
-
Devise::BaseSanitizer.new(resource_class, resource_name, params)
|
155
|
-
end
|
159
|
+
@devise_parameter_sanitizer ||= Devise::ParameterSanitizer.new(resource_class, resource_name, params)
|
156
160
|
end
|
157
161
|
|
158
162
|
# Tell warden that params authentication is allowed for that specific page.
|
@@ -190,10 +194,10 @@ module Devise
|
|
190
194
|
# root path. For a user scope, you can define the default url in
|
191
195
|
# the following way:
|
192
196
|
#
|
193
|
-
#
|
197
|
+
# get '/users' => 'users#index', as: :user_root # creates user_root_path
|
194
198
|
#
|
195
|
-
#
|
196
|
-
#
|
199
|
+
# namespace :user do
|
200
|
+
# root 'users#index' # creates user_root_path
|
197
201
|
# end
|
198
202
|
#
|
199
203
|
# If the resource root path is not defined, root_path is used. However,
|
@@ -264,21 +268,26 @@ module Devise
|
|
264
268
|
# Check if flash messages should be emitted. Default is to do it on
|
265
269
|
# navigational formats
|
266
270
|
def is_flashing_format?
|
267
|
-
is_navigational_format?
|
271
|
+
request.respond_to?(:flash) && is_navigational_format?
|
268
272
|
end
|
269
273
|
|
270
274
|
private
|
271
275
|
|
272
|
-
def expire_session_data_after_sign_in!
|
273
|
-
ActiveSupport::Deprecation.warn "expire_session_data_after_sign_in! is deprecated " \
|
274
|
-
"in favor of expire_data_after_sign_in!"
|
275
|
-
expire_data_after_sign_in!
|
276
|
-
end
|
277
|
-
|
278
276
|
def expire_data_after_sign_out!
|
279
277
|
Devise.mappings.each { |_,m| instance_variable_set("@current_#{m.name}", nil) }
|
280
278
|
super
|
281
279
|
end
|
282
280
|
end
|
283
281
|
end
|
282
|
+
|
283
|
+
class MissingWarden < StandardError
|
284
|
+
def initialize
|
285
|
+
super "Devise could not find the `Warden::Proxy` instance on your request environment.\n" + \
|
286
|
+
"Make sure that your application is loading Devise and Warden as expected and that " + \
|
287
|
+
"the `Warden::Manager` middleware is present in your middleware stack.\n" + \
|
288
|
+
"If you are seeing this on one of your tests, ensure that your tests are either " + \
|
289
|
+
"executing the Rails middleware stack or that your tests are using the `Devise::Test::ControllerHelpers` " + \
|
290
|
+
"module to inject the `request.env['warden']` object for you."
|
291
|
+
end
|
292
|
+
end
|
284
293
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Devise
|
2
4
|
module Controllers
|
3
5
|
# A module that may be optionally included in a controller in order
|
@@ -9,11 +11,18 @@ module Devise
|
|
9
11
|
Rails.configuration.session_options.slice(:path, :domain, :secure)
|
10
12
|
end
|
11
13
|
|
14
|
+
def remember_me_is_active?(resource)
|
15
|
+
return false unless resource.respond_to?(:remember_me)
|
16
|
+
scope = Devise::Mapping.find_scope!(resource)
|
17
|
+
_, token, generated_at = cookies.signed[remember_key(resource, scope)]
|
18
|
+
resource.remember_me?(token, generated_at)
|
19
|
+
end
|
20
|
+
|
12
21
|
# Remembers the given resource by setting up a cookie
|
13
22
|
def remember_me(resource)
|
14
|
-
return if env["devise.skip_storage"]
|
23
|
+
return if request.env["devise.skip_storage"]
|
15
24
|
scope = Devise::Mapping.find_scope!(resource)
|
16
|
-
resource.remember_me!
|
25
|
+
resource.remember_me!
|
17
26
|
cookies.signed[remember_key(resource, scope)] = remember_cookie_values(resource)
|
18
27
|
end
|
19
28
|
|
@@ -1,10 +1,15 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Devise
|
2
4
|
module Controllers
|
3
5
|
# Provide sign in and sign out functionality.
|
4
6
|
# Included by default in all controllers.
|
5
7
|
module SignInOut
|
6
8
|
# Return true if the given scope is signed in session. If no scope given, return
|
7
|
-
# true if any scope is signed in.
|
9
|
+
# true if any scope is signed in. This will run authentication hooks, which may
|
10
|
+
# cause exceptions to be thrown from this method; if you simply want to check
|
11
|
+
# if a scope has already previously been authenticated without running
|
12
|
+
# authentication hooks, you can directly call `warden.authenticated?(scope: scope)`
|
8
13
|
def signed_in?(scope=nil)
|
9
14
|
[scope || Devise.mappings.keys].flatten.any? do |_scope|
|
10
15
|
warden.authenticate?(scope: _scope)
|
@@ -12,20 +17,18 @@ module Devise
|
|
12
17
|
end
|
13
18
|
|
14
19
|
# Sign in a user that already was authenticated. This helper is useful for logging
|
15
|
-
# users in after sign up.
|
16
|
-
#
|
17
|
-
#
|
18
|
-
#
|
19
|
-
#
|
20
|
-
# signed in, but we want to refresh the credentials in session.
|
20
|
+
# users in after sign up. All options given to sign_in is passed forward
|
21
|
+
# to the set_user method in warden.
|
22
|
+
# If you are using a custom warden strategy and the timeoutable module, you have to
|
23
|
+
# set `env["devise.skip_timeout"] = true` in the request to use this method, like we do
|
24
|
+
# in the sessions controller: https://github.com/plataformatec/devise/blob/master/app/controllers/devise/sessions_controller.rb#L7
|
21
25
|
#
|
22
26
|
# Examples:
|
23
27
|
#
|
24
28
|
# sign_in :user, @user # sign_in(scope, resource)
|
25
29
|
# sign_in @user # sign_in(resource)
|
26
|
-
# sign_in @user, event: :authentication
|
27
|
-
# sign_in @user, store: false
|
28
|
-
# sign_in @user, bypass: true # sign_in(resource, options)
|
30
|
+
# sign_in @user, event: :authentication # sign_in(resource, options)
|
31
|
+
# sign_in @user, store: false # sign_in(resource, options)
|
29
32
|
#
|
30
33
|
def sign_in(resource_or_scope, *args)
|
31
34
|
options = args.extract_options!
|
@@ -35,6 +38,13 @@ module Devise
|
|
35
38
|
expire_data_after_sign_in!
|
36
39
|
|
37
40
|
if options[:bypass]
|
41
|
+
ActiveSupport::Deprecation.warn(<<-DEPRECATION.strip_heredoc, caller)
|
42
|
+
[Devise] bypass option is deprecated and it will be removed in future version of Devise.
|
43
|
+
Please use bypass_sign_in method instead.
|
44
|
+
Example:
|
45
|
+
|
46
|
+
bypass_sign_in(user)
|
47
|
+
DEPRECATION
|
38
48
|
warden.session_serializer.store(resource, scope)
|
39
49
|
elsif warden.user(scope) == resource && !options.delete(:force)
|
40
50
|
# Do nothing. User already signed in and we are not forcing it.
|
@@ -44,6 +54,20 @@ module Devise
|
|
44
54
|
end
|
45
55
|
end
|
46
56
|
|
57
|
+
# Sign in a user bypassing the warden callbacks and stores the user
|
58
|
+
# straight in session. This option is useful in cases the user is already
|
59
|
+
# signed in, but we want to refresh the credentials in session.
|
60
|
+
#
|
61
|
+
# Examples:
|
62
|
+
#
|
63
|
+
# bypass_sign_in @user, scope: :user
|
64
|
+
# bypass_sign_in @user
|
65
|
+
def bypass_sign_in(resource, scope: nil)
|
66
|
+
scope ||= Devise::Mapping.find_scope!(resource)
|
67
|
+
expire_data_after_sign_in!
|
68
|
+
warden.session_serializer.store(resource, scope)
|
69
|
+
end
|
70
|
+
|
47
71
|
# Sign out a given user or scope. This helper is useful for signing out a user
|
48
72
|
# after deleting accounts. Returns true if there was a logout and false if there
|
49
73
|
# is no user logged in on the referred scope
|
@@ -58,7 +82,6 @@ module Devise
|
|
58
82
|
scope = Devise::Mapping.find_scope!(resource_or_scope)
|
59
83
|
user = warden.user(scope: scope, run_callbacks: false) # If there is no user
|
60
84
|
|
61
|
-
warden.raw_session.inspect # Without this inspect here. The session does not clear.
|
62
85
|
warden.logout(scope)
|
63
86
|
warden.clear_strategies_cache!(scope: scope)
|
64
87
|
instance_variable_set(:"@current_#{scope}", nil)
|
@@ -90,13 +113,7 @@ module Devise
|
|
90
113
|
session.keys.grep(/^devise\./).each { |k| session.delete(k) }
|
91
114
|
end
|
92
115
|
|
93
|
-
|
94
|
-
# session.keys will return an empty array if the session is not yet loaded.
|
95
|
-
# This is a bug in both Rack and Rails.
|
96
|
-
# A call to #empty? forces the session to be loaded.
|
97
|
-
session.empty?
|
98
|
-
session.keys.grep(/^devise\./).each { |k| session.delete(k) }
|
99
|
-
end
|
116
|
+
alias :expire_data_after_sign_out! :expire_data_after_sign_in!
|
100
117
|
end
|
101
118
|
end
|
102
119
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "uri"
|
2
4
|
|
3
5
|
module Devise
|
@@ -29,16 +31,13 @@ module Devise
|
|
29
31
|
# Example:
|
30
32
|
#
|
31
33
|
# store_location_for(:user, dashboard_path)
|
32
|
-
# redirect_to
|
34
|
+
# redirect_to user_facebook_omniauth_authorize_path
|
33
35
|
#
|
34
36
|
def store_location_for(resource_or_scope, location)
|
35
37
|
session_key = stored_location_key_for(resource_or_scope)
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
path = [path, uri.fragment].compact.join('#')
|
40
|
-
session[session_key] = path
|
41
|
-
end
|
38
|
+
|
39
|
+
path = extract_path_from_location(location)
|
40
|
+
session[session_key] = path if path
|
42
41
|
end
|
43
42
|
|
44
43
|
private
|
@@ -53,6 +52,25 @@ module Devise
|
|
53
52
|
scope = Devise::Mapping.find_scope!(resource_or_scope)
|
54
53
|
"#{scope}_return_to"
|
55
54
|
end
|
55
|
+
|
56
|
+
def extract_path_from_location(location)
|
57
|
+
uri = parse_uri(location)
|
58
|
+
|
59
|
+
if uri
|
60
|
+
path = remove_domain_from_uri(uri)
|
61
|
+
path = add_fragment_back_to_path(uri, path)
|
62
|
+
|
63
|
+
path
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
67
|
+
def remove_domain_from_uri(uri)
|
68
|
+
[uri.path.sub(/\A\/+/, '/'), uri.query].compact.join('?')
|
69
|
+
end
|
70
|
+
|
71
|
+
def add_fragment_back_to_path(uri, path)
|
72
|
+
[path, uri.fragment].compact.join('#')
|
73
|
+
end
|
56
74
|
end
|
57
75
|
end
|
58
76
|
end
|
data/lib/devise/delegator.rb
CHANGED
data/lib/devise/encryptor.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'bcrypt'
|
2
4
|
|
3
5
|
module Devise
|
@@ -9,14 +11,14 @@ module Devise
|
|
9
11
|
::BCrypt::Password.create(password, cost: klass.stretches).to_s
|
10
12
|
end
|
11
13
|
|
12
|
-
def self.compare(klass,
|
13
|
-
return false if
|
14
|
-
bcrypt = ::BCrypt::Password.new(
|
14
|
+
def self.compare(klass, hashed_password, password)
|
15
|
+
return false if hashed_password.blank?
|
16
|
+
bcrypt = ::BCrypt::Password.new(hashed_password)
|
15
17
|
if klass.pepper.present?
|
16
18
|
password = "#{password}#{klass.pepper}"
|
17
19
|
end
|
18
20
|
password = ::BCrypt::Engine.hash_secret(password, bcrypt.salt)
|
19
|
-
Devise.secure_compare(password,
|
21
|
+
Devise.secure_compare(password, hashed_password)
|
20
22
|
end
|
21
23
|
end
|
22
24
|
end
|
data/lib/devise/failure_app.rb
CHANGED
@@ -1,12 +1,13 @@
|
|
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
|
-
include ActionController::RackDelegation
|
10
11
|
include ActionController::UrlFor
|
11
12
|
include ActionController::Redirecting
|
12
13
|
|
@@ -22,9 +23,12 @@ module Devise
|
|
22
23
|
@respond.call(env)
|
23
24
|
end
|
24
25
|
|
26
|
+
# Try retrieving the URL options from the parent controller (usually
|
27
|
+
# ApplicationController). Instance methods are not supported at the moment,
|
28
|
+
# so only the class-level attribute is used.
|
25
29
|
def self.default_url_options(*args)
|
26
|
-
if defined?(
|
27
|
-
|
30
|
+
if defined?(Devise.parent_controller.constantize)
|
31
|
+
Devise.parent_controller.constantize.try(:default_url_options) || {}
|
28
32
|
else
|
29
33
|
{}
|
30
34
|
end
|
@@ -48,9 +52,27 @@ module Devise
|
|
48
52
|
end
|
49
53
|
|
50
54
|
def recall
|
51
|
-
|
55
|
+
header_info = if relative_url_root?
|
56
|
+
base_path = Pathname.new(relative_url_root)
|
57
|
+
full_path = Pathname.new(attempted_path)
|
58
|
+
|
59
|
+
{ "SCRIPT_NAME" => relative_url_root,
|
60
|
+
"PATH_INFO" => '/' + full_path.relative_path_from(base_path).to_s }
|
61
|
+
else
|
62
|
+
{ "PATH_INFO" => attempted_path }
|
63
|
+
end
|
64
|
+
|
65
|
+
header_info.each do | var, value|
|
66
|
+
if request.respond_to?(:set_header)
|
67
|
+
request.set_header(var, value)
|
68
|
+
else
|
69
|
+
request.env[var] = value
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
52
73
|
flash.now[:alert] = i18n_message(:invalid) if is_flashing_format?
|
53
|
-
self.response = recall_app(warden_options[:recall]).call(env)
|
74
|
+
# self.response = recall_app(warden_options[:recall]).call(env)
|
75
|
+
self.response = recall_app(warden_options[:recall]).call(request.env)
|
54
76
|
end
|
55
77
|
|
56
78
|
def redirect
|
@@ -81,7 +103,7 @@ module Devise
|
|
81
103
|
options[:scope] = "devise.failure"
|
82
104
|
options[:default] = [message]
|
83
105
|
auth_keys = scope_class.authentication_keys
|
84
|
-
keys = auth_keys.respond_to?(:keys) ? auth_keys.keys : auth_keys
|
106
|
+
keys = (auth_keys.respond_to?(:keys) ? auth_keys.keys : auth_keys).map { |key| scope_class.human_attribute_name(key) }
|
85
107
|
options[:authentication_keys] = keys.join(I18n.translate(:"support.array.words_connector"))
|
86
108
|
options = i18n_options(options)
|
87
109
|
|
@@ -113,18 +135,29 @@ module Devise
|
|
113
135
|
|
114
136
|
def scope_url
|
115
137
|
opts = {}
|
116
|
-
route = route(scope)
|
117
|
-
opts[:format] = request_format unless skip_format?
|
118
138
|
|
119
|
-
|
139
|
+
# Initialize script_name with nil to prevent infinite loops in
|
140
|
+
# authenticated mounted engines in rails 4.2 and 5.0
|
141
|
+
opts[:script_name] = nil
|
120
142
|
|
121
|
-
|
122
|
-
|
123
|
-
|
143
|
+
route = route(scope)
|
144
|
+
|
145
|
+
opts[:format] = request_format unless skip_format?
|
124
146
|
|
125
147
|
router_name = Devise.mappings[scope].router_name || Devise.available_router_name
|
126
148
|
context = send(router_name)
|
127
149
|
|
150
|
+
if relative_url_root?
|
151
|
+
opts[:script_name] = relative_url_root
|
152
|
+
|
153
|
+
# We need to add the rootpath to `script_name` manually for applications that use a Rails
|
154
|
+
# version lower than 5.1. Otherwise, it is going to generate a wrong path for Engines
|
155
|
+
# that use Devise. Remove it when the support of Rails 5.0 is droped.
|
156
|
+
elsif root_path_defined?(context) && !rails_51_and_up?
|
157
|
+
rootpath = context.routes.url_helpers.root_path
|
158
|
+
opts[:script_name] = rootpath.chomp('/') if rootpath.length > 1
|
159
|
+
end
|
160
|
+
|
128
161
|
if context.respond_to?(route)
|
129
162
|
context.send(route, opts)
|
130
163
|
elsif respond_to?(:root_url)
|
@@ -138,12 +171,12 @@ module Devise
|
|
138
171
|
%w(html */*).include? request_format.to_s
|
139
172
|
end
|
140
173
|
|
141
|
-
# Choose whether we should respond in
|
174
|
+
# Choose whether we should respond in an HTTP authentication fashion,
|
142
175
|
# including 401 and optional headers.
|
143
176
|
#
|
144
|
-
# This method allows the user to explicitly disable
|
145
|
-
# on
|
146
|
-
# handling the errors on their own. This is useful in case your
|
177
|
+
# This method allows the user to explicitly disable HTTP authentication
|
178
|
+
# on AJAX requests in case they want to redirect on failures instead of
|
179
|
+
# handling the errors on their own. This is useful in case your AJAX API
|
147
180
|
# is the same as your public API and uses a format like JSON (so you
|
148
181
|
# cannot mark JSON as a navigational format).
|
149
182
|
def http_auth?
|
@@ -154,7 +187,7 @@ module Devise
|
|
154
187
|
end
|
155
188
|
end
|
156
189
|
|
157
|
-
# It
|
190
|
+
# It doesn't make sense to send authenticate headers in AJAX requests
|
158
191
|
# or if the user disabled them.
|
159
192
|
def http_auth_header?
|
160
193
|
scope_class.http_authenticatable && !request.xhr?
|
@@ -180,11 +213,11 @@ module Devise
|
|
180
213
|
end
|
181
214
|
|
182
215
|
def warden
|
183
|
-
env[
|
216
|
+
request.respond_to?(:get_header) ? request.get_header("warden") : request.env["warden"]
|
184
217
|
end
|
185
218
|
|
186
219
|
def warden_options
|
187
|
-
env[
|
220
|
+
request.respond_to?(:get_header) ? request.get_header("warden.options") : request.env["warden.options"]
|
188
221
|
end
|
189
222
|
|
190
223
|
def warden_message
|
@@ -203,10 +236,10 @@ module Devise
|
|
203
236
|
warden_options[:attempted_path]
|
204
237
|
end
|
205
238
|
|
206
|
-
# Stores requested
|
207
|
-
# scoped session provided by warden here, since the user is not
|
208
|
-
# yet, but we still need to store the
|
209
|
-
# would never use the same
|
239
|
+
# Stores requested URI to redirect the user after signing in. We can't use
|
240
|
+
# the scoped session provided by warden here, since the user is not
|
241
|
+
# authenticated yet, but we still need to store the URI based on scope, so
|
242
|
+
# different scopes would never use the same URI to redirect.
|
210
243
|
def store_location!
|
211
244
|
store_location_for(scope, attempted_path) if request.get? && !http_auth?
|
212
245
|
end
|
@@ -218,11 +251,35 @@ module Devise
|
|
218
251
|
# Check if flash messages should be emitted. Default is to do it on
|
219
252
|
# navigational formats
|
220
253
|
def is_flashing_format?
|
221
|
-
is_navigational_format?
|
254
|
+
request.respond_to?(:flash) && is_navigational_format?
|
222
255
|
end
|
223
256
|
|
224
257
|
def request_format
|
225
258
|
@request_format ||= request.format.try(:ref)
|
226
259
|
end
|
260
|
+
|
261
|
+
def relative_url_root
|
262
|
+
@relative_url_root ||= begin
|
263
|
+
config = Rails.application.config
|
264
|
+
|
265
|
+
config.try(:relative_url_root) || config.action_controller.try(:relative_url_root)
|
266
|
+
end
|
267
|
+
end
|
268
|
+
|
269
|
+
def relative_url_root?
|
270
|
+
relative_url_root.present?
|
271
|
+
end
|
272
|
+
|
273
|
+
ActiveSupport.run_load_hooks(:devise_failure_app, self)
|
274
|
+
|
275
|
+
private
|
276
|
+
|
277
|
+
def root_path_defined?(context)
|
278
|
+
defined?(context.routes) && context.routes.url_helpers.respond_to?(:root_path)
|
279
|
+
end
|
280
|
+
|
281
|
+
def rails_51_and_up?
|
282
|
+
Rails.gem_version >= Gem::Version.new("5.1")
|
283
|
+
end
|
227
284
|
end
|
228
285
|
end
|
@@ -1,7 +1,12 @@
|
|
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
6
|
if record.respond_to?(:failed_attempts) && warden.authenticated?(options[:scope])
|
5
|
-
|
7
|
+
unless record.failed_attempts.to_i.zero?
|
8
|
+
record.failed_attempts = 0
|
9
|
+
record.save(validate: false)
|
10
|
+
end
|
6
11
|
end
|
7
12
|
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
|
@@ -7,7 +9,8 @@ Warden::Manager.after_set_user do |record, warden, options|
|
|
7
9
|
scope = options[:scope]
|
8
10
|
env = warden.request.env
|
9
11
|
|
10
|
-
if record && record.respond_to?(:timedout?) && warden.authenticated?(scope) &&
|
12
|
+
if record && record.respond_to?(:timedout?) && warden.authenticated?(scope) &&
|
13
|
+
options[:store] != false && !env['devise.skip_timeoutable']
|
11
14
|
last_request_at = warden.session(scope)['last_request_at']
|
12
15
|
|
13
16
|
if last_request_at.is_a? Integer
|
@@ -18,13 +21,10 @@ Warden::Manager.after_set_user do |record, warden, options|
|
|
18
21
|
|
19
22
|
proxy = Devise::Hooks::Proxy.new(warden)
|
20
23
|
|
21
|
-
if record.timedout?(last_request_at) &&
|
24
|
+
if record.timedout?(last_request_at) &&
|
25
|
+
!env['devise.skip_timeout'] &&
|
26
|
+
!proxy.remember_me_is_active?(record)
|
22
27
|
Devise.sign_out_all_scopes ? proxy.sign_out : proxy.sign_out(scope)
|
23
|
-
|
24
|
-
if record.respond_to?(:expire_auth_token_on_timeout) && record.expire_auth_token_on_timeout
|
25
|
-
record.reset_authentication_token!
|
26
|
-
end
|
27
|
-
|
28
28
|
throw :warden, scope: scope, message: :timeout
|
29
29
|
end
|
30
30
|
|