diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 00:09:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 00:09:51 +0000 |
| commit | 6b75388b67c35271bc18f2dbd41a72accd927808 (patch) | |
| tree | 0e905919b117b731ea22ef629f45701e6124c1ee /lib/gitlab/url_blocker.rb | |
| parent | 260c87f94ecc8802de4f7cd16d10c0a08d19559c (diff) | |
| download | gitlab-ce-6b75388b67c35271bc18f2dbd41a72accd927808.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
Diffstat (limited to 'lib/gitlab/url_blocker.rb')
| -rw-r--r-- | lib/gitlab/url_blocker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/url_blocker.rb b/lib/gitlab/url_blocker.rb index b620e9b4560..00e609511f2 100644 --- a/lib/gitlab/url_blocker.rb +++ b/lib/gitlab/url_blocker.rb @@ -121,8 +121,8 @@ module Gitlab end rescue SocketError # If the dns rebinding protection is not enabled or the domain - # is allowed, or HTTP_PROXY is set we avoid the dns rebinding checks - return if domain_allowed?(uri) || !dns_rebind_protection || Gitlab.http_proxy_env? + # is allowed we avoid the dns rebinding checks + return if domain_allowed?(uri) || !dns_rebind_protection # In the test suite we use a lot of mocked urls that are either invalid or # don't exist. In order to avoid modifying a ton of tests and factories |