Skip to content

Handle utf8 decoding errors #1076

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

Merged
tsnoam merged 3 commits into from
Apr 17, 2018
Merged

Handle utf8 decoding errors #1076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5124414
Handle utf8 decoding errors
jh0ker Apr 15, 2018
7d77797
Use formatting of logger
jh0ker Apr 15, 2018
a106352
Format (byte)string more neatly
jh0ker Apr 16, 2018
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
7 changes: 6 additions & 1 deletion telegram/utils/request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,14 @@ def _parse(json_data):
dict: A JSON parsed as Python dict with results - on error this dict will be empty.

"""
decoded_s = json_data.decode('utf-8')

try:
decoded_s = json_data.decode('utf-8')
data = json.loads(decoded_s)
except UnicodeDecodeError:
logging.getLogger(__name__).debug(
'Logging raw invalid UTF-8 response:\n%r', json_data)
raise TelegramError('Server response could not be decoded using UTF-8')
except ValueError:
raise TelegramError('Invalid server response')

Expand Down
34 changes: 34 additions & 0 deletions tests/test_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/usr/bin/env python
#
# A library that provides a Python interface to the Telegram Bot API
# Copyright (C) 2015-2018
# Leandro Toledo de Souza <devs@python-telegram-bot.org>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser Public License for more details.
#
# You should have received a copy of the GNU Lesser Public License
# along with this program. If not, see [http://www.gnu.org/licenses/].

import pytest

from telegram import TelegramError
from telegram.utils.request import Request


def test_parse_illegal_callback_data():
"""
Clients can send arbitrary bytes in callback data.
Make sure the correct error is raised in this case.
"""
server_response = b'{"invalid utf-8": "\x80"}'

with pytest.raises(TelegramError, match='Server response could not be decoded using UTF-8'):
Request._parse(server_response)