From 5738171aef09003bc919f5a8a99e1a2562c3c6ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Javier=20L=C3=B3pez?= Date: Mon, 29 Jul 2019 20:58:44 +0000 Subject: Fix broken master because of security merge --- lib/gitlab/url_blocker.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/gitlab/url_blocker.rb b/lib/gitlab/url_blocker.rb index aac96377152..9c35d200dcb 100644 --- a/lib/gitlab/url_blocker.rb +++ b/lib/gitlab/url_blocker.rb @@ -86,11 +86,8 @@ module Gitlab # # The original hostname is used to validate the SSL, given in that scenario # we'll be making the request to the IP address, instead of using the hostname. - def enforce_uri_hostname(addrs_info, uri, hostname, dns_rebind_protection) - address = addrs_info.first - ip_address = address.ip_address - - return [uri, nil] unless dns_rebind_protection && ip_address != hostname + def enforce_uri_hostname(ip_address, uri, hostname, dns_rebind_protection) + return [uri, nil] unless dns_rebind_protection && ip_address && ip_address != hostname uri = uri.dup uri.hostname = ip_address -- cgit v1.2.1