Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
010cd3de
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,发现更多精彩内容 >>
提交
010cd3de
编写于
9月 18, 2017
作者:
M
Michael Kozono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rescue DN normalization attempts
上级
79b5cbde
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
0 deletion
+39
-0
lib/gitlab/ldap/person.rb
lib/gitlab/ldap/person.rb
+15
-0
spec/lib/gitlab/ldap/person_spec.rb
spec/lib/gitlab/ldap/person_spec.rb
+24
-0
未找到文件。
lib/gitlab/ldap/person.rb
浏览文件 @
010cd3de
...
...
@@ -43,6 +43,11 @@ module Gitlab
else
normalize_uid
(
uid_or_dn
)
end
rescue
StandardError
=>
e
Rails
.
logger
.
info
(
"Returning original DN
\"
#{
uid_or_dn
}
\"
due to error during normalization attempt:
#{
e
.
message
}
"
)
Rails
.
logger
.
info
(
e
.
backtrace
.
join
(
"
\n
"
))
uid_or_dn
end
# Returns true if the string looks like a DN rather than a UID.
...
...
@@ -59,6 +64,11 @@ module Gitlab
# 2. The string is downcased (for case-insensitivity)
def
self
.
normalize_uid
(
uid
)
normalize_dn_part
(
uid
)
rescue
StandardError
=>
e
Rails
.
logger
.
info
(
"Returning original UID
\"
#{
uid
}
\"
due to error during normalization attempt:
#{
e
.
message
}
"
)
Rails
.
logger
.
info
(
e
.
backtrace
.
join
(
"
\n
"
))
uid
end
# Returns the DN in a normalized form.
...
...
@@ -69,6 +79,11 @@ module Gitlab
dn
.
split
(
/(?<!\\)([,+=])/
).
map
do
|
part
|
normalize_dn_part
(
part
)
end
.
join
(
''
)
rescue
StandardError
=>
e
Rails
.
logger
.
info
(
"Returning original DN
\"
#{
dn
}
\"
due to error during normalization attempt:
#{
e
.
message
}
"
)
Rails
.
logger
.
info
(
e
.
backtrace
.
join
(
"
\n
"
))
dn
end
def
initialize
(
entry
,
provider
)
...
...
spec/lib/gitlab/ldap/person_spec.rb
浏览文件 @
010cd3de
...
...
@@ -82,18 +82,42 @@ describe Gitlab::LDAP::Person do
it_behaves_like
'normalizes the DN'
it_behaves_like
'normalizes the UID'
context
'with an exception during normalization'
do
let
(
:given
)
{
described_class
}
# just something that will cause an exception
it
'returns the given object unmodified'
do
expect
(
subject
).
to
eq
(
given
)
end
end
end
describe
'.normalize_uid'
do
subject
{
described_class
.
normalize_uid
(
given
)
}
it_behaves_like
'normalizes the UID'
context
'with an exception during normalization'
do
let
(
:given
)
{
described_class
}
# just something that will cause an exception
it
'returns the given UID unmodified'
do
expect
(
subject
).
to
eq
(
given
)
end
end
end
describe
'.normalize_dn'
do
subject
{
described_class
.
normalize_dn
(
given
)
}
it_behaves_like
'normalizes the DN'
context
'with an exception during normalization'
do
let
(
:given
)
{
described_class
}
# just something that will cause an exception
it
'returns the given DN unmodified'
do
expect
(
subject
).
to
eq
(
given
)
end
end
end
describe
'.dn?'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录