commit 091157fc7f52acfeb24e87e26b7f142da9e50d6b
Author: Romain LE DISEZ <email address hidden>
Date: Fri Mar 31 11:21:13 2017 +0200
Fix encoding issue in ssync_sender.send_put()
EC object metadata can currently have a mixture of bytestrings and
unicode. The ssync_sender.send_put() method raises an
UnicodeDecodeError when it attempts to concatenate the metadata
values, if any bytestring has non-ascii characters.
The root cause of this issue is that the object server uses unicode
for the keys of some object metadata items that are received in the
footer of an EC PUT request, whereas all other object metadata keys
and values are persisted as bytestrings.
This patch fixes the bug by changing diskfile write_metadata()
function to encode all unicode metadata keys and values as utf8
encoded bytes before writing to disk. To cope with existing objects
that have a mixture of unicode and bytestring metadata, the diskfile
read_metadata() function is also changed so that all returned unicode
metadata keys and values are utf8 encoded. This ensures that
ssync_sender.send_put() (and any other caller of diskfile
read_metadata) only reads bytestrings from object metadata.
Closes-Bug: #1678018
Co-Authored-By: Alistair Coles <email address hidden>
Change-Id: Ic23c55754ee142f6f5388dcda592a3afc9845c39
Reviewed: https:/ /review. openstack. org/452112 /git.openstack. org/cgit/ openstack/ swift/commit/ ?id=091157fc7f5 2acfeb24e87e26b 7f142da9e50d6b
Committed: https:/
Submitter: Jenkins
Branch: master
commit 091157fc7f52acf eb24e87e26b7f14 2da9e50d6b
Author: Romain LE DISEZ <email address hidden>
Date: Fri Mar 31 11:21:13 2017 +0200
Fix encoding issue in ssync_sender. send_put( )
EC object metadata can currently have a mixture of bytestrings and send_put( ) method raises an deError when it attempts to concatenate the metadata
unicode. The ssync_sender.
UnicodeDeco
values, if any bytestring has non-ascii characters.
The root cause of this issue is that the object server uses unicode
for the keys of some object metadata items that are received in the
footer of an EC PUT request, whereas all other object metadata keys
and values are persisted as bytestrings.
This patch fixes the bug by changing diskfile write_metadata() sender. send_put( ) (and any other caller of diskfile
function to encode all unicode metadata keys and values as utf8
encoded bytes before writing to disk. To cope with existing objects
that have a mixture of unicode and bytestring metadata, the diskfile
read_metadata() function is also changed so that all returned unicode
metadata keys and values are utf8 encoded. This ensures that
ssync_
read_metadata) only reads bytestrings from object metadata.
Closes-Bug: #1678018 f6f5388dcda592a 3afc9845c39
Co-Authored-By: Alistair Coles <email address hidden>
Change-Id: Ic23c55754ee142