diff options
| author | Brett Walker <bwalker@gitlab.com> | 2019-09-05 09:13:38 -0500 |
|---|---|---|
| committer | Brett Walker <bwalker@gitlab.com> | 2019-09-05 09:36:02 -0500 |
| commit | 921c704f0084739fb0e20e94f8572b6e1841175c (patch) | |
| tree | cdecb6ce06a0e25959664c4b26130d2ffdb2e1a0 /lib | |
| parent | 700bdfc77d503df28f4097c56bfc7ea9f1396e88 (diff) | |
| download | gitlab-ce-921c704f0084739fb0e20e94f8572b6e1841175c.tar.gz | |
Set asset_proxy_whitelist default to gitlab host67037-user-content-gitlab-static-net-brings-back-404-only
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/filter/asset_proxy_filter.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/banzai/filter/asset_proxy_filter.rb b/lib/banzai/filter/asset_proxy_filter.rb index 0a9a52a73a1..8acd3917d81 100644 --- a/lib/banzai/filter/asset_proxy_filter.rb +++ b/lib/banzai/filter/asset_proxy_filter.rb @@ -44,7 +44,7 @@ module Banzai Gitlab.config.asset_proxy['enabled'] = application_settings.asset_proxy_enabled Gitlab.config.asset_proxy['url'] = application_settings.asset_proxy_url Gitlab.config.asset_proxy['secret_key'] = application_settings.asset_proxy_secret_key - Gitlab.config.asset_proxy['whitelist'] = application_settings.asset_proxy_whitelist || [Gitlab.config.gitlab.host] + Gitlab.config.asset_proxy['whitelist'] = determine_whitelist(application_settings) Gitlab.config.asset_proxy['domain_regexp'] = compile_whitelist(Gitlab.config.asset_proxy.whitelist) else Gitlab.config.asset_proxy['enabled'] = ::ApplicationSetting.defaults[:asset_proxy_enabled] @@ -57,6 +57,10 @@ module Banzai escaped = domain_list.map { |domain| Regexp.escape(domain).gsub('\*', '.*?') } Regexp.new("^(#{escaped.join('|')})$", Regexp::IGNORECASE) end + + def self.determine_whitelist(application_settings) + application_settings.asset_proxy_whitelist.presence || [Gitlab.config.gitlab.host] + end end end end |