5883ce95ef
The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
34 lines
820 B
Ruby
34 lines
820 B
Ruby
module Gitlab
|
|
module PerformanceBar
|
|
extend Gitlab::CurrentSettings
|
|
|
|
ALLOWED_USER_IDS_KEY = 'performance_bar_allowed_user_ids:v2'.freeze
|
|
EXPIRY_TIME = 5.minutes
|
|
|
|
def self.enabled?(user = nil)
|
|
return false unless user && allowed_group_id
|
|
|
|
allowed_user_ids.include?(user.id)
|
|
end
|
|
|
|
def self.allowed_group_id
|
|
current_application_settings.performance_bar_allowed_group_id
|
|
end
|
|
|
|
def self.allowed_user_ids
|
|
Rails.cache.fetch(ALLOWED_USER_IDS_KEY, expires_in: EXPIRY_TIME) do
|
|
group = Group.find_by_id(allowed_group_id)
|
|
|
|
if group
|
|
GroupMembersFinder.new(group).execute.pluck(:user_id)
|
|
else
|
|
[]
|
|
end
|
|
end
|
|
end
|
|
|
|
def self.expire_allowed_user_ids_cache
|
|
Rails.cache.delete(ALLOWED_USER_IDS_KEY)
|
|
end
|
|
end
|
|
end
|