Defend against 'Host' header injection
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17877 . This change adds 'defense in depth' against 'Host' HTTP header injection. It affects normal users in the following way. Suppose your GitLab server has IP address 1.2.3.4 and hostname gitlab.example.com. Currently, if you enter 1.2.3.4 in your browser, you get redirected to 1.2.3.4/users/sign_in. After this change, you get redirected from 1.2.3.4 to gitlab.example.com/users/sign_in. This is because the address you typed in the address bar of your browser ('1.2.3.4'), which gets stored in the 'Host' header, is now being overwritten to 'gitlab.example.com' in NGINX. In this change we also make NGINX clear the 'X-Forwarded-Host' header because Ruby on Rails also uses that header the same wayas the 'Host' header. We think that for most GitLab servers this is the right behavior, and if not then administrators can change this behavior themselves at the NGINX level.
This commit is contained in:
parent
97999fd420
commit
47b5b44139
3 changed files with 13 additions and 2 deletions
|
@ -78,6 +78,7 @@ v 8.10.0 (unreleased)
|
|||
- Add reminder to not paste private SSH keys !4399 (Ingo Blechschmidt)
|
||||
- Remove duplicate `description` field in `MergeRequest` entities (Ben Boeckel)
|
||||
- Style of import project buttons were fixed in the new project page. !5183 (rdemirbay)
|
||||
- Overwrite Host and X-Forwarded-Host headers in NGINX !5213
|
||||
|
||||
v 8.9.6 (unreleased)
|
||||
- Fix importing of events under notes for GitLab projects
|
||||
|
|
|
@ -49,7 +49,12 @@ server {
|
|||
|
||||
proxy_http_version 1.1;
|
||||
|
||||
proxy_set_header Host $http_host;
|
||||
## By overwriting Host and clearing X-Forwarded-Host we ensure that
|
||||
## internal HTTP redirects generated by GitLab always send users to
|
||||
## YOUR_SERVER_FQDN.
|
||||
proxy_set_header Host YOUR_SERVER_FQDN;
|
||||
proxy_set_header X-Forwarded-Host "";
|
||||
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
|
|
|
@ -93,7 +93,12 @@ server {
|
|||
|
||||
proxy_http_version 1.1;
|
||||
|
||||
proxy_set_header Host $http_host;
|
||||
## By overwriting Host and clearing X-Forwarded-Host we ensure that
|
||||
## internal HTTP redirects generated by GitLab always send users to
|
||||
## YOUR_SERVER_FQDN.
|
||||
proxy_set_header Host YOUR_SERVER_FQDN;
|
||||
proxy_set_header X-Forwarded-Host "";
|
||||
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-Ssl on;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
|
|
Loading…
Reference in a new issue