Changeset 2775 for TI05-delivery


Ignore:
Timestamp:
07/08/07 16:34:42 (12 years ago)
Author:
pjkersha
Message:

ndgDiscovery.config: fix typo in comment

ows_server/models/ndgSecurity.py: fix SecurityHandler?.checkAccess to call
_SecurityHandler._checkAttCert() no itself(!)

ows_server/controllers/login.py: fix LoginController?.getCredentials token
setting - use attCert.roles instead of roles.

ows_server/templates/ndgPage.kid: simplified display of roles but note may
need changing where user has many roles.

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

Legend:

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

    r2772 r2775  
    9797# entire purpose of the rest of the list is to simplify updates. These 
    9898# hosts do not need to be visible outside of corporate firewalls. 
    99 # The list should be of the form repositroy: hostname where repository 
     99# The list should be of the form repository: hostname where repository 
    100100# is the NDG identifier. 
    101101#  
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/login.py

    r2772 r2775  
    138138        session['panelView']='History' 
    139139        session.save() 
    140         
     140 
    141141        # Make a security cookie here ... 
    142142         
     
    149149            # is there a keyword on redirect_to that can make this https? See: 
    150150            # http://pylonshq.com/project/pylonshq/browser/Pylons/trunk/pylons/decorators/secure.py#L69 
    151             token='smURI=%s&sessID=%s&username=%s&roles=%s'%(smURI,sessID,username,roles) 
     151            token='smURI=%s&sessID=%s&username=%s&roles=%s' % (smURI, 
     152                                                               sessID, 
     153                                                               username, 
     154                                                               attCert.roles) 
    152155            if '?' in c.returnTo: 
    153156                cc=c.returnTo+'&'+token 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/ndgSecurity.py

    r2754 r2775  
    112112              
    113113        if self.securityTokens is not None: 
    114             return self.__checkAccess() 
     114            return self.__checkAttCert() 
    115115        else: 
    116116            return False, self.__class__.NotLoggedInMsg 
     
    139139 
    140140        except AttributeRequestDenied, e: 
     141            # TODO: write exception to log 
    141142            return False, self.__class__.AccessDeniedMsg 
    142143         
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ndgPage.kid

    r2773 r2775  
    114114                        <!--! now we choose one of the next two (logged in or not) --> 
    115115                        <div py:if="'ndgSec' in session"><table><tbody><tr><td> User [${session['ndgSec']['u']}] logged in 
    116                         at [${session['ndgSec']['h']}] with roles [${', '.join(session['ndgSec']['r'])}]</td><td> 
     116                        at [${session['ndgSec']['h']}] with roles ${session['ndgSec']['r']}</td><td> 
    117117                        &nbsp;<span py:replace="logOut()"/></td></tr></tbody></table></div> 
    118118                        <div py:if="'ndgSec' not in session">Further services maybe available if you can 
Note: See TracChangeset for help on using the changeset viewer.