Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4f909803
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,发现更多精彩内容 >>
提交
4f909803
编写于
9月 14, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove code that was accidently added in
5dae40f5
上级
6df16564
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
0 addition
and
66 deletion
+0
-66
lib/gitlab/auth.rb
lib/gitlab/auth.rb
+0
-66
未找到文件。
lib/gitlab/auth.rb
浏览文件 @
4f909803
...
...
@@ -13,72 +13,6 @@ module Gitlab
end
end
def
find_for_ldap_auth
(
auth
,
signed_in_resource
=
nil
)
uid
=
auth
.
info
.
uid
provider
=
auth
.
provider
email
=
auth
.
info
.
email
.
downcase
unless
auth
.
info
.
email
.
nil?
raise
OmniAuth
::
Error
,
"LDAP accounts must provide an uid and email address"
if
uid
.
nil?
or
email
.
nil?
if
@user
=
User
.
find_by_extern_uid_and_provider
(
uid
,
provider
)
@user
elsif
@user
=
User
.
find_by_email
(
email
)
log
.
info
"Updating legacy LDAP user
#{
email
}
with extern_uid =>
#{
uid
}
"
@user
.
update_attributes
(
extern_uid:
uid
,
provider:
provider
)
@user
else
create_from_omniauth
(
auth
,
true
)
end
end
def
create_from_omniauth
(
auth
,
ldap
=
false
)
provider
=
auth
.
provider
uid
=
auth
.
info
.
uid
||
auth
.
uid
uid
=
uid
.
to_s
.
force_encoding
(
"utf-8"
)
name
=
auth
.
info
.
name
.
to_s
.
force_encoding
(
"utf-8"
)
email
=
auth
.
info
.
email
.
to_s
.
downcase
unless
auth
.
info
.
email
.
nil?
ldap_prefix
=
ldap
?
'(LDAP) '
:
''
raise
OmniAuth
::
Error
,
"
#{
ldap_prefix
}#{
provider
}
does not provide an email"
\
" address"
if
auth
.
info
.
email
.
blank?
log
.
info
"
#{
ldap_prefix
}
Creating user from
#{
provider
}
login"
\
" {uid =>
#{
uid
}
, name =>
#{
name
}
, email =>
#{
email
}
}"
password
=
Devise
.
friendly_token
[
0
,
8
].
downcase
@user
=
User
.
build_user
({
extern_uid:
uid
,
provider:
provider
,
name:
name
,
username:
email
.
match
(
/^[^@]*/
)[
0
],
email:
email
,
password:
password
,
password_confirmation:
password
,
},
as: :admin
)
@user
.
save!
if
Gitlab
.
config
.
omniauth
[
'block_auto_created_users'
]
&&
!
ldap
@user
.
block
end
@user
end
def
find_or_new_for_omniauth
(
auth
)
provider
,
uid
=
auth
.
provider
,
auth
.
uid
email
=
auth
.
info
.
email
.
downcase
unless
auth
.
info
.
email
.
nil?
if
@user
=
User
.
find_by_provider_and_extern_uid
(
provider
,
uid
)
@user
elsif
@user
=
User
.
find_by_email
(
email
)
@user
.
update_attributes
(
extern_uid:
uid
,
provider:
provider
)
@user
else
if
Gitlab
.
config
.
omniauth
[
'allow_single_sign_on'
]
@user
=
create_from_omniauth
(
auth
)
@user
end
end
end
def
log
Gitlab
::
AppLogger
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录