diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2018-06-11 13:29:37 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-11 13:29:37 +0000 |
| commit | 1418afc2d6e7699f08a1fc5f33b78ea847ac1451 (patch) | |
| tree | 7f1cd2621237c4dd234651bd16d6e304989b731d /lib | |
| parent | 180dc237152d60d05e4f75d8c936e81ba783b6cd (diff) | |
| download | gitlab-ce-1418afc2d6e7699f08a1fc5f33b78ea847ac1451.tar.gz | |
Avoid checking the user format in every url validation
Diffstat (limited to 'lib')
| -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 20be193ea0c..38be75b7482 100644 --- a/lib/gitlab/url_blocker.rb +++ b/lib/gitlab/url_blocker.rb @@ -5,7 +5,7 @@ module Gitlab BlockedUrlError = Class.new(StandardError) class << self - def validate!(url, allow_localhost: false, allow_local_network: true, ports: [], protocols: []) + def validate!(url, allow_localhost: false, allow_local_network: true, enforce_user: false, ports: [], protocols: []) return true if url.nil? begin @@ -20,7 +20,7 @@ module Gitlab port = uri.port || uri.default_port validate_protocol!(uri.scheme, protocols) validate_port!(port, ports) if ports.any? - validate_user!(uri.user) + validate_user!(uri.user) if enforce_user validate_hostname!(uri.hostname) begin |