mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-12 06:06:05 +10:00
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: VERSION app/controllers/admin/application_settings_controller.rb app/controllers/omniauth_callbacks_controller.rb app/controllers/projects/project_members_controller.rb app/helpers/application_settings_helper.rb app/models/user.rb app/services/files/base_service.rb app/views/profiles/accounts/show.html.haml db/schema.rb doc/install/installation.md doc/update/6.x-or-7.x-to-7.11.md doc/workflow/README.md lib/gitlab/markdown/external_issue_reference_filter.rb lib/gitlab/reference_extractor.rb lib/gitlab/upgrader.rb
92 lines
2.8 KiB
Ruby
92 lines
2.8 KiB
Ruby
class OmniauthCallbacksController < Devise::OmniauthCallbacksController
|
|
include AuthenticatesWithTwoFactor
|
|
|
|
protect_from_forgery except: [:kerberos, :saml]
|
|
|
|
Gitlab.config.omniauth.providers.each do |provider|
|
|
define_method provider['name'] do
|
|
handle_omniauth
|
|
end
|
|
end
|
|
|
|
# Extend the standard message generation to accept our custom exception
|
|
def failure_message
|
|
exception = env["omniauth.error"]
|
|
error = exception.error_reason if exception.respond_to?(:error_reason)
|
|
error ||= exception.error if exception.respond_to?(:error)
|
|
error ||= exception.message if exception.respond_to?(:message)
|
|
error ||= env["omniauth.error.type"].to_s
|
|
error.to_s.humanize if error
|
|
end
|
|
|
|
# We only find ourselves here
|
|
# if the authentication to LDAP was successful.
|
|
def ldap
|
|
@user = Gitlab::LDAP::User.new(oauth)
|
|
@user.save if @user.changed? # will also save new users
|
|
gl_user = @user.gl_user
|
|
gl_user.remember_me = true if @user.persisted?
|
|
|
|
# Do additional LDAP checks for the user filter and EE features
|
|
if @user.allowed?
|
|
if @user.otp_required_for_login?
|
|
prompt_for_two_factor(gl_user)
|
|
else
|
|
sign_in_and_redirect(gl_user)
|
|
end
|
|
else
|
|
flash[:alert] = "Access denied for your LDAP account."
|
|
redirect_to new_user_session_path
|
|
end
|
|
end
|
|
|
|
def omniauth_error
|
|
@provider = params[:provider]
|
|
@error = params[:error]
|
|
render 'errors/omniauth_error', layout: "errors", status: 422
|
|
end
|
|
|
|
private
|
|
|
|
def handle_omniauth
|
|
if current_user
|
|
# Add new authentication method
|
|
current_user.identities.find_or_create_by(extern_uid: oauth['uid'], provider: oauth['provider'])
|
|
redirect_to profile_account_path, notice: 'Authentication method updated'
|
|
else
|
|
@user = Gitlab::OAuth::User.new(oauth)
|
|
@user.save
|
|
|
|
# Only allow properly saved users to login.
|
|
if @user.persisted? && @user.valid?
|
|
sign_in_and_redirect(@user.gl_user)
|
|
else
|
|
error_message =
|
|
if @user.gl_user.errors.any?
|
|
@user.gl_user.errors.map do |attribute, message|
|
|
"#{attribute} #{message}"
|
|
end.join(", ")
|
|
else
|
|
''
|
|
end
|
|
|
|
redirect_to omniauth_error_path(oauth['provider'], error: error_message) and return
|
|
end
|
|
end
|
|
rescue Gitlab::OAuth::SignupDisabledError => e
|
|
message = "Signing in using your #{oauth['provider']} account without a pre-existing GitLab account is not allowed."
|
|
|
|
if current_application_settings.signup_enabled?
|
|
message << " Create a GitLab account first, and then connect it to your #{oauth['provider']} account."
|
|
end
|
|
|
|
flash[:notice] = message
|
|
|
|
redirect_to new_user_session_path
|
|
end
|
|
|
|
def oauth
|
|
@oauth ||= request.env['omniauth.auth']
|
|
end
|
|
end
|