Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
83a0c398
Commit
83a0c398
authored
7 years ago
by
Rubén Dávila
Committed by
DJ Mountney
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'ssrf' into 'security'
nil check for url_blocker? See merge request !2076
parent
65aafb99
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
lib/gitlab/url_blocker.rb
lib/gitlab/url_blocker.rb
+2
-0
No files found.
lib/gitlab/url_blocker.rb
View file @
83a0c398
...
...
@@ -8,6 +8,8 @@ module Gitlab
VALID_PORTS
=
[
22
,
80
,
443
].
freeze
def
blocked_url?
(
url
)
return
false
if
url
.
nil?
blocked_ips
=
[
"127.0.0.1"
,
"::1"
,
"0.0.0.0"
]
blocked_ips
.
concat
(
Socket
.
ip_address_list
.
map
(
&
:ip_address
))
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment