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

Merge branch 'ssrf' into 'security'

Browse source 
nil check for url_blocker?

See merge request !2076
This commit is contained in:
Rubén Dávila 2017-03-18 17:56:05 +00:00 committed by DJ Mountney
parent 65aafb9917
commit 83a0c39808
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/gitlab/url_blocker.rb
View file

@ -8,6 +8,8 @@ module Gitlab
VALID_PORTS = [22, 80, 443].freeze VALID_PORTS = [22, 80, 443].freeze
def blocked_url?(url) def blocked_url?(url)
return false if url.nil?
blocked_ips = ["127.0.0.1", "::1", "0.0.0.0"] blocked_ips = ["127.0.0.1", "::1", "0.0.0.0"]
blocked_ips.concat(Socket.ip_address_list.map(&:ip_address)) blocked_ips.concat(Socket.ip_address_list.map(&:ip_address))