BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
292bca05
Commit
292bca05
authored
Sep 30, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only allow password reset emails once per minute
Addresses internal
https://dev.gitlab.org/gitlab/gitlabhq/issues/2611
parent
3a4274e1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
14 deletions
+51
-14
passwords_controller.rb
app/controllers/passwords_controller.rb
+15
-7
password_reset_spec.rb
spec/features/password_reset_spec.rb
+36
-7
No files found.
app/controllers/passwords_controller.rb
View file @
292bca05
...
...
@@ -2,18 +2,19 @@ class PasswordsController < Devise::PasswordsController
def
create
email
=
resource_params
[
:email
]
resource_found
=
resource_class
.
find_by_email
(
email
)
if
resource_found
&&
resource_found
.
ldap_user?
self
.
resource
=
resource_class
.
find_by_email
(
email
)
if
resource
&&
resource
.
ldap_user?
flash
[
:alert
]
=
"Cannot reset password for LDAP user."
respond_with
({},
location:
after_sending_reset_password_instructions_path_for
(
resource_name
))
and
return
end
self
.
resource
=
resource_class
.
send_reset_password_instructions
(
resource_params
)
if
successfully_sent?
(
resource
)
respond_with
({},
location:
after_sending_reset_password_instructions_path_for
(
resource_name
))
else
respond_with
(
resource
)
unless
can_send_reset_email?
flash
[
:alert
]
=
"Instructions about how to reset your password have already been sent recently. Please wait a few minutes to try again."
respond_with
({},
location:
new_password_path
(
resource_name
))
and
return
end
super
end
def
edit
...
...
@@ -35,4 +36,11 @@ class PasswordsController < Devise::PasswordsController
end
end
end
private
def
can_send_reset_email?
resource
&&
(
resource
.
reset_password_sent_at
.
blank?
||
resource
.
reset_password_sent_at
<
1
.
minute
.
ago
)
end
end
spec/features/password_reset_spec.rb
View file @
292bca05
require
'spec_helper'
feature
'Password reset'
,
feature:
true
do
describe
'with two-factor authentication'
do
let
(
:user
)
{
create
(
:user
,
:two_factor
)
}
describe
'throttling'
do
it
'sends reset instructions when not previously sent'
do
visit
root_path
forgot_password
(
create
(
:user
))
expect
(
page
).
to
have_content
(
I18n
.
t
(
'devise.passwords.send_instructions'
))
expect
(
current_path
).
to
eq
new_user_session_path
end
it
'sends reset instructions when previously sent more than a minute ago'
do
user
=
create
(
:user
)
user
.
send_reset_password_instructions
user
.
update_attribute
(
:reset_password_sent_at
,
5
.
minutes
.
ago
)
visit
root_path
forgot_password
(
user
)
expect
(
page
).
to
have_content
(
I18n
.
t
(
'devise.passwords.send_instructions'
))
expect
(
current_path
).
to
eq
new_user_session_path
end
it
"throttles multiple resets in a short timespan"
do
user
=
create
(
:user
)
user
.
send_reset_password_instructions
visit
root_path
forgot_password
(
user
)
expect
(
page
).
to
have_content
(
"Instructions about how to reset your password have already been sent recently. Please wait a few minutes to try again."
)
expect
(
current_path
).
to
eq
new_user_password_path
end
end
describe
'with two-factor authentication'
do
it
'requires login after password reset'
do
visit
root_path
forgot_password
forgot_password
(
create
(
:user
,
:two_factor
))
reset_password
expect
(
page
).
to
have_content
(
"Your password was changed successfully."
)
...
...
@@ -17,12 +48,10 @@ feature 'Password reset', feature: true do
end
describe
'without two-factor authentication'
do
let
(
:user
)
{
create
(
:user
)
}
it
'requires login after password reset'
do
visit
root_path
forgot_password
forgot_password
(
create
(
:user
))
reset_password
expect
(
page
).
to
have_content
(
"Your password was changed successfully."
)
...
...
@@ -30,7 +59,7 @@ feature 'Password reset', feature: true do
end
end
def
forgot_password
def
forgot_password
(
user
)
click_on
'Forgot your password?'
fill_in
'Email'
,
with:
user
.
email
click_button
'Reset password'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment