openstack/deb-python-pysaml2
Code Issues Proposed changes

Bytes/string issues with encryption/decryption

Browse Source 
Finding a few more places where bytes were leaking out of some methods
and strings were leaking into to others. This makes many more python3
tests pass.
This commit is contained in:
Clint Byrum
2015-05-28 09:15:14 -07:00
parent 234f09c022
commit efa12f0860
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/saml2/sigver.py
View File

@@ -828,7 +828,7 @@ class CryptoBackendXmlSec1(CryptoBackend):
(_stdout, _stderr, output) = self._run_xmlsec(com_list, [fil], (_stdout, _stderr, output) = self._run_xmlsec(com_list, [fil],
exception=DecryptError, exception=DecryptError,
validate_output=False) validate_output=False)
return output return output.decode('utf-8')
def sign_statement(self, statement, node_name, key_file, node_id, def sign_statement(self, statement, node_name, key_file, node_id,
id_attr): id_attr):

12
tests/test_50_server.py
View File

@@ -706,7 +706,7 @@ class TestServer1():
assert valid assert valid
_, key_file = make_temp("%s" % cert_key_str, decode=False) _, key_file = make_temp(cert_key_str, decode=False)
decr_text = self.server.sec.decrypt(decr_text, key_file) decr_text = self.server.sec.decrypt(decr_text, key_file)
@@ -749,7 +749,7 @@ class TestServer1():
assert sresponse.signature is None assert sresponse.signature is None
_, key_file = make_temp("%s" % cert_key_str_advice, decode=False) _, key_file = make_temp(cert_key_str_advice, decode=False)
decr_text = self.server.sec.decrypt(_resp, key_file) decr_text = self.server.sec.decrypt(_resp, key_file)
@@ -781,7 +781,7 @@ class TestServer1():
decr_text_1 = self.server.sec.decrypt(_resp, self.client.config.key_file) decr_text_1 = self.server.sec.decrypt(_resp, self.client.config.key_file)
_, key_file = make_temp("%s" % cert_key_str_advice, decode=False) _, key_file = make_temp(cert_key_str_advice, decode=False)
decr_text_2 = self.server.sec.decrypt(decr_text_1, key_file) decr_text_2 = self.server.sec.decrypt(decr_text_1, key_file)
@@ -812,7 +812,7 @@ class TestServer1():
assert sresponse.signature is None assert sresponse.signature is None
_, key_file = make_temp("%s" % cert_key_str_assertion, decode=False) _, key_file = make_temp(cert_key_str_assertion, decode=False)
decr_text = self.server.sec.decrypt(_resp, key_file) decr_text = self.server.sec.decrypt(_resp, key_file)
@@ -904,11 +904,11 @@ class TestServer1():
assert sresponse.signature is None assert sresponse.signature is None
_, key_file = make_temp("%s" % cert_key_str_assertion, decode=False) _, key_file = make_temp(cert_key_str_assertion, decode=False)
decr_text_1 = _server.sec.decrypt(_resp, key_file) decr_text_1 = _server.sec.decrypt(_resp, key_file)
_, key_file = make_temp("%s" % cert_key_str_advice, decode=False) _, key_file = make_temp(cert_key_str_advice, decode=False)
decr_text_2 = _server.sec.decrypt(decr_text_1, key_file) decr_text_2 = _server.sec.decrypt(decr_text_1, key_file)

2
tests/test_60_sp.py
View File

@@ -64,7 +64,7 @@ class TestSP():
"urn:mace:example.com:saml:roland:sp", trans_name_policy, "urn:mace:example.com:saml:roland:sp", trans_name_policy,
"foba0001@example.com", authn=AUTHN) "foba0001@example.com", authn=AUTHN)
resp_str = base64.encodestring(resp_str) resp_str = base64.encodestring(resp_str.encode('utf-8'))
self.sp.outstanding_queries = {"id1": "http://www.example.com/service"} self.sp.outstanding_queries = {"id1": "http://www.example.com/service"}
session_info = self.sp._eval_authn_response( session_info = self.sp._eval_authn_response(
{}, {"SAMLResponse": [resp_str]}) {}, {"SAMLResponse": [resp_str]})