OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

code beautify

pull/200/head
Muthu Subramanian 2015-07-09 12:58:15 +05:30
parent f53bae0c19
commit d2caa5351a
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
synapse/rest/client/v1/login.py
View File

@ -20,19 +20,15 @@ from synapse.types import UserID
from base import ClientV1RestServlet, client_path_pattern from base import ClientV1RestServlet, client_path_pattern
import simplejson as json import simplejson as json
import cgi
import urllib import urllib
import logging import logging
from saml2 import BINDING_HTTP_REDIRECT
from saml2 import BINDING_HTTP_POST from saml2 import BINDING_HTTP_POST
from saml2.metadata import create_metadata_string
from saml2 import config from saml2 import config
from saml2.client import Saml2Client from saml2.client import Saml2Client
from saml2.httputil import ServiceError
from saml2.samlp import Extensions
from saml2.extension.pefim import SPCertEnc logger = logging.getLogger(__name__)
from saml2.s_utils import rndstr
class LoginRestServlet(ClientV1RestServlet): class LoginRestServlet(ClientV1RestServlet):
@ -137,9 +133,8 @@ class SAML2RestServlet(ClientV1RestServlet):
conf.load_file(self.sp_config) conf.load_file(self.sp_config)
SP = Saml2Client(conf) SP = Saml2Client(conf)
saml2_auth = SP.parse_authn_request_response( saml2_auth = SP.parse_authn_request_response(
request.args['SAMLResponse'][0], BINDING_HTTP_POST) request.args['SAMLResponse'][0], BINDING_HTTP_POST)
except Exception, e: # Not authenticated except Exception, e: # Not authenticated
logger = logging.getLogger(__name__)
logger.exception(e) logger.exception(e)
if saml2_auth and saml2_auth.status_ok() and not saml2_auth.not_signed: if saml2_auth and saml2_auth.status_ok() and not saml2_auth.not_signed:
username = saml2_auth.name_id.text username = saml2_auth.name_id.text