github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 15:21:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: change password form validation should instruct admins to use min password length for admin accounts

Browse Source
This commit is contained in:
Neil Lalonde
2017-11-07 16:14:47 -05:00
parent 3f2105db85
commit d7880af0bb
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/controllers/password-reset.js.es6
View File

@ -7,6 +7,7 @@ import { userPath } from 'discourse/lib/url';
export default Ember.Controller.extend(PasswordValidation, { export default Ember.Controller.extend(PasswordValidation, {
isDeveloper: Ember.computed.alias('model.is_developer'), isDeveloper: Ember.computed.alias('model.is_developer'),
admin: Ember.computed.alias('model.admin'),
passwordRequired: true, passwordRequired: true,
errorMessage: null, errorMessage: null,
successMessage: null, successMessage: null,

13
app/assets/javascripts/discourse/mixins/password-validation.js.es6
View File

@ -16,13 +16,13 @@ export default Ember.Mixin.create({
return I18n.t('user.password.instructions', {count: this.get('passwordMinLength')}); return I18n.t('user.password.instructions', {count: this.get('passwordMinLength')});
}, },
@computed('isDeveloper') @computed('isDeveloper', 'admin')
passwordMinLength() { passwordMinLength(isDeveloper, admin) {
return this.get('isDeveloper') ? this.siteSettings.min_admin_password_length : this.siteSettings.min_password_length; return (isDeveloper || admin) ? this.siteSettings.min_admin_password_length : this.siteSettings.min_password_length;
}, },
@computed('accountPassword', 'passwordRequired', 'rejectedPasswords.[]', 'accountUsername', 'accountEmail', 'isDeveloper') @computed('accountPassword', 'passwordRequired', 'rejectedPasswords.[]', 'accountUsername', 'accountEmail', 'passwordMinLength')
passwordValidation(password, passwordRequired, rejectedPasswords, accountUsername, accountEmail, isDeveloper) { passwordValidation(password, passwordRequired, rejectedPasswords, accountUsername, accountEmail, passwordMinLength) {
if (!passwordRequired) { if (!passwordRequired) {
return InputValidation.create({ ok: true }); return InputValidation.create({ ok: true });
} }
@ -40,8 +40,7 @@ export default Ember.Mixin.create({
} }
// If too short // If too short
const passwordLength = isDeveloper ? this.siteSettings.min_admin_password_length : this.siteSettings.min_password_length; if (password.length < passwordMinLength) {
if (password.length < passwordLength) {
return InputValidation.create({ return InputValidation.create({
failed: true, failed: true,
reason: I18n.t('user.password.too_short') reason: I18n.t('user.password.too_short')

10
app/controllers/users_controller.rb
View File

@ -465,7 +465,10 @@ class UsersController < ApplicationController
if @error if @error
render layout: 'no_ember' render layout: 'no_ember'
else else
store_preloaded("password_reset", MultiJson.dump(is_developer: UsernameCheckerService.is_developer?(@user.email))) store_preloaded(
"password_reset",
MultiJson.dump(is_developer: UsernameCheckerService.is_developer?(@user.email), admin: @user.admin?)
)
end end
return redirect_to(wizard_path) if request.put? && Wizard.user_requires_completion?(@user) return redirect_to(wizard_path) if request.put? && Wizard.user_requires_completion?(@user)
end end
@ -477,7 +480,8 @@ class UsersController < ApplicationController
success: false, success: false,
message: @error, message: @error,
errors: @user&.errors.to_hash, errors: @user&.errors.to_hash,
is_developer: UsernameCheckerService.is_developer?(@user.email) is_developer: UsernameCheckerService.is_developer?(@user.email),
admin: @user.admin?
} }
else else
render json: { render json: {
@ -488,7 +492,7 @@ class UsersController < ApplicationController
} }
end end
else else
render json: { is_developer: UsernameCheckerService.is_developer?(@user.email) } render json: { is_developer: UsernameCheckerService.is_developer?(@user.email), admin: @user.admin? }
end end
end end
end end

2
spec/controllers/users_controller_spec.rb
View File

@ -342,7 +342,7 @@ describe UsersController do
) )
expect(response).to be_success expect(response).to be_success
expect(response.body).to include('{"is_developer":false}') expect(response.body).to include('{"is_developer":false,"admin":false}')
user.reload user.reload