Changeset 3699


Ignore:
Timestamp:
28/03/08 16:13:05 (11 years ago)
Author:
pjkersha
Message:

Separated LoginService? into server and client components sso and ssoClient respectively. Packaging needs re-organising.

  • Made important fix to redirect_to - this doesn't work when called from a BaseController?.call in Pylons 0.9.6 - moved to before method instead.
Location:
TI12-security/trunk/python
Files:
50 added
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/wsSecurity.py

    r3687 r3699  
    7373 
    7474class OASIS(_OASIS): 
    75     WSSE11 = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.1.xsd" 
     75    # wss4j 1.5.3 
     76    WSSE11 = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" 
     77    # wss4j 1.5.1 
     78    #WSSE11 = "http://docs.oasis-open.org/wss/2005/xx/oasis-2005xx-wss-wssecurity-secext-1.1.xsd" 
    7679        
    7780def getElements(node, nameList): 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/sso/sso.cfg

    r3676 r3699  
    88[NDG_SECURITY] 
    99# Server address for secure connections 
    10 sslServer: https://localhost 
    11 server:    http://localhost:4000 
    12 #sslServer: https://gabriel.badc.rl.ac.uk 
    13 #server:    http://gabriel.badc.rl.ac.uk:4000 
     10#sslServer: https://localhost 
     11#server:    http://localhost:4000 
     12sslServer: https://localhost/sso 
     13server:    http://localhost/sso 
    1414 
    1515# Redirect SOAP output to a file e.g. open(<somefile>, 'w') 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/sso/sso/config/ssoMiddleware.py

    r3652 r3699  
    44P J Kershaw 18/03/08 
    55''' 
    6 from sso.lib.security_util import SecurityConfig 
     6from ndg.security.common.pylons.security_util import SecurityConfig 
    77 
    88class SSOMiddleware: 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/sso/sso/controllers/login.py

    r3676 r3699  
    22 
    33from sso.lib.base import * 
    4 from sso.lib.security_util import setSecuritySession, SecuritySession, \ 
     4from ndg.security.common.pylons.security_util import setSecuritySession, SecuritySession, \ 
    55    LoginServiceQuery 
    66from ndg.security.common.AttAuthority import AttAuthorityClient 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/sso/sso/controllers/logout.py

    r3658 r3699  
    11from sso.lib.base import * 
    2 from sso.lib.security_util import SecuritySession 
     2from ndg.security.common.pylons.security_util import SecuritySession 
    33import logging 
    44log = logging.getLogger(__name__) 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/sso/sso/lib/base.py

    r3676 r3699  
    1818from base64 import urlsafe_b64encode 
    1919 
    20 from sso.lib.security_util import setSecuritySession, LoginServiceQuery 
     20from ndg.security.common.pylons.security_util import setSecuritySession, \ 
     21    LoginServiceQuery 
    2122 
    2223import logging 
     
    5051 
    5152        log.debug("BaseController.__call__: c.requestURL = %s" % c.requestURL) 
    52          
    53         if 'h' in request.params: 
    54             # 'h' corresponds to the setting of a session manager host i.e. 
    55             # the request has come from a completed login from the login  
    56             # service 
    57             log.debug("Setting security session from URL query args ...") 
    58              
    59             # Copy the query arguments into security session keys 
    60             setSecuritySession() 
    61              
    62             session.save() 
    63              
    64             # Re-construct the URL removing the security related arguments 
    65             qs = LoginServiceQuery.stripFromURI() 
    66  
    67             log.debug('Switching from https to http...') 
    68             cc = g.securityCfg.server+urllib.quote(environ.get('PATH_INFO','')) 
    69             if qs: 
    70                 cc += "?" + qs 
    71                  
    72             log.debug('URL transport switched to http: "%s"' % cc) 
    73             redirect_to(cc) 
    7453 
    7554         
Note: See TracChangeset for help on using the changeset viewer.