openstack/deb-python-pysaml2
Code Issues Proposed changes

Merge pull request #291 from rebeckag/example_sp_cookie_fix

Browse Source 
Only use six and make sure the cookie can be read.
This commit is contained in:
Roland Hedberg
2015-11-23 20:32:49 +01:00
parent 8036710642 f8cea469d7
commit 0b1da5ad7e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
example/sp-wsgi/sp.py
View File

@@ -4,10 +4,8 @@ import logging
import re import re
import argparse import argparse
import os import os
try:
from future.backports.http.cookies import SimpleCookie from six.moves.http_cookies import SimpleCookie
except:
from Cookie import SimpleCookie
import six import six
from saml2.extension.pefim import SPCertEnc from saml2.extension.pefim import SPCertEnc
@@ -172,7 +170,6 @@ class Cache(object):
def get_user(self, environ): def get_user(self, environ):
cookie = environ.get("HTTP_COOKIE", '') cookie = environ.get("HTTP_COOKIE", '')
cookie = cookie.decode("UTF-8")
logger.debug("Cookie: %s", cookie) logger.debug("Cookie: %s", cookie)
if cookie: if cookie:
cookie_obj = SimpleCookie(cookie) cookie_obj = SimpleCookie(cookie)
@@ -847,7 +844,6 @@ CERT_CHAIN = service_conf.CERT_CHAIN
if __name__ == '__main__': if __name__ == '__main__':
from cherrypy import wsgiserver from cherrypy import wsgiserver
from cherrypy.wsgiserver import ssl_pyopenssl
_parser = argparse.ArgumentParser() _parser = argparse.ArgumentParser()
_parser.add_argument('-d', dest='debug', action='store_true', _parser.add_argument('-d', dest='debug', action='store_true',
@@ -907,6 +903,7 @@ if __name__ == '__main__':
_https = "" _https = ""
if service_conf.HTTPS: if service_conf.HTTPS:
from cherrypy.wsgiserver import ssl_pyopenssl
SRV.ssl_adapter = ssl_pyopenssl.pyOpenSSLAdapter(SERVER_CERT, SRV.ssl_adapter = ssl_pyopenssl.pyOpenSSLAdapter(SERVER_CERT,
SERVER_KEY, CERT_CHAIN) SERVER_KEY, CERT_CHAIN)
_https = " using SSL/TLS" _https = " using SSL/TLS"