kopia lustrzana https://github.com/OpenDroneMap/WebODM
Using traversal check for correct file placement
rodzic
5daf7a15c0
commit
984415d6dd
|
@ -31,6 +31,7 @@ from django.contrib.gis.db.models.fields import GeometryField
|
||||||
|
|
||||||
from app.cogeo import assure_cogeo
|
from app.cogeo import assure_cogeo
|
||||||
from app.testwatch import testWatch
|
from app.testwatch import testWatch
|
||||||
|
from app.api.common import path_traversal_check
|
||||||
from nodeodm import status_codes
|
from nodeodm import status_codes
|
||||||
from nodeodm.models import ProcessingNode
|
from nodeodm.models import ProcessingNode
|
||||||
from pyodm.exceptions import NodeResponseError, NodeConnectionError, NodeServerError, OdmError
|
from pyodm.exceptions import NodeResponseError, NodeConnectionError, NodeServerError, OdmError
|
||||||
|
@ -462,13 +463,16 @@ class Task(models.Model):
|
||||||
self.save()
|
self.save()
|
||||||
|
|
||||||
zip_path = self.assets_path("all.zip")
|
zip_path = self.assets_path("all.zip")
|
||||||
# Import assets file from mounted system volume (media-dir), or from inside docker container.
|
# Import assets file from mounted system volume (media-dir)/imports, or from inside docker container.
|
||||||
# Import file from system in case of system installation.
|
# Import file from system in case of system installation.
|
||||||
if self.import_url and not os.path.exists(zip_path):
|
if self.import_url and not os.path.exists(zip_path):
|
||||||
if self.import_url.startswith("file://") and os.path.exists(self.import_url.replace("file://", "")):
|
if self.import_url.startswith("file://"):
|
||||||
#check is file placed in shared media folder in /imports directory
|
imports_folder_path = os.path.join(settings.MEDIA_ROOT, "imports")
|
||||||
if self.import_url.startswith(f"file://{settings.MEDIA_ROOT}/imports/") and self.import_url.endswith(".zip"):
|
unsafe_path_to_import_file = os.path.join(settings.MEDIA_ROOT, "imports", self.import_url.replace("file://", ""))
|
||||||
copyfile(self.import_url.replace("file://", ""), zip_path)
|
# check is file placed in shared media folder in /imports directory without traversing
|
||||||
|
checked_path_to_file = path_traversal_check(unsafe_path_to_import_file, imports_folder_path)
|
||||||
|
if os.path.isfile(checked_path_to_file):
|
||||||
|
copyfile(checked_path_to_file, zip_path)
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
# TODO: this is potentially vulnerable to a zip bomb attack
|
# TODO: this is potentially vulnerable to a zip bomb attack
|
||||||
|
|
Ładowanie…
Reference in New Issue