diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 21:07:29 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 21:07:29 +0000 |
| commit | 1da3754b25657f49afdcb0b942506d365b1ee89d (patch) | |
| tree | 9f4bfa94fdd1762ef99e6a61bf180ac8cd7b5616 /lib/gitlab/url_blocker.rb | |
| parent | 25521def84a6987fe9d4265b560e930bfb32c195 (diff) | |
| download | gitlab-ce-1da3754b25657f49afdcb0b942506d365b1ee89d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/url_blocker.rb')
| -rw-r--r-- | lib/gitlab/url_blocker.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/gitlab/url_blocker.rb b/lib/gitlab/url_blocker.rb index 4285b2675c5..0adca34440c 100644 --- a/lib/gitlab/url_blocker.rb +++ b/lib/gitlab/url_blocker.rb @@ -125,6 +125,11 @@ module Gitlab # If the addr can't be resolved or the url is invalid (i.e http://1.1.1.1.1) # we block the url raise BlockedUrlError, "Host cannot be resolved or invalid" + rescue ArgumentError => error + # Addrinfo.getaddrinfo errors if the domain exceeds 1024 characters. + raise unless error.message.include?('hostname too long') + + raise BlockedUrlError, "Host is too long (maximum is 1024 characters)" end def validate_local_request( |