Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1d2429af
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1d2429af
编写于
4月 07, 2016
作者:
P
Patricio Cano
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add missing proper nil and error handling to SAML login process.
上级
4361cc39
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
18 deletion
+30
-18
app/controllers/omniauth_callbacks_controller.rb
app/controllers/omniauth_callbacks_controller.rb
+16
-10
lib/gitlab/saml/user.rb
lib/gitlab/saml/user.rb
+14
-8
未找到文件。
app/controllers/omniauth_callbacks_controller.rb
浏览文件 @
1d2429af
...
...
@@ -60,6 +60,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
continue_login_process
end
rescue
Gitlab
::
OAuth
::
SignupDisabledError
handle_signup_error
end
def
omniauth_error
...
...
@@ -92,16 +94,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
continue_login_process
end
rescue
Gitlab
::
OAuth
::
SignupDisabledError
label
=
Gitlab
::
OAuth
::
Provider
.
label_for
(
oauth
[
'provider'
])
message
=
"Signing in using your
#{
label
}
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
#{
label
}
account."
end
flash
[
:notice
]
=
message
redirect_to
new_user_session_path
handle_signup_error
end
def
handle_service_ticket
provider
,
ticket
...
...
@@ -122,6 +115,19 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
end
end
def
handle_signup_error
label
=
Gitlab
::
OAuth
::
Provider
.
label_for
(
oauth
[
'provider'
])
message
=
"Signing in using your
#{
label
}
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
#{
label
}
account."
end
flash
[
:notice
]
=
message
redirect_to
new_user_session_path
end
def
oauth
@oauth
||=
request
.
env
[
'omniauth.auth'
]
end
...
...
lib/gitlab/saml/user.rb
浏览文件 @
1d2429af
...
...
@@ -26,13 +26,15 @@ module Gitlab
@user
||=
build_new_user
end
if
external_users_enabled?
# Check if there is overlap between the user's groups and the external groups
# setting then set user as external or internal.
if
(
auth_hash
.
groups
&
Gitlab
::
Saml
::
Config
.
external_groups
).
empty?
@user
.
external
=
false
else
@user
.
external
=
true
unless
@user
.
nil?
if
external_users_enabled?
# Check if there is overlap between the user's groups and the external groups
# setting then set user as external or internal.
if
(
auth_hash
.
groups
&
Gitlab
::
Saml
::
Config
.
external_groups
).
empty?
@user
.
external
=
false
else
@user
.
external
=
true
end
end
end
...
...
@@ -48,7 +50,11 @@ module Gitlab
end
def
changed?
gl_user
.
changed?
||
gl_user
.
identities
.
any?
(
&
:changed?
)
if
gl_user
gl_user
.
changed?
||
gl_user
.
identities
.
any?
(
&
:changed?
)
else
true
end
end
protected
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录