d96d9aae42
Code tweaks in 45e9150a
caused the ldap_person method to not return expected results.
Improved tests to cover the ldap_person method, which was previously stubbed.
164 lines
4.4 KiB
Ruby
164 lines
4.4 KiB
Ruby
# OAuth extension for User model
|
|
#
|
|
# * Find GitLab user based on omniauth uid and provider
|
|
# * Create new user from omniauth data
|
|
#
|
|
module Gitlab
|
|
module OAuth
|
|
class SignupDisabledError < StandardError; end
|
|
|
|
class User
|
|
attr_accessor :auth_hash, :gl_user
|
|
|
|
def initialize(auth_hash)
|
|
self.auth_hash = auth_hash
|
|
end
|
|
|
|
def persisted?
|
|
gl_user.try(:persisted?)
|
|
end
|
|
|
|
def new?
|
|
!persisted?
|
|
end
|
|
|
|
def valid?
|
|
gl_user.try(:valid?)
|
|
end
|
|
|
|
def save
|
|
unauthorized_to_create unless gl_user
|
|
|
|
if needs_blocking?
|
|
gl_user.save!
|
|
gl_user.block
|
|
else
|
|
gl_user.save!
|
|
end
|
|
|
|
log.info "(OAuth) saving user #{auth_hash.email} from login with extern_uid => #{auth_hash.uid}"
|
|
gl_user
|
|
rescue ActiveRecord::RecordInvalid => e
|
|
log.info "(OAuth) Error saving user: #{gl_user.errors.full_messages}"
|
|
return self, e.record.errors
|
|
end
|
|
|
|
def gl_user
|
|
@user ||= find_by_uid_and_provider
|
|
|
|
if auto_link_ldap_user?
|
|
@user ||= find_or_create_ldap_user
|
|
end
|
|
|
|
if signup_enabled?
|
|
@user ||= build_new_user
|
|
end
|
|
|
|
@user
|
|
end
|
|
|
|
protected
|
|
|
|
def find_or_create_ldap_user
|
|
return unless ldap_person
|
|
|
|
# If a corresponding person exists with same uid in a LDAP server,
|
|
# set up a Gitlab user with dual LDAP and Omniauth identities.
|
|
if user = Gitlab::LDAP::User.find_by_uid_and_provider(ldap_person.dn.downcase, ldap_person.provider)
|
|
# Case when a LDAP user already exists in Gitlab. Add the Omniauth identity to existing account.
|
|
user.identities.build(extern_uid: auth_hash.uid, provider: auth_hash.provider)
|
|
else
|
|
# No account in Gitlab yet: create it and add the LDAP identity
|
|
user = build_new_user
|
|
user.identities.new(provider: ldap_person.provider, extern_uid: ldap_person.dn)
|
|
end
|
|
|
|
user
|
|
end
|
|
|
|
def auto_link_ldap_user?
|
|
Gitlab.config.omniauth.auto_link_ldap_user
|
|
end
|
|
|
|
def creating_linked_ldap_user?
|
|
auto_link_ldap_user? && ldap_person
|
|
end
|
|
|
|
def ldap_person
|
|
return @ldap_person if defined?(@ldap_person)
|
|
|
|
# Look for a corresponding person with same uid in any of the configured LDAP providers
|
|
Gitlab::LDAP::Config.providers.each do |provider|
|
|
adapter = Gitlab::LDAP::Adapter.new(provider)
|
|
@ldap_person = Gitlab::LDAP::Person.find_by_uid(auth_hash.uid, adapter)
|
|
break if @ldap_person
|
|
end
|
|
@ldap_person
|
|
end
|
|
|
|
def ldap_config
|
|
Gitlab::LDAP::Config.new(ldap_person.provider) if ldap_person
|
|
end
|
|
|
|
def needs_blocking?
|
|
new? && block_after_signup?
|
|
end
|
|
|
|
def signup_enabled?
|
|
Gitlab.config.omniauth.allow_single_sign_on
|
|
end
|
|
|
|
def block_after_signup?
|
|
if creating_linked_ldap_user?
|
|
ldap_config.block_auto_created_users
|
|
else
|
|
Gitlab.config.omniauth.block_auto_created_users
|
|
end
|
|
end
|
|
|
|
def auth_hash=(auth_hash)
|
|
@auth_hash = AuthHash.new(auth_hash)
|
|
end
|
|
|
|
def find_by_uid_and_provider
|
|
identity = Identity.find_by(provider: auth_hash.provider, extern_uid: auth_hash.uid)
|
|
identity && identity.user
|
|
end
|
|
|
|
def build_new_user
|
|
user = ::User.new(user_attributes)
|
|
user.skip_confirmation!
|
|
user.identities.new(extern_uid: auth_hash.uid, provider: auth_hash.provider)
|
|
user
|
|
end
|
|
|
|
def user_attributes
|
|
# Give preference to LDAP for sensitive information when creating a linked account
|
|
if creating_linked_ldap_user?
|
|
username = ldap_person.username
|
|
email = ldap_person.email.first
|
|
else
|
|
username = auth_hash.username
|
|
email = auth_hash.email
|
|
end
|
|
|
|
{
|
|
name: auth_hash.name,
|
|
username: ::Namespace.clean_path(username),
|
|
email: email,
|
|
password: auth_hash.password,
|
|
password_confirmation: auth_hash.password,
|
|
password_automatically_set: true
|
|
}
|
|
end
|
|
|
|
def log
|
|
Gitlab::AppLogger
|
|
end
|
|
|
|
def unauthorized_to_create
|
|
raise SignupDisabledError
|
|
end
|
|
end
|
|
end
|
|
end
|