Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b290d929
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,发现更多精彩内容 >>
未验证
提交
b290d929
编写于
4月 02, 2018
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename allow_private_networks to allow_local_network
上级
b95918dd
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
14 deletion
+12
-14
app/validators/importable_url_validator.rb
app/validators/importable_url_validator.rb
+3
-5
lib/gitlab/proxy_http_connection_adapter.rb
lib/gitlab/proxy_http_connection_adapter.rb
+1
-1
lib/gitlab/url_blocker.rb
lib/gitlab/url_blocker.rb
+2
-2
spec/lib/gitlab/url_blocker_spec.rb
spec/lib/gitlab/url_blocker_spec.rb
+6
-6
未找到文件。
app/validators/importable_url_validator.rb
浏览文件 @
b290d929
...
...
@@ -4,10 +4,8 @@
# protect against Server-side Request Forgery (SSRF).
class
ImportableUrlValidator
<
ActiveModel
::
EachValidator
def
validate_each
(
record
,
attribute
,
value
)
begin
Gitlab
::
UrlBlocker
.
validate!
(
value
,
valid_ports:
Project
::
VALID_IMPORT_PORTS
)
rescue
Gitlab
::
UrlBlocker
::
BlockedUrlError
=>
e
record
.
errors
.
add
(
attribute
,
"is blocked:
#{
e
.
message
}
"
)
end
Gitlab
::
UrlBlocker
.
validate!
(
value
,
valid_ports:
Project
::
VALID_IMPORT_PORTS
)
rescue
Gitlab
::
UrlBlocker
::
BlockedUrlError
=>
e
record
.
errors
.
add
(
attribute
,
"is blocked:
#{
e
.
message
}
"
)
end
end
lib/gitlab/proxy_http_connection_adapter.rb
浏览文件 @
b290d929
...
...
@@ -12,7 +12,7 @@ module Gitlab
def
connection
unless
allow_local_requests?
begin
Gitlab
::
UrlBlocker
.
validate!
(
uri
,
allow_
private_networks
:
false
)
Gitlab
::
UrlBlocker
.
validate!
(
uri
,
allow_
local_network
:
false
)
rescue
Gitlab
::
UrlBlocker
::
BlockedUrlError
=>
e
raise
Gitlab
::
HTTP
::
BlockedUrlError
,
"URL '
#{
uri
}
' is blocked:
#{
e
.
message
}
"
end
...
...
lib/gitlab/url_blocker.rb
浏览文件 @
b290d929
...
...
@@ -5,7 +5,7 @@ module Gitlab
BlockedUrlError
=
Class
.
new
(
StandardError
)
class
<<
self
def
validate!
(
url
,
allow_localhost:
false
,
allow_
private_networks
:
true
,
valid_ports:
[])
def
validate!
(
url
,
allow_localhost:
false
,
allow_
local_network
:
true
,
valid_ports:
[])
return
true
if
url
.
nil?
begin
...
...
@@ -29,7 +29,7 @@ module Gitlab
end
validate_localhost!
(
addrs_info
)
unless
allow_localhost
validate_local_network!
(
addrs_info
)
unless
allow_
private_networks
validate_local_network!
(
addrs_info
)
unless
allow_
local_network
true
end
...
...
spec/lib/gitlab/url_blocker_spec.rb
浏览文件 @
b290d929
...
...
@@ -74,13 +74,13 @@ describe Gitlab::UrlBlocker do
expect
(
described_class
.
blocked_url?
(
'https://gitlab.com/foo/foo.git'
)).
to
be
false
end
context
'when allow_
private_networks
is'
do
let
(
:
private_network
s
)
{
[
'192.168.1.2'
,
'10.0.0.2'
,
'172.16.0.2'
]
}
context
'when allow_
local_network
is'
do
let
(
:
local_ip
s
)
{
[
'192.168.1.2'
,
'10.0.0.2'
,
'172.16.0.2'
]
}
let
(
:fake_domain
)
{
'www.fakedomain.fake'
}
context
'true (default)'
do
it
'does not block urls from private networks'
do
private_network
s
.
each
do
|
ip
|
local_ip
s
.
each
do
|
ip
|
stub_domain_resolv
(
fake_domain
,
ip
)
expect
(
described_class
).
not_to
be_blocked_url
(
"http://
#{
fake_domain
}
"
)
...
...
@@ -94,14 +94,14 @@ describe Gitlab::UrlBlocker do
context
'false'
do
it
'blocks urls from private networks'
do
private_network
s
.
each
do
|
ip
|
local_ip
s
.
each
do
|
ip
|
stub_domain_resolv
(
fake_domain
,
ip
)
expect
(
described_class
).
to
be_blocked_url
(
"http://
#{
fake_domain
}
"
,
allow_
private_networks
:
false
)
expect
(
described_class
).
to
be_blocked_url
(
"http://
#{
fake_domain
}
"
,
allow_
local_network
:
false
)
unstub_domain_resolv
expect
(
described_class
).
to
be_blocked_url
(
"http://
#{
ip
}
"
,
allow_
private_networks
:
false
)
expect
(
described_class
).
to
be_blocked_url
(
"http://
#{
ip
}
"
,
allow_
local_network
:
false
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录