Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b46d5b13
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,发现更多精彩内容 >>
提交
b46d5b13
编写于
9月 08, 2017
作者:
N
Nick Thomas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Backport more EE changes to Gitlab::UrlSanitizer
上级
715ee581
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
4 deletion
+30
-4
lib/gitlab/url_sanitizer.rb
lib/gitlab/url_sanitizer.rb
+21
-4
spec/lib/gitlab/url_sanitizer_spec.rb
spec/lib/gitlab/url_sanitizer_spec.rb
+9
-0
未找到文件。
lib/gitlab/url_sanitizer.rb
浏览文件 @
b46d5b13
...
...
@@ -19,13 +19,12 @@ module Gitlab
end
def
initialize
(
url
,
credentials:
nil
)
@url
=
Addressable
::
URI
.
parse
(
url
.
to_s
.
strip
)
%i[user password]
.
each
do
|
symbol
|
credentials
[
symbol
]
=
credentials
[
symbol
].
presence
if
credentials
&
.
key?
(
symbol
)
end
@credentials
=
credentials
@url
=
parse_url
(
url
)
end
def
sanitized_url
...
...
@@ -49,12 +48,30 @@ module Gitlab
private
def
parse_url
(
url
)
url
=
url
.
to_s
.
strip
match
=
url
.
match
(
%r{
\A
(?:git|ssh|http(?:s?))
\:
//(?:(.+)(?:@))?(.+)}
)
raw_credentials
=
match
[
1
]
if
match
if
raw_credentials
.
present?
url
.
sub!
(
"
#{
raw_credentials
}
@"
,
''
)
user
,
password
=
raw_credentials
.
split
(
':'
)
@credentials
||=
{
user:
user
.
presence
,
password:
password
.
presence
}
end
url
=
Addressable
::
URI
.
parse
(
url
)
url
.
password
=
password
if
password
.
present?
url
.
user
=
user
if
user
.
present?
url
end
def
generate_full_url
return
@url
unless
valid_credentials?
@full_url
=
@url
.
dup
@full_url
.
password
=
credentials
[
:password
]
@full_url
.
user
=
credentials
[
:user
]
@full_url
.
password
=
credentials
[
:password
]
if
credentials
[
:password
].
present?
@full_url
.
user
=
credentials
[
:user
]
if
credentials
[
:user
].
present?
@full_url
end
...
...
spec/lib/gitlab/url_sanitizer_spec.rb
浏览文件 @
b46d5b13
...
...
@@ -174,4 +174,13 @@ describe Gitlab::UrlSanitizer do
end
end
end
context
'when credentials contains special chars'
do
it
'should parse the URL without errors'
do
url_sanitizer
=
described_class
.
new
(
"https://foo:b?r@github.com/me/project.git"
)
expect
(
url_sanitizer
.
sanitized_url
).
to
eq
(
"https://github.com/me/project.git"
)
expect
(
url_sanitizer
.
full_url
).
to
eq
(
"https://foo:b?r@github.com/me/project.git"
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录