Check that guess_mimetypes gets binary input & clean up attachment creation a bit #238485
+25
−22
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`_odoo_guess_mimetype` requires bytes upfront as `_Entry.signatures` are lists of bytes, thus `bin_data.startswith(signature)` requires that `bin_data` be `bytes`. Forthe libmagic version this is a bit more dodgy: `magic` accepts `str` (and encodes under the hood if so) for Python 2 compatibility reasons, but the `guess_mimetypes` wrapper will trigger an unhelpful warning if libmagic recognizes a zip or ole file. Update the libmagic version to reject str inputs. X-original-commit: e4030de
`IrAttachment.create` first `_check_contents` which `_compute_mimetype` which `guess_mimetype` which formerly decoded an `str` input and now errors, *then* encodes the `raw` anyway in order to checksum and index it. Decode `raw` upfront if present. While at it decode and move `datas` to `raw` that way downstream functions (`_compute_mimetype`, `_postprocess_contents`) have no need to repeatedly deal with and b64decode `datas`. X-original-commit: ccd342f
Contributor
|
|
Contributor
Author
|
@xmo-odoo this PR targets master and is the last of the forward-port chain. To merge the full chain, use
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port |
Collaborator
|
@robodoo r+ |
robodoo
pushed a commit
that referenced
this pull request
Dec 3, 2025
`_odoo_guess_mimetype` requires bytes upfront as `_Entry.signatures` are lists of bytes, thus `bin_data.startswith(signature)` requires that `bin_data` be `bytes`. Forthe libmagic version this is a bit more dodgy: `magic` accepts `str` (and encodes under the hood if so) for Python 2 compatibility reasons, but the `guess_mimetypes` wrapper will trigger an unhelpful warning if libmagic recognizes a zip or ole file. Update the libmagic version to reject str inputs. X-original-commit: e4030de Part-of: #238485 Related: odoo/enterprise#101188 Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
robodoo
pushed a commit
that referenced
this pull request
Dec 3, 2025
`IrAttachment.create` first `_check_contents` which `_compute_mimetype` which `guess_mimetype` which formerly decoded an `str` input and now errors, *then* encodes the `raw` anyway in order to checksum and index it. Decode `raw` upfront if present. While at it decode and move `datas` to `raw` that way downstream functions (`_compute_mimetype`, `_postprocess_contents`) have no need to repeatedly deal with and b64decode `datas`. closes #238485 X-original-commit: ccd342f Related: odoo/enterprise#101188 Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Forward-Port-Of: #238151