commit ac3d3125aeebbc7eed4b2586f782dc2b7fc3685b
Author: James Page <email address hidden>
Date: Mon Jun 17 09:56:11 2019 +0100
token: consistently decode binary types
Ensure that any binary types unpacked from message payloads
are correctly converted from binary to text type.
Under Python 3 msgpack returns the serialized input as a
byte string. Similar to other msgpack'd values in the payload,
we need to explicitly decode it to a string value.
This is specifically more of an issue under Python 3; however
the decode operation is safe back to Python 2 so there is no
need to limit the decode codepath to just Python 3.
Conflicts: keystone/token/token_formatters.py
Note: the file conflict is caused by patch
I9529d6bee3e5bb1f618f40f225f69e2ad7e3f64a which is only present in
stable/train.
Change-Id: Ib1073acf5677a60714d0a386de3bcd14ce6cd134
Closes-Bug: 1832265
(cherry picked from commit ffa0918f5a92fd18c86703916d768012b0bea61b)
Reviewed: https:/ /review. opendev. org/690070 /git.openstack. org/cgit/ openstack/ keystone/ commit/ ?id=ac3d3125aee bbc7eed4b2586f7 82dc2b7fc3685b
Committed: https:/
Submitter: Zuul
Branch: stable/stein
commit ac3d3125aeebbc7 eed4b2586f782dc 2b7fc3685b
Author: James Page <email address hidden>
Date: Mon Jun 17 09:56:11 2019 +0100
token: consistently decode binary types
Ensure that any binary types unpacked from message payloads
are correctly converted from binary to text type.
Under Python 3 msgpack returns the serialized input as a
byte string. Similar to other msgpack'd values in the payload,
we need to explicitly decode it to a string value.
This is specifically more of an issue under Python 3; however
the decode operation is safe back to Python 2 so there is no
need to limit the decode codepath to just Python 3.
Conflicts:
keystone/ token/token_ formatters. py
Note: the file conflict is caused by patch e5bb1f618f40f22 5f69e2ad7e3f64a which is only present in
I9529d6bee3
stable/train.
Change-Id: Ib1073acf5677a6 0714d0a386de3bc d14ce6cd134 8c86703916d7680 12b0bea61b)
Closes-Bug: 1832265
(cherry picked from commit ffa0918f5a92fd1