diff options
author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-06 13:36:16 +0200 |
---|---|---|
committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-06 15:43:57 +0200 |
commit | 2951a09967db1ec18050c2b94fe8d809d7ee966f (patch) | |
tree | 34087ca161f465b0d8a4d5ff3e12f3731e4b903d /app | |
parent | beb81e14ec49f7f5aff23d5b4534ba190f79d433 (diff) | |
download | gitlab-ce-2951a09967db1ec18050c2b94fe8d809d7ee966f.tar.gz |
Add tests for token auth.
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/concerns/requires_whitelisted_monitoring_client.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/concerns/requires_whitelisted_monitoring_client.rb b/app/controllers/concerns/requires_whitelisted_monitoring_client.rb index e77fe4026cc..ad2f4bbc486 100644 --- a/app/controllers/concerns/requires_whitelisted_monitoring_client.rb +++ b/app/controllers/concerns/requires_whitelisted_monitoring_client.rb @@ -1,13 +1,13 @@ module RequiresWhitelistedMonitoringClient extend ActiveSupport::Concern included do - before_action :validate_ip_whitelisted_or_token_is_valid! + before_action :validate_ip_whitelisted_or_valid_token! end private - def validate_ip_whitelisted_or_token_is_valid! - render_404 unless client_ip_whitelisted? || token_valid? + def validate_ip_whitelisted_or_valid_token! + render_404 unless client_ip_whitelisted? || valid_token? end def client_ip_whitelisted? @@ -18,7 +18,7 @@ module RequiresWhitelistedMonitoringClient @ip_whitelist ||= Settings.monitoring.ip_whitelist.map(&IPAddr.method(:new)) end - def token_valid? + def valid_token? token = params[:token].presence || request.headers['TOKEN'] token.present? && ActiveSupport::SecurityUtils.variable_size_secure_compare( |