Skip to content

Additional fixes for UTF-8 surrogate escapes #629

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
merged 12 commits into from
Aug 15, 2017
Merged

Additional fixes for UTF-8 surrogate escapes #629

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
61d39d8
Fixes non UTF-8 surrogateescapes
tylerjharden Jun 30, 2017
0470858
Removes erroneous bytes decode and reraises
tylerjharden Jun 30, 2017
c6fa87b
Adds test for surrogate escapes in body
tylerjharden Jun 30, 2017
1d8c0e9
Use proper byte sequence for surrogate
tylerjharden Jun 30, 2017
4fa7023
Use if/else versus pass
tylerjharden Jun 30, 2017
b90231f
Proper Unicode surrogate escape
tylerjharden Jul 7, 2017
cf0672d
Passing test once surrogatepass is used
tylerjharden Jul 7, 2017
6259cb3
Use surrogatepass instead of backslashreplace
tylerjharden Jul 7, 2017
05c2b0a
Fixes whitespace
tylerjharden Jul 7, 2017
41fb145
Simplifies with no exception block
tylerjharden Jul 7, 2017
8565da6
Merge branch 'master' of https://github.com/elastic/elasticsearch-py
Aug 1, 2017
1b9c02f
Fixes Unicode Surrogate Escapes in request logging
tylerjharden Aug 1, 2017
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
4 changes: 2 additions & 2 deletions elasticsearch/connection/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def log_request_success(self, method, full_url, path, body, status_code, respons
# body has already been serialized to utf-8, deserialize it for logging
# TODO: find a better way to avoid (de)encoding the body back and forth
if body:
body = body.decode('utf-8')
body = body.decode('utf-8', 'ignore')

logger.info(
'%s %s [status:%s request:%.3fs]', method, full_url,
Expand All @@ -100,7 +100,7 @@ def log_request_fail(self, method, full_url, path, body, duration, status_code=N
# body has already been serialized to utf-8, deserialize it for logging
# TODO: find a better way to avoid (de)encoding the body back and forth
if body:
body = body.decode('utf-8')
body = body.decode('utf-8', 'ignore')

logger.debug('> %s', body)

Expand Down