entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 34 Releases Activity

idp: read metadata and PEM keys as text (#36515)

This commit is contained in:
Frédéric Péters 2019-11-16 14:32:18 +01:00
parent 207d3ae91e
commit 158d6fac2d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wcs/qommon/ident/idp.py
View File

@ -322,7 +322,7 @@ class AdminIDPDir(Directory):
metadata, publickey, cacertchain, clientcertificate = None, None, None, None
if form.get_widget('metadata').parse():
metadata = form.get_widget('metadata').parse().fp.read()
metadata = force_text(form.get_widget('metadata').parse().fp.read())
if form.get_widget('publickey').parse():
publickey = form.get_widget('publickey').parse().fp.read()
if form.get_widget('cacertchain').parse():

4
wcs/qommon/saml2utils.py
View File

@ -86,9 +86,9 @@ class Metadata(object):
'''Return new or earlier version of PEM keys'''
dir = self.publisher.app_dir
if not signing_pem_key and self.config.get('publickey'):
signing_pem_key = open(os.path.join(dir, 'public-key.pem'), 'rb').read()
signing_pem_key = open(os.path.join(dir, 'public-key.pem'), 'r').read()
if not encryption_pem_key and self.config.get('encryption_publickey'):
encryption_pem_key = open(os.path.join(dir, 'encryption-public-key.pem'), 'rb').read()
encryption_pem_key = open(os.path.join(dir, 'encryption-public-key.pem'), 'r').read()
return (signing_pem_key, encryption_pem_key)
def get_spsso_descriptor(self, signing_pem_key, encryption_pem_key,