Ignore:
Timestamp:
07/08/07 14:00:17 (12 years ago)
Author:
lawrence
Message:

Adding fixes for login redirect

Location:
TI05-delivery/ows_framework/trunk/ows_server
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/trunk/ows_server/ndgDiscovery.config

    r2769 r2772  
    118118 
    119119# WS-Security signature handler 
    120 # 
     120# This is an application certificate ... (which may be a machine certificate) 
    121121# X.509 certificate sent with outbound signed messages 
    122 wssCertFilePath: Junk-cert.pem 
     122wssCertFilePath: secpem/Junk-cert.pem 
    123123 
    124124# Private key used to sign messages 
    125 wssKeyFilePath: Junk-key.pem 
     125# This is an application certificate ... (which may be a machine certificate) 
     126wssKeyFilePath: secpem/Junk-key.pem 
    126127 
    127128# Password for private key - comment out if the file is not password protected 
    128 wssKeyPwd:  
     129wssKeyPwd: Junk 
    129130 
    130131# Space separated list of CA cert. files to validate certs against when 
    131132# verifying responses 
    132 wssCACertFilePathList = cacert.pem 
     133wssCACertFilePathList = secpem/cacert.pem 
    133134 
    134135# SSL Connections 
     
    137138# must verify against at least one of these otherwise the connection is  
    138139# dropped. 
    139 sslCACertFilePathList: cacert.pem 
     140sslCACertFilePathList: secpem/cacert.pem 
    140141 
    141142# Set an alternate CommonName to match with peer cert for SSL 
     
    146147# Attribute Certificate  
    147148# Issuer name - should match with name element specified in  
    148 # home Attribute Authority's attAuthorityProperties.xml 
     149# home Attribute Authority attAuthorityProperties.xml 
    149150acIssuerName: BADC 
    150151 
    151152# verification of X.509 cert back to CA 
    152 acCACertFilePathList: cacert.pem 
     153acCACertFilePathList: secpem/cacert.pem 
    153154 
    154155[RELATED] 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/login.py

    r2754 r2772  
    130130        # 
    131131        # P J Kershaw 25/07/07 
    132         session['ndgSec']={'h':'badc.nerc.ac.uk', 
     132        session['ndgSec']={'h':smURI, 
    133133                           'u':username, 
    134134                           'r':attCert.roles, 
    135135                           'sessID':sessID, 
    136136                           'wssCertChain':wssCertChain, 
    137                            'wssPriKey':proxyPriKey, 
    138                            'smURI':smURI} 
     137                           'wssPriKey':proxyPriKey} 
    139138        session['panelView']='History' 
    140139        session.save() 
     
    150149            # is there a keyword on redirect_to that can make this https? See: 
    151150            # http://pylonshq.com/project/pylonshq/browser/Pylons/trunk/pylons/decorators/secure.py#L69 
    152             h.redirect_to(c.returnTo) 
     151            token='smURI=%s&sessID=%s&username=%s&roles=%s'%(smURI,sessID,username,roles) 
     152            if '?' in c.returnTo: 
     153                cc=c.returnTo+'&'+token 
     154            else: 
     155                cc=c.returnTo+'?'+token 
     156            h.redirect_to(cc) 
    153157        else: 
    154158            c.xml='Login Successful' 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/base.py

    r2711 r2772  
    3030        # the action or route vars here 
    3131        c.requestURL=construct_url(environ) 
     32        if 'smURI' in request.params: 
     33            session['ndgSec']={'h':request.params['smURI'], 
     34                           'u':request.params['username'], 
     35                           'r':request.params['roles'], 
     36                           'sessID':request.params['sessID']} 
     37            # TODO strip out this lot and repaint with a clean URL 
    3238        return WSGIController.__call__(self, environ, start_response) 
    3339     
Note: See TracChangeset for help on using the changeset viewer.