| ... | @@ -6,6 +6,31 @@ describe Gitlab::RequestContext do |
... | @@ -6,6 +6,31 @@ describe Gitlab::RequestContext do |
|
|
let(:app) { -> (env) {} }
|
|
let(:app) { -> (env) {} }
|
|
|
let(:env) { Hash.new }
|
|
let(:env) { Hash.new }
|
|
|
|
|
|
|
|
|
context 'with X-Forwarded-For headers', :request_store do
|
|
|
|
let(:load_balancer_ip) { '1.2.3.4' }
|
|
|
|
let(:headers) do
|
|
|
|
{
|
|
|
|
'HTTP_X_FORWARDED_FOR' => "#{load_balancer_ip}, 127.0.0.1",
|
|
|
|
'REMOTE_ADDR' => '127.0.0.1'
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
let(:env) { Rack::MockRequest.env_for("/").merge(headers) }
|
|
|
|
|
|
|
|
it 'returns the load balancer IP' do
|
|
|
|
client_ip = nil
|
|
|
|
|
|
|
|
endpoint = proc do
|
|
|
|
client_ip = Gitlab::SafeRequestStore[:client_ip]
|
|
|
|
[200, {}, ["Hello"]]
|
|
|
|
end
|
|
|
|
|
|
|
|
Rails.application.middleware.build(endpoint).call(env)
|
|
|
|
|
|
|
|
expect(client_ip).to eq(load_balancer_ip)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
context 'when RequestStore::Middleware is used' do
|
|
context 'when RequestStore::Middleware is used' do
|
|
|
around do |example|
|
|
around do |example|
|
|
|
RequestStore::Middleware.new(-> (env) { example.run }).call({})
|
|
RequestStore::Middleware.new(-> (env) { example.run }).call({})
|
| ... | @@ -15,7 +40,7 @@ describe Gitlab::RequestContext do |
... | @@ -15,7 +40,7 @@ describe Gitlab::RequestContext do |
|
|
let(:ip) { '192.168.1.11' }
|
|
let(:ip) { '192.168.1.11' }
|
|
|
|
|
|
|
|
before do
|
|
before do
|
|
|
allow_any_instance_of(ActionDispatch::Request).to receive(:ip).and_return(ip)
|
|
allow_any_instance_of(Rack::Request).to receive(:ip).and_return(ip)
|
|
|
described_class.new(app).call(env)
|
|
described_class.new(app).call(env)
|
|
|
end
|
|
end
|
|
|
|
|
|
| ... | |
... | |
| ... | | ... | |