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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
29a68cc5
Commit
29a68cc5
authored
Apr 03, 2019
by
Vasiliy Ermolovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Rack::Utils.clean_path_info instead of copy-pasted version.
parent
f4ab02b1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
32 deletions
+1
-32
app/controllers/help_controller.rb
app/controllers/help_controller.rb
+1
-32
No files found.
app/controllers/help_controller.rb
View file @
29a68cc5
...
@@ -22,7 +22,7 @@ class HelpController < ApplicationController
...
@@ -22,7 +22,7 @@ class HelpController < ApplicationController
end
end
def
show
def
show
@path
=
clean_path_info
(
path_params
[
:path
])
@path
=
Rack
::
Utils
.
clean_path_info
(
path_params
[
:path
])
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
any
(
:markdown
,
:md
,
:html
)
do
format
.
any
(
:markdown
,
:md
,
:html
)
do
...
@@ -75,35 +75,4 @@ class HelpController < ApplicationController
...
@@ -75,35 +75,4 @@ class HelpController < ApplicationController
params
params
end
end
PATH_SEPS
=
Regexp
.
union
(
*
[
::
File
::
SEPARATOR
,
::
File
::
ALT_SEPARATOR
].
compact
)
# Taken from ActionDispatch::FileHandler
# Cleans up the path, to prevent directory traversal outside the doc folder.
def
clean_path_info
(
path_info
)
parts
=
path_info
.
split
(
PATH_SEPS
)
clean
=
[]
# Walk over each part of the path
parts
.
each
do
|
part
|
# Turn `one//two` or `one/./two` into `one/two`.
next
if
part
.
empty?
||
part
==
'.'
if
part
==
'..'
# Turn `one/two/../` into `one`
clean
.
pop
else
# Add simple folder names to the clean path.
clean
<<
part
end
end
# If the path was an absolute path (i.e. `/` or `/one/two`),
# add `/` to the front of the clean path.
clean
.
unshift
'/'
if
parts
.
empty?
||
parts
.
first
.
empty?
# Join all the clean path parts by the path separator.
::
File
.
join
(
*
clean
)
end
end
end
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