From 158d6fac2d1a1187c1cfa74b025876ac5c9cde00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 16 Nov 2019 14:32:18 +0100 Subject: [PATCH] idp: read metadata and PEM keys as text (#36515) --- wcs/qommon/ident/idp.py | 2 +- wcs/qommon/saml2utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wcs/qommon/ident/idp.py b/wcs/qommon/ident/idp.py index b84f1e2c7..6f7f3ce04 100644 --- a/wcs/qommon/ident/idp.py +++ b/wcs/qommon/ident/idp.py @@ -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(): diff --git a/wcs/qommon/saml2utils.py b/wcs/qommon/saml2utils.py index 3d712eb6e..2e36426fb 100644 --- a/wcs/qommon/saml2utils.py +++ b/wcs/qommon/saml2utils.py @@ -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,