Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HongzheWang
slapos
Commits
11db6901
Commit
11db6901
authored
Jun 04, 2021
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Plain Diff
simplehttpserver: prevent overwriting files outside of document path
See merge request
!906
parents
eb59577a
9353852c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
112 additions
and
8 deletions
+112
-8
setup.py
setup.py
+1
-0
slapos/recipe/simplehttpserver/__init__.py
slapos/recipe/simplehttpserver/__init__.py
+1
-1
slapos/recipe/simplehttpserver/simplehttpserver.py
slapos/recipe/simplehttpserver/simplehttpserver.py
+10
-7
slapos/test/recipe/test_simplehttpserver.py
slapos/test/recipe/test_simplehttpserver.py
+100
-0
No files found.
setup.py
View file @
11db6901
...
...
@@ -40,6 +40,7 @@ extras_require = {
'jsonschema'
,
'mock'
,
'testfixtures'
,
'requests'
,
),
}
...
...
slapos/recipe/simplehttpserver/__init__.py
View file @
11db6901
...
...
@@ -35,7 +35,7 @@ class Recipe(GenericBaseRecipe):
base_path
=
options
[
'base-path'
]
if
options
.
get
(
'use-hash-url'
,
'True'
)
in
[
'true'
,
'True'
]:
pool
=
string
.
letters
+
string
.
digits
pool
=
string
.
ascii_
letters
+
string
.
digits
hash_string
=
''
.
join
(
random
.
choice
(
pool
)
for
i
in
range
(
64
))
path
=
os
.
path
.
join
(
base_path
,
hash_string
)
...
...
slapos/recipe/simplehttpserver/simplehttpserver.py
View file @
11db6901
...
...
@@ -43,20 +43,23 @@ class ServerHandler(SimpleHTTPRequestHandler):
form
=
cgi
.
FieldStorage
(
fp
=
self
.
rfile
,
headers
=
self
.
headers
,
environ
=
{
'REQUEST_METHOD'
:
'POST'
,
'CONTENT_TYPE'
:
self
.
headers
[
'Content-Type'
]}
environ
=
{
'REQUEST_METHOD'
:
'POST'
,
'CONTENT_TYPE'
:
self
.
headers
[
'Content-Type'
]}
)
name
=
form
[
'path'
].
value
name
=
form
[
'path'
].
value
.
decode
(
'utf-8'
)
content
=
form
[
'content'
].
value
method
=
'a'
method
=
'a
b
'
if
'clear'
in
form
and
form
[
'clear'
].
value
==
'1'
:
method
=
'w'
method
=
'w
b
'
self
.
writeFile
(
name
,
content
,
method
)
self
.
respond
(
200
,
type
=
self
.
headers
[
'Content-Type'
])
self
.
wfile
.
write
(
b"Content written to %s"
%
str2bytes
(
name
))
def
writeFile
(
self
,
filename
,
content
,
method
=
'a'
):
file_path
=
os
.
path
.
join
(
self
.
document_path
,
filename
)
def
writeFile
(
self
,
filename
,
content
,
method
=
'ab'
):
file_path
=
os
.
path
.
abspath
(
os
.
path
.
join
(
self
.
document_path
,
filename
))
if
not
file_path
.
startswith
(
self
.
document_path
):
self
.
respond
(
403
,
'text/plain'
)
self
.
wfile
.
write
(
b"Forbidden"
)
try
:
os
.
makedirs
(
os
.
path
.
dirname
(
file_path
))
...
...
slapos/test/recipe/test_simplehttpserver.py
0 → 100644
View file @
11db6901
import
os
import
shutil
import
tempfile
import
unittest
import
subprocess
import
time
from
six.moves.urllib
import
parse
as
urlparse
import
requests
from
slapos.recipe
import
simplehttpserver
from
slapos.test.utils
import
makeRecipe
class
SimpleHTTPServerTest
(
unittest
.
TestCase
):
process
=
None
def
setUp
(
self
):
self
.
base_path
=
tempfile
.
mkdtemp
()
self
.
addCleanup
(
shutil
.
rmtree
,
self
.
base_path
)
self
.
install_dir
=
tempfile
.
mkdtemp
()
self
.
addCleanup
(
shutil
.
rmtree
,
self
.
install_dir
)
self
.
wrapper
=
os
.
path
.
join
(
self
.
install_dir
,
'server'
)
host
,
port
=
os
.
environ
[
'SLAPOS_TEST_IPV4'
],
9999
self
.
server_url
=
'http://{host}:{port}'
.
format
(
host
=
host
,
port
=
port
)
self
.
recipe
=
makeRecipe
(
simplehttpserver
.
Recipe
,
options
=
{
'base-path'
:
self
.
base_path
,
'host'
:
host
,
'port'
:
port
,
'log-file'
:
os
.
path
.
join
(
self
.
install_dir
,
'simplehttpserver.log'
),
'wrapper'
:
self
.
wrapper
,
},
name
=
'simplehttpserver'
,
)
def
tearDown
(
self
):
if
self
.
process
:
self
.
process
.
terminate
()
self
.
process
.
wait
()
def
test_options
(
self
):
self
.
assertNotEqual
(
self
.
recipe
.
options
[
'path'
],
''
)
self
.
assertEqual
(
self
.
recipe
.
options
[
'root-dir'
],
os
.
path
.
join
(
self
.
base_path
,
self
.
recipe
.
options
[
'path'
],
))
def
test_install
(
self
):
self
.
assertEqual
(
self
.
recipe
.
install
(),
self
.
wrapper
)
self
.
process
=
subprocess
.
Popen
(
self
.
wrapper
,
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
,
)
server_base_url
=
urlparse
.
urljoin
(
self
.
server_url
,
self
.
recipe
.
options
[
'path'
],
)
for
i
in
range
(
16
):
try
:
resp
=
requests
.
get
(
server_base_url
)
break
except
requests
.
exceptions
.
ConnectionError
:
time
.
sleep
(
i
*
.
1
)
else
:
self
.
fail
(
'server did not start.
\
n
out: %s error: %s'
%
self
.
process
.
communicate
())
self
.
assertIn
(
'Directory listing for /'
,
resp
.
text
)
resp
=
requests
.
post
(
server_base_url
,
files
=
{
'path'
:
'hello.txt'
,
'content'
:
b'hello'
,
},
)
self
.
assertEqual
(
resp
.
status_code
,
requests
.
codes
.
ok
)
with
open
(
os
.
path
.
join
(
self
.
base_path
,
self
.
recipe
.
options
[
'path'
],
'hello.txt'
))
as
f
:
self
.
assertEqual
(
f
.
read
(),
'hello'
)
self
.
assertIn
(
'hello.txt'
,
requests
.
get
(
server_base_url
).
text
)
self
.
assertEqual
(
requests
.
get
(
server_base_url
+
'/hello.txt'
).
text
,
'hello'
)
# incorrect paths are refused
for
path
in
'/hello.txt'
,
'../hello.txt'
:
resp
=
requests
.
post
(
server_base_url
,
files
=
{
'path'
:
path
,
'content'
:
b'hello'
,
},
)
self
.
assertEqual
(
resp
.
status_code
,
requests
.
codes
.
forbidden
)
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