Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
7e25ff30
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,发现更多精彩内容 >>
提交
7e25ff30
编写于
2月 04, 2019
作者:
B
Brett Walker
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Catch possible Addressable::URI::InvalidURIError
上级
280b6f6f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
1 deletion
+17
-1
changelogs/unreleased/57227-absolute-uri-missing-hierarchical-segment.yml
...eased/57227-absolute-uri-missing-hierarchical-segment.yml
+5
-0
lib/banzai/filter/autolink_filter.rb
lib/banzai/filter/autolink_filter.rb
+5
-1
spec/lib/banzai/filter/autolink_filter_spec.rb
spec/lib/banzai/filter/autolink_filter_spec.rb
+7
-0
未找到文件。
changelogs/unreleased/57227-absolute-uri-missing-hierarchical-segment.yml
0 → 100644
浏览文件 @
7e25ff30
---
title
:
Fix potential Addressable::URI::InvalidURIError
merge_request
:
24908
author
:
type
:
fixed
lib/banzai/filter/autolink_filter.rb
浏览文件 @
7e25ff30
...
@@ -114,7 +114,11 @@ module Banzai
...
@@ -114,7 +114,11 @@ module Banzai
# Since this came from a Text node, make sure the new href is encoded.
# Since this came from a Text node, make sure the new href is encoded.
# `commonmarker` percent encodes the domains of links it handles, so
# `commonmarker` percent encodes the domains of links it handles, so
# do the same (instead of using `normalized_encode`).
# do the same (instead of using `normalized_encode`).
href_safe
=
Addressable
::
URI
.
encode
(
match
).
html_safe
begin
href_safe
=
Addressable
::
URI
.
encode
(
match
).
html_safe
rescue
Addressable
::
URI
::
InvalidURIError
return
uri
.
to_s
end
html_safe_match
=
match
.
html_safe
html_safe_match
=
match
.
html_safe
options
=
link_options
.
merge
(
href:
href_safe
)
options
=
link_options
.
merge
(
href:
href_safe
)
...
...
spec/lib/banzai/filter/autolink_filter_spec.rb
浏览文件 @
7e25ff30
...
@@ -121,6 +121,13 @@ describe Banzai::Filter::AutolinkFilter do
...
@@ -121,6 +121,13 @@ describe Banzai::Filter::AutolinkFilter do
expect
(
doc
.
to_s
).
to
eq
(
"See
#{
link
}
"
)
expect
(
doc
.
to_s
).
to
eq
(
"See
#{
link
}
"
)
end
end
it
'does not autolink bad URLs after we remove trailing punctuation'
do
link
=
'http://]'
doc
=
filter
(
"See
#{
link
}
"
)
expect
(
doc
.
to_s
).
to
eq
(
"See
#{
link
}
"
)
end
it
'does not include trailing punctuation'
do
it
'does not include trailing punctuation'
do
[
'.'
,
', ok?'
,
'...'
,
'?'
,
'!'
,
': is that ok?'
].
each
do
|
trailing_punctuation
|
[
'.'
,
', ok?'
,
'...'
,
'?'
,
'!'
,
': is that ok?'
].
each
do
|
trailing_punctuation
|
doc
=
filter
(
"See
#{
link
}#{
trailing_punctuation
}
"
)
doc
=
filter
(
"See
#{
link
}#{
trailing_punctuation
}
"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录