summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-02-24 08:45:00 -0800
committerStan Hu <stanhu@gmail.com>2019-02-24 14:50:55 -0800
commitd03b7bb1e024dcbf68b523686751d3a2025ed03c (patch)
tree99e1dfd73374db247a74a11d4c5cc83f07ed2279 /changelogs
parentc44c83c447377f974e1d3f9b7719cd115791fbb1 (diff)
downloadgitlab-ce-d03b7bb1e024dcbf68b523686751d3a2025ed03c.tar.gz
Properly handle multiple X-Forwarded-For addresses in runner IP
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24624 extracted the X-Forwarded-For address directly, but this didn't consider the case where multiple proxies are in the chain. To fix this, we use the Rails implementation to filter trusted proxies, as documented by Grape: https://github.com/ruby-grape/grape#remote-ip Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58103
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-fix-issue-58103.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-issue-58103.yml b/changelogs/unreleased/sh-fix-issue-58103.yml
new file mode 100644
index 00000000000..1599af23fed
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-issue-58103.yml
@@ -0,0 +1,5 @@
+---
+title: Properly handle multiple X-Forwarded-For addresses in runner IP
+merge_request: 25511
+author:
+type: fixed