diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-01-06 16:56:56 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-01-06 16:56:56 +0100 |
| commit | af56c1dd323ee418eb8dbfa9eb35c7ec9ac58a66 (patch) | |
| tree | b3ab3629579ac4db3441c60cb48cc0c652dd73e7 /config | |
| parent | c8b2def2be44771ffb479ad989acc7eccf4012f8 (diff) | |
| download | gitlab-ce-af56c1dd323ee418eb8dbfa9eb35c7ec9ac58a66.tar.gz | |
White-list requests from 127.0.0.1
On some misconfigured GitLab servers, if you look in production.log it looks
like all requests come from 127.0.0.1. To avoid unwanted banning we
white-list 127.0.0.1 with this commit.
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 3 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index b474063505f..5d801b9ae5b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -300,6 +300,9 @@ production: &base rack_attack: git_basic_auth: + # Whitelist requests from 127.0.0.1 for web proxies (NGINX/Apache) with incorrect headers + # ip_whitelist: ["127.0.0.1"] + # # Limit the number of Git HTTP authentication attempts per IP # maxretry: 10 # diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 4464d9d0001..c744577d516 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -176,6 +176,7 @@ Settings['extra'] ||= Settingslogic.new({}) # Settings['rack_attack'] ||= Settingslogic.new({}) Settings.rack_attack['git_basic_auth'] ||= Settingslogic.new({}) +Settings.rack_attack.git_basic_auth['ip_whitelist'] ||= %w{127.0.0.1} Settings.rack_attack.git_basic_auth['maxretry'] ||= 10 Settings.rack_attack.git_basic_auth['findtime'] ||= 1.minute Settings.rack_attack.git_basic_auth['bantime'] ||= 1.hour |