diff options
author | Stan Hu <stanhu@gmail.com> | 2018-08-11 13:38:21 +0300 |
---|---|---|
committer | Jose Vargas <jvargas@gitlab.com> | 2018-08-29 00:36:25 +0300 |
commit | 4ef1447c4f54af7a609c2a76445704995a29612e (patch) | |
tree | c8e83f98f158da29ecd28d2c4cfefc124300eb9c /lib | |
parent | ec40b36905d0a71edb4bfae592018b6ae580a492 (diff) |
Block link-local addresses in URLBlocker
Closes https://gitlab.com/gitlab-com/migration/issues/766
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/url_blocker.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/gitlab/url_blocker.rb b/lib/gitlab/url_blocker.rb index 38be75b7482..3b483f27e70 100644 --- a/lib/gitlab/url_blocker.rb +++ b/lib/gitlab/url_blocker.rb @@ -31,6 +31,7 @@ module Gitlab validate_localhost!(addrs_info) unless allow_localhost validate_local_network!(addrs_info) unless allow_local_network + validate_link_local!(addrs_info) unless allow_local_network true end @@ -89,6 +90,13 @@ module Gitlab raise BlockedUrlError, "Requests to the local network are not allowed" end + def validate_link_local!(addrs_info) + netmask = IPAddr.new('169.254.0.0/16') + return unless addrs_info.any? { |addr| addr.ipv6_linklocal? || netmask.include?(addr.ip_address) } + + raise BlockedUrlError, "Requests to the link local network are not allowed" + end + def internal?(uri) internal_web?(uri) || internal_shell?(uri) end |