diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2021-07-18 00:34:05 -0400 |
|---|---|---|
| committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2021-08-03 11:57:44 -0400 |
| commit | f6071de6ac07157aeddd19466b5b84449c6ea1b1 (patch) | |
| tree | cfb9ee5083f2a08292128350440f7df2009b7e9c | |
| parent | fb9c3b878d22f6e52285ebbb2c667b979bf13069 (diff) | |
| download | b4-f6071de6ac07157aeddd19466b5b84449c6ea1b1.tar.gz | |
Avoid decoding errors when extracting message ID from stdin
The mbox, am, and pr subcommands accept an mbox on stdin and extract
the message ID. When stdin.read() is called, Python assumes the
encoding is locale.getpreferredencoding(False). This may not match
the content encoding, leading to a decoding error.
Instead feed the stdin bytes to message_from_bytes(), which leads to a
decode('ASCII', errors='surrogateescape') underneath. That's
sufficient to get the message ID from the ASCII headers.
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
| -rw-r--r-- | b4/__init__.py | 2 | ||||
| -rw-r--r-- | b4/pr.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/b4/__init__.py b/b4/__init__.py index 35be4a9..209f88a 100644 --- a/b4/__init__.py +++ b/b4/__init__.py @@ -1954,7 +1954,7 @@ def get_requests_session(): def get_msgid_from_stdin(): if not sys.stdin.isatty(): - message = email.message_from_string(sys.stdin.read()) + message = email.message_from_bytes(sys.stdin.buffer.read()) return message.get('Message-ID', None) return None @@ -433,7 +433,7 @@ def main(cmdargs): if not sys.stdin.isatty(): logger.debug('Getting PR message from stdin') - msg = email.message_from_string(sys.stdin.read()) + msg = email.message_from_bytes(sys.stdin.buffer.read()) msgid = b4.LoreMessage.get_clean_msgid(msg) lmsg = parse_pr_data(msg) else: |