diff options
| author | Małgorzata Ksionek <mksionek@gitlab.com> | 2019-07-18 10:27:02 +0200 |
|---|---|---|
| committer | Małgorzata Ksionek <mksionek@gitlab.com> | 2019-07-31 11:47:55 +0200 |
| commit | dfcf4cf5f1e87a29f0d9fcc5ff2bba47258893bb (patch) | |
| tree | 9343675b9a675bc87236e2b65f4b9d2af18762c2 /lib/api/settings.rb | |
| parent | d93da8888bd54531e5f5df2047902ae90635b8d0 (diff) | |
| download | gitlab-ce-dfcf4cf5f1e87a29f0d9fcc5ff2bba47258893bb.tar.gz | |
Add captcha if there are multiple failed login attempts
Add method to store session ids by ip
Add new specs for storing session ids
Add cleaning up records after login
Add retrieving anonymous sessions
Add login recaptcha setting
Add new setting to sessions controller
Add conditions for showing captcha
Add sessions controller specs
Add admin settings specs for login protection
Add new settings to api
Add stub to devise spec
Add new translation key
Add cr remarks
Rename class call
Add cr remarks
Change if-clause for consistency
Add cr remarks
Add code review remarks
Refactor AnonymousSession class
Add changelog entry
Move AnonymousSession class to lib
Move store unauthenticated sessions to sessions controller
Move link to recaptcha info
Regenerate text file
Improve copy on the spam page
Change action filter for storing anonymous sessions
Fix rubocop offences
Add code review remarks
Diffstat (limited to 'lib/api/settings.rb')
| -rw-r--r-- | lib/api/settings.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index aa9e879160d..5ac6f5bf61a 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -104,6 +104,11 @@ module API requires :recaptcha_site_key, type: String, desc: 'Generate site key at http://www.google.com/recaptcha' requires :recaptcha_private_key, type: String, desc: 'Generate private key at http://www.google.com/recaptcha' end + optional :login_recaptcha_protection_enabled, type: Boolean, desc: 'Helps prevent brute-force attacks' + given login_recaptcha_protection_enabled: ->(val) { val } do + requires :recaptcha_site_key, type: String, desc: 'Generate site key at http://www.google.com/recaptcha' + requires :recaptcha_private_key, type: String, desc: 'Generate private key at http://www.google.com/recaptcha' + end optional :repository_checks_enabled, type: Boolean, desc: "GitLab will periodically run 'git fsck' in all project and wiki repositories to look for silent disk corruption issues." optional :repository_storages, type: Array[String], desc: 'Storage paths for new projects' optional :require_two_factor_authentication, type: Boolean, desc: 'Require all users to set up Two-factor authentication' |