GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-01 10:11:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

CURA-5508 Add protection before reading a file that may not exist.

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-06-27 11:04:53 +02:00
parent 9689104a2d
commit 36c25a29a8
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cura/CuraPackageManager.py
View File

@ -299,16 +299,15 @@ class CuraPackageManager(QObject):
filename = installation_package_data["filename"] filename = installation_package_data["filename"]
package_id = package_info["package_id"] package_id = package_info["package_id"]
if not os.path.exists(filename):
Logger.log("w", "Package [%s] file '%s' is missing, cannot install this package", package_id, filename)
return
Logger.log("i", "Installing package [%s] from file [%s]", package_id, filename) Logger.log("i", "Installing package [%s] from file [%s]", package_id, filename)
# remove it first and then install # remove it first and then install
self._purgePackage(package_id) self._purgePackage(package_id)
if not os.path.exists(filename):
Logger.log("w", "Package [%s] file '%s' is missing, cannot install this package", package_id, filename)
return
# Install the package # Install the package
with zipfile.ZipFile(filename, "r") as archive: with zipfile.ZipFile(filename, "r") as archive:
@ -341,6 +340,10 @@ class CuraPackageManager(QObject):
# Gets package information from the given file. # Gets package information from the given file.
def getPackageInfo(self, filename: str) -> Dict[str, Any]: def getPackageInfo(self, filename: str) -> Dict[str, Any]:
if not os.path.exists(filename):
Logger.log("w", "Package file '%s' is missing, cannot get info from this package", filename)
return {}
with zipfile.ZipFile(filename) as archive: with zipfile.ZipFile(filename) as archive:
try: try:
# All information is in package.json # All information is in package.json
@ -354,6 +357,10 @@ class CuraPackageManager(QObject):
# Gets the license file content if present in the given package file. # Gets the license file content if present in the given package file.
# Returns None if there is no license file found. # Returns None if there is no license file found.
def getPackageLicense(self, filename: str) -> Optional[str]: def getPackageLicense(self, filename: str) -> Optional[str]:
if not os.path.exists(filename):
Logger.log("w", "Package file '%s' is missing, cannot get license from this package", filename)
return None
license_string = None license_string = None
with zipfile.ZipFile(filename) as archive: with zipfile.ZipFile(filename) as archive:
# Go through all the files and use the first successful read as the result # Go through all the files and use the first successful read as the result