Skip to content

Bug fix: handle case when all extensions are allowed #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug fix: handle case when all extensions are allowed #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 32 additions & 25 deletions filemanager/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,16 +188,17 @@ def handle_form(self, form, files):
for chunk in f.chunks():
dest.write(chunk)
f.close()
mimetype = magic.from_file(filepath, mime=True)
guessed_exts = mimetypes.guess_all_extensions(mimetype)
guessed_exts = [ext[1:] for ext in guessed_exts]
common = [ext for ext in guessed_exts if ext in self.extensions]
if not common:
os.remove(filepath)
messages.append(
"File type not allowed : "
+ f.name
)
if self.extensions is not None:
mimetype = magic.from_file(filepath, mime=True)
guessed_exts = mimetypes.guess_all_extensions(mimetype)
guessed_exts = [ext[1:] for ext in guessed_exts]
common = [ext for ext in guessed_exts if ext in self.extensions]
if not common:
os.remove(filepath)
messages.append(
"File type not allowed : "
+ f.name
)
if len(messages) == 0:
messages.append('All files uploaded successfully')
elif action == 'add':
Expand Down Expand Up @@ -340,22 +341,28 @@ def handle_form(self, form, files):
+ os.path.basename(path)
)
zip_ref = zipfile.ZipFile(filename, 'r')
# zip_ref.extractall(self.basepath + self.current_path)
directory = self.basepath + self.current_path
for file in zip_ref.namelist():
if file.endswith(tuple(self.extensions)):
zip_ref.extract(file, directory)
mimetype = magic.from_file(directory + file, mime=True)
print directory + file
guessed_exts = mimetypes.guess_all_extensions(mimetype)
guessed_exts = [ext[1:] for ext in guessed_exts]
common = [ext for ext in guessed_exts if ext in self.extensions]
if not common:
os.remove(directory+file)
if self.extensions is None:
zip_ref.extractall(self.basepath + self.current_path)
else:
directory = self.basepath + self.current_path
for file in zip_ref.namelist():
if file.endswith(tuple(self.extensions)):
zip_ref.extract(file, directory)
mimetype = magic.from_file(directory + file, mime=True)
guessed_exts = mimetypes.guess_all_extensions(mimetype)
guessed_exts = [ext[1:] for ext in guessed_exts]
common = [ext for ext in guessed_exts if ext in self.extensions]
if not common:
os.remove(directory+file)
messages.append(
"File in the zip is not allowed : "
+ file
)
else:
messages.append(
"File in the zip is not allowed : "
+ file
)
"File in the zip is not allowed : "
+ file
)
zip_ref.close()
except Exception as e:
print e
Expand Down