kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '53676-ip-address-of-gitlab-runner-is-wrong-in-the-runners-description' into 'master'

Browse source 
Get remote address for runner

Closes #53676

See merge request gitlab-org/gitlab-ce!24624
This commit is contained in:
Stan Hu 2019-01-24 14:04:55 +00:00
commit fac725c9e5
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/53676-ip-address-of-gitlab-runner-is-wrong-in-the-runners-description.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Get remote IP address of runner
merge_request: 24624
author:
type: changed

2
lib/api/helpers/runner.rb
View file

@ -26,7 +26,7 @@ module API
end
def get_runner_ip
{ ip_address: request.ip }
{ ip_address: request.env["HTTP_X_FORWARDED_FOR"] || request.ip }
end
def current_runner

6
spec/requests/api/runner_spec.rb
View file

@ -210,8 +210,8 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
it "sets the runner's ip_address" do
post api('/runners'),
params: { token: registration_token },
headers: { 'REMOTE_ADDR' => '123.111.123.111' }
params: { token: registration_token },
headers: { 'X-Forwarded-For' => '123.111.123.111' }
expect(response).to have_gitlab_http_status 201
expect(Ci::Runner.first.ip_address).to eq('123.111.123.111')
@ -520,7 +520,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
it "sets the runner's ip_address" do
post api('/jobs/request'),
params: { token: runner.token },
headers: { 'User-Agent' => user_agent, 'REMOTE_ADDR' => '123.222.123.222' }
headers: { 'User-Agent' => user_agent, 'X-Forwarded-For' => '123.222.123.222' }
expect(response).to have_gitlab_http_status 201
expect(runner.reload.ip_address).to eq('123.222.123.222')