diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-04 00:46:44 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-05 00:46:12 +0200 |
| commit | de6c3597abb58a73e6b8aefd4e45bfafb2a35988 (patch) | |
| tree | 68a5c4f3a2d08944a09c10345dfd02dc729acedd | |
| parent | c1b043bdb764c39c9d1af4b141b65185b71efae6 (diff) | |
| download | gitlab-ce-de6c3597abb58a73e6b8aefd4e45bfafb2a35988.tar.gz | |
correctly handle transforming settings into useful datastructure
| -rw-r--r-- | app/controllers/concerns/requires_whitelisted_monitoring_client.rb | 6 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/concerns/requires_whitelisted_monitoring_client.rb b/app/controllers/concerns/requires_whitelisted_monitoring_client.rb index 25122ddbefa..1205dcb97c2 100644 --- a/app/controllers/concerns/requires_whitelisted_monitoring_client.rb +++ b/app/controllers/concerns/requires_whitelisted_monitoring_client.rb @@ -13,7 +13,11 @@ module RequiresWhitelistedMonitoringClient def client_ip_whitelisted? Settings.monitoring.ip_whitelist.any? { |e| e.include?(Gitlab::RequestContext.client_ip) } end - + + def ip_whitelist + @ip_whitelist ||= Settings.monitoring.ip_whitelist.map(&IPAddr.method(:new)) + end + def token_valid? token = params[:token].presence || request.headers['TOKEN'] token.present? && diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 0c0dcd8413e..31c6bea9ed5 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -499,7 +499,6 @@ Settings.webpack.dev_server['port'] ||= 3808 # Settings['monitoring'] ||= Settingslogic.new({}) Settings.monitoring['ip_whitelist'] ||= %w{127.0.0.1/8} -Settings.monitoring.ip_whitelist.map!(&IPAddr.method(:new)) # # Prometheus metrics settings |