openstack/deb-python-oauth2client
Code Issues Proposed changes

Fixing JSON key service account assertions in Python3.

Browse Source 
Fixes #125.

NOTE: '%s.%s' does not behave the same between versions and should
      be removed throughout this library.

I will be following this up with a set of regression tests (hopefully
some of which will fail) and we can assess the damage of other uses
of '%s'.
This commit is contained in:
Danny Hermes
2015-02-04 13:55:21 -08:00
parent 413bb816ca
commit ec6e51c801
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
oauth2client/service_account.py
View File

@@ -75,16 +75,14 @@ class _ServiceAccountCredentials(AssertionCredentials):
} }
payload.update(self._kwargs) payload.update(self._kwargs)
assertion_input = '%s.%s' % ( assertion_input = (_urlsafe_b64encode(header) + b'.' +
_urlsafe_b64encode(header), _urlsafe_b64encode(payload))
_urlsafe_b64encode(payload))
assertion_input = assertion_input.encode('utf-8')
# Sign the assertion. # Sign the assertion.
signature = bytes.decode(base64.urlsafe_b64encode(rsa.pkcs1.sign( rsa_bytes = rsa.pkcs1.sign(assertion_input, self._private_key, 'SHA-256')
assertion_input, self._private_key, 'SHA-256'))).rstrip('=') signature = base64.urlsafe_b64encode(rsa_bytes).rstrip(b'=')
return '%s.%s' % (assertion_input, signature) return assertion_input + b'.' + signature
def sign_blob(self, blob): def sign_blob(self, blob):
# Ensure that it is bytes # Ensure that it is bytes