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.
108 lines
2.7 KiB
Ruby
108 lines
2.7 KiB
Ruby
module Users
|
|
class BuildService < BaseService
|
|
include Gitlab::CurrentSettings
|
|
|
|
def initialize(current_user, params = {})
|
|
@current_user = current_user
|
|
@params = params.dup
|
|
end
|
|
|
|
def execute(skip_authorization: false)
|
|
raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_create_user?
|
|
|
|
user_params = build_user_params(skip_authorization: skip_authorization)
|
|
user = User.new(user_params)
|
|
|
|
if current_user&.admin?
|
|
@reset_token = user.generate_reset_token if params[:reset_password]
|
|
|
|
if user_params[:force_random_password]
|
|
random_password = Devise.friendly_token.first(Devise.password_length.min)
|
|
user.password = user.password_confirmation = random_password
|
|
end
|
|
end
|
|
|
|
identity_attrs = params.slice(:extern_uid, :provider)
|
|
|
|
if identity_attrs.any?
|
|
user.identities.build(identity_attrs)
|
|
end
|
|
|
|
user
|
|
end
|
|
|
|
private
|
|
|
|
def can_create_user?
|
|
(current_user.nil? && current_application_settings.signup_enabled?) || current_user&.admin?
|
|
end
|
|
|
|
# Allowed params for creating a user (admins only)
|
|
def admin_create_params
|
|
[
|
|
:access_level,
|
|
:admin,
|
|
:avatar,
|
|
:bio,
|
|
:can_create_group,
|
|
:color_scheme_id,
|
|
:email,
|
|
:external,
|
|
:force_random_password,
|
|
:hide_no_password,
|
|
:hide_no_ssh_key,
|
|
:key_id,
|
|
:linkedin,
|
|
:name,
|
|
:password,
|
|
:password_automatically_set,
|
|
:password_expires_at,
|
|
:projects_limit,
|
|
:remember_me,
|
|
:skip_confirmation,
|
|
:skype,
|
|
:theme_id,
|
|
:twitter,
|
|
:username,
|
|
:website_url
|
|
]
|
|
end
|
|
|
|
# Allowed params for user signup
|
|
def signup_params
|
|
[
|
|
:email,
|
|
:email_confirmation,
|
|
:password_automatically_set,
|
|
:name,
|
|
:password,
|
|
:username
|
|
]
|
|
end
|
|
|
|
def build_user_params(skip_authorization:)
|
|
if current_user&.admin?
|
|
user_params = params.slice(*admin_create_params)
|
|
user_params[:created_by_id] = current_user&.id
|
|
|
|
if params[:reset_password]
|
|
user_params.merge!(force_random_password: true, password_expires_at: nil)
|
|
end
|
|
else
|
|
allowed_signup_params = signup_params
|
|
allowed_signup_params << :skip_confirmation if skip_authorization
|
|
|
|
user_params = params.slice(*allowed_signup_params)
|
|
if user_params[:skip_confirmation].nil?
|
|
user_params[:skip_confirmation] = skip_user_confirmation_email_from_setting
|
|
end
|
|
end
|
|
|
|
user_params
|
|
end
|
|
|
|
def skip_user_confirmation_email_from_setting
|
|
!current_application_settings.send_user_confirmation_email
|
|
end
|
|
end
|
|
end
|