diff options
author | Roland Hedberg <roland.hedberg@adm.umu.se> | 2015-11-23 20:32:49 +0100 |
---|---|---|
committer | Roland Hedberg <roland.hedberg@adm.umu.se> | 2015-11-23 20:32:49 +0100 |
commit | 0b1da5ad7e0ac5fe72d04f986361200b81762cdc (patch) | |
tree | e3b50e855346521cf7661c6ec0c90a80e4ecc6fc | |
parent | 8036710642f7c27410ef994af0b0478a916c0f9e (diff) | |
parent | f8cea469d70255adae71e81c19b71efc928d1445 (diff) | |
download | pysaml2-0b1da5ad7e0ac5fe72d04f986361200b81762cdc.tar.gz |
Merge pull request #291 from rebeckag/example_sp_cookie_fix
Only use six and make sure the cookie can be read.
-rwxr-xr-x | example/sp-wsgi/sp.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/example/sp-wsgi/sp.py b/example/sp-wsgi/sp.py index 1792ab70..085555f1 100755 --- a/example/sp-wsgi/sp.py +++ b/example/sp-wsgi/sp.py @@ -4,10 +4,8 @@ import logging import re import argparse import os -try: - from future.backports.http.cookies import SimpleCookie -except: - from Cookie import SimpleCookie + +from six.moves.http_cookies import SimpleCookie import six from saml2.extension.pefim import SPCertEnc @@ -172,7 +170,6 @@ class Cache(object): def get_user(self, environ): cookie = environ.get("HTTP_COOKIE", '') - cookie = cookie.decode("UTF-8") logger.debug("Cookie: %s", cookie) if cookie: cookie_obj = SimpleCookie(cookie) @@ -847,7 +844,6 @@ CERT_CHAIN = service_conf.CERT_CHAIN if __name__ == '__main__': from cherrypy import wsgiserver - from cherrypy.wsgiserver import ssl_pyopenssl _parser = argparse.ArgumentParser() _parser.add_argument('-d', dest='debug', action='store_true', @@ -907,6 +903,7 @@ if __name__ == '__main__': _https = "" if service_conf.HTTPS: + from cherrypy.wsgiserver import ssl_pyopenssl SRV.ssl_adapter = ssl_pyopenssl.pyOpenSSLAdapter(SERVER_CERT, SERVER_KEY, CERT_CHAIN) _https = " using SSL/TLS" |