github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:34:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Block enabling force 2FA if local logins disabled & vice-versa (#8355)

Browse Source
This commit is contained in:
Martin Brennan
2019-11-15 16:05:10 +10:00
committed by Sam
parent e7cf4579a8
commit 5c59247c3a
3 changed files with 70 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/site_settings/validations.rb
View File

@ -143,6 +143,17 @@ module SiteSettings::Validations
validate_bucket_setting("s3_backup_bucket", SiteSetting.s3_upload_bucket, new_val)
end
def validate_enforce_second_factor(new_val)
return if SiteSetting.enable_local_logins
validate_error :second_factor_cannot_be_enforced_with_disabled_local_login
end
def validate_enable_local_logins(new_val)
return if new_val == "t"
return if SiteSetting.enforce_second_factor == "no"
validate_error :local_login_cannot_be_disabled_if_second_factor_enforced
end
private
def validate_bucket_setting(setting_name, upload_bucket, backup_bucket)