Merge branch 'ssrf' into 'security'

nil check for url_blocker? See merge request !2076

Merge branch 'ssrf' into 'security'
nil check for url_blocker? See merge request !2076
78d47070 · Rubén Dávila · Ruben Davila · a70346fc · 78d47070
Commit 78d47070 authored Mar 18, 2017 by Rubén Dávila Committed by Ruben Davila Mar 18, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

lib/gitlab/url_blocker.rb lib/gitlab/url_blocker.rb +2 -0

No files found.
--- 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))