Changeset 4900


Ignore:
Timestamp:
02/02/09 16:27:33 (11 years ago)
Author:
pjkersha
Message:
  • fixed occurred typo
  • fixed badcpage.kid login/logout link
Location:
TI12-security/trunk/python
Files:
9 edited

Legend:

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

    r4841 r4900  
    635635               issuerX509Cert.dn == issuerX509Cert.issuer: 
    636636 
    637                 # If only one iteration occured then it must be a self 
     637                # If only one iteration occurred then it must be a self 
    638638                # signed certificate 
    639639                raise SelfSignedCert("Certificate is self signed: [DN=%s]" % 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/authz/pdp/browse.py

    r4840 r4900  
    5151 
    5252class InitSessionCtxError(PDPError): 
    53     'A problem occured initialising a session connection' 
     53    'A problem occurred initialising a session connection' 
    5454    def __init__(self, msg=None): 
    5555        PDPError.__init__(self, msg or InitSessionCtxError.__doc__) 
    5656 
    5757class AttributeCertificateRequestError(PDPError): 
    58     'A problem occured requesting a certificate containing authorisation roles' 
     58    'A problem occurred requesting a certificate containing authorisation roles' 
    5959    def __init__(self, msg=None): 
    6060        PDPError.__init__(self,msg or AttributeCertificateRequestError.__doc__) 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/authz/pdp/proftp.py

    r4840 r4900  
    4949 
    5050class InitSessionCtxError(PDPError): 
    51     'A problem occured initialising a session connection' 
     51    'A problem occurred initialising a session connection' 
    5252    def __init__(self, msg=None): 
    5353        PDPError.__init__(self, msg or InitSessionCtxError.__doc__) 
    5454 
    5555class AttributeCertificateRequestError(PDPError): 
    56     'A problem occured requesting a certificate containing authorisation roles' 
     56    'A problem occurred requesting a certificate containing authorisation roles' 
    5757    def __init__(self, msg=None): 
    5858        PDPError.__init__(self,msg or AttributeCertificateRequestError.__doc__) 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/sessionmanager.py

    r4840 r4900  
    11101110    @type msg: basestring 
    11111111    @cvar msg: standard message to be raised for this exception""" 
    1112     msg = "An error occured with login" 
     1112    msg = "An error occurred with login" 
    11131113    def __init__(self, *arg, **kw): 
    11141114        Exception.__init__(self, AuthNServiceError.msg, *arg, **kw) 
     
    11281128    database look-up.  Raise from logon""" 
    11291129    msg = \ 
    1130     "An error occured retrieving information to check the login credentials" 
     1130    "An error occurred retrieving information to check the login credentials" 
    11311131 
    11321132class AuthNServiceInitError(AuthNServiceError): 
    11331133    """Error with initialisation of AuthNService.  Raise from __init__""" 
    1134     msg = "An error occured with the initialisation of the Session " + \ 
     1134    msg = "An error occurred with the initialisation of the Session " + \ 
    11351135        "Manager's Authentication Service" 
    11361136     
    11371137class AuthNServiceConfigError(AuthNServiceError): 
    11381138    """Error with Authentication configuration.  Raise from __init__""" 
    1139     msg = "An error occured with the Session Manager's Authentication " + \ 
     1139    msg = "An error occurred with the Session Manager's Authentication " + \ 
    11401140        "Service configuration" 
    11411141 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/sso/sso/badc_site/templates/ndg/security/badcpage.kid

    r4898 r4900  
    133133    <div py:def="showLoginStatus" id="showLoginStatus"> 
    134134        <a class="menu" py:if="getattr(c, 'loggedIn', False)" href="${g.ndg.security.server.sso.cfg.logoutURI}?r=${g.ndg.security.common.sso.state.b64encReturnToURL}">Log out</a> 
    135         <b py:if="getattr(c, 'loggedIn', False)==False">Login</b> 
     135        <b py:if="not getattr(c, 'loggedIn', False)">Login</b> 
    136136    </div> 
    137137</html> 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/sso/sso/badc_site/templates/ndg/security/error.kid

    r4898 r4900  
    3131        </div> 
    3232        <div py:if="not c.xml"> 
    33             An internal error has occured.  Please report the problem to your 
     33            An internal error has occurred.  Please report the problem to your 
    3434            site administrator. 
    3535        </div> 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/sso/sso/controllers/logout.py

    r4898 r4900  
    120120            log.debug("LogoutController._redirect: no redirect URL set.") 
    121121            response.status_code = 400 
     122            c.errorPageHeading = "Log out" 
     123            if getattr(c, "loggedIn", False): 
     124                c.xml = "Logged out" 
     125            else: 
     126                c.xml = ("An error occurred logging out.  Please report the " 
     127                         "problem to your site administrator")  
     128                 
    122129            return render('ndg.security.kid', 'ndg.security.error') 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/sso/sso/lib/openid_util.py

    r4898 r4900  
    3939        self.providers = {} 
    4040        self.loggedIn = False 
     41        self.errorPageHeading = '' 
    4142 
    4243 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/wsgi/openid/provider/__init__.py

    r4863 r4900  
    732732                              "found in session") 
    733733                    return self._render.errorPage(environ, start_response, 
    734                         "An internal error occured possibly due to a request " 
     734                        "An internal error occurred possibly due to a request " 
    735735                        "that's expired.  Please retry from the site where " 
    736736                        "you entered your OpenID.  If the problem persists " 
     
    760760                    log.error("Unexpected exception raised during " 
    761761                              "authentication: %s" % e) 
    762                     msg = ("An internal error occured.  " 
     762                    msg = ("An internal error occurred.  " 
    763763                           "Please try again or if the problems persists " 
    764764                           "contact your system administrator.") 
Note: See TracChangeset for help on using the changeset viewer.