diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-10 15:03:01 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-11 22:49:36 +0300 |
| commit | b1ac474dc753d61e48e38e68cd7f5613ae6dda8b (patch) | |
| tree | 199136990392d0e6c269c0ea76f6d635d36a691c /lib | |
| parent | 4619cbd253ad8b1d90d12d1b7f9cf15d70b3631d (diff) | |
Merge branch 'sh-ignore-arrays-url-sanitizer' into 'master'
Only allow strings in URL::Sanitizer.valid?
Closes #55079
See merge request gitlab-org/gitlab-ce!23675
(cherry picked from commit 5c5a5992c0602f14c7f4f43b5fc2756662fafb3c)
401be1d1 Only allow strings in URL::Sanitizer.valid?
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/url_sanitizer.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/url_sanitizer.rb b/lib/gitlab/url_sanitizer.rb index 035268bc4f2..880712de5fe 100644 --- a/lib/gitlab/url_sanitizer.rb +++ b/lib/gitlab/url_sanitizer.rb @@ -14,6 +14,7 @@ module Gitlab def self.valid?(url) return false unless url.present? + return false unless url.is_a?(String) uri = Addressable::URI.parse(url.strip) |