Skip to content
Snippets Groups Projects
Commit 7f8473cd authored by Xavier Morel's avatar Xavier Morel
Browse files

[FIX] base: don't overwrite existing extensions

The point was to fix files attachments without an extension,
potentially appending to existing extensions was not a smart idea.

See #34299, 5eb15c01
parent 7fc94210
Branches
Tags
No related merge requests found
......@@ -336,9 +336,11 @@ class IrHttp(models.AbstractModel):
mimetype = guess_mimetype(base64.b64decode(content), default=default_mimetype)
# extension
extension = mimetypes.guess_extension(mimetype)
if extension and not filename.endswith(extension):
filename = "%s%s" % (filename, extension)
_, existing_extension = os.path.splitext(filename)
if not existing_extension:
extension = mimetypes.guess_extension(mimetype)
if extension:
filename = "%s%s" % (filename, extension)
if not filehash:
filehash = '"%s"' % hashlib.md5(pycompat.to_text(content).encode('utf-8')).hexdigest()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment