Changeset 2775

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:

• ndgDiscovery.config (modified) (1 diff)
• ows_server/controllers/login.py (modified) (2 diffs)
• ows_server/models/ndgSecurity.py (modified) (2 diffs)
• ows_server/templates/ndgPage.kid (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ndgDiscovery.config

@@ -97 +97 @@
 # entire purpose of the rest of the list is to simplify updates. These
 # hosts do not need to be visible outside of corporate firewalls.
-# The list should be of the form repositroy: hostname where repository
+# The list should be of the form repository: hostname where repository
 # is the NDG identifier.
 # 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/login.py

@@ -138 +138 @@
         session['panelView']='History'
         session.save()
-       
+
         # Make a security cookie here ...
         
@@ -149 +149 @@
             # is there a keyword on redirect_to that can make this https? See:
             # http://pylonshq.com/project/pylonshq/browser/Pylons/trunk/pylons/decorators/secure.py#L69
-            token='smURI=%s&sessID=%s&username=%s&roles=%s'%(smURI,sessID,username,roles)
+            token='smURI=%s&sessID=%s&username=%s&roles=%s' % (smURI,
+                                                               sessID,
+                                                               username,
+                                                               attCert.roles)
             if '?' in c.returnTo:
                 cc=c.returnTo+'&'+token

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/ndgSecurity.py

@@ -112 +112 @@
              
         if self.securityTokens is not None:
-            return self.__checkAccess()
+            return self.__checkAttCert()
         else:
             return False, self.__class__.NotLoggedInMsg
@@ -139 +139 @@
 
         except AttributeRequestDenied, e:
+            # TODO: write exception to log
             return False, self.__class__.AccessDeniedMsg
         

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ndgPage.kid

@@ -114 +114 @@
                         <!--! now we choose one of the next two (logged in or not) -->
                         <div py:if="'ndgSec' in session"><table><tbody><tr><td> User [${session['ndgSec']['u']}] logged in
-                        at [${session['ndgSec']['h']}] with roles [${', '.join(session['ndgSec']['r'])}]</td><td>
+                        at [${session['ndgSec']['h']}] with roles ${session['ndgSec']['r']}</td><td>
                         &nbsp;<span py:replace="logOut()"/></td></tr></tbody></table></div>
                         <div py:if="'ndgSec' not in session">Further services maybe available if you can