From 9ad1d34017b46fedf9038f5b962cd452cf686a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= Date: Sat, 18 Mar 2017 17:56:05 +0000 Subject: Merge branch 'ssrf' into 'security' nil check for url_blocker? See merge request !2076 --- lib/gitlab/url_blocker.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/gitlab') diff --git a/lib/gitlab/url_blocker.rb b/lib/gitlab/url_blocker.rb index bb2f4edc1a0..7e14a566696 100644 --- a/lib/gitlab/url_blocker.rb +++ b/lib/gitlab/url_blocker.rb @@ -8,6 +8,8 @@ module Gitlab VALID_PORTS = [22, 80, 443].freeze def blocked_url?(url) + return false if url.nil? + blocked_ips = ["127.0.0.1", "::1", "0.0.0.0"] blocked_ips.concat(Socket.ip_address_list.map(&:ip_address)) -- cgit v1.2.3