Changeset 8105


Ignore:
Timestamp:
23/08/12 09:34:21 (7 years ago)
Author:
pjkersha
Message:

modifications for slcs example

Location:
trunk/ndg_oauth/ndg_oauth_server/ndg/oauth/server
Files:
6 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ndg_oauth/ndg_oauth_server/ndg/oauth/server/examples/slcs/slcs_oauth_server.ini

    r8083 r8105  
    7878# MyProxy server which this MyProxy WSGI app is a client to.  Set here to the  
    7979# fully qualified domain name or else set the MYPROXY_SERVER environment 
    80 # variable.  See the documentation for the MyProxyClient egg for details 
    81 myproxy.client.hostname = localhost 
     80# variable.  Setting here overrides any environment variable setting.  See the  
     81# documentation for the MyProxyClient package for details 
     82#myproxy.client.hostname = localhost 
    8283#myproxy.client.port = 7512 
    8384 
     
    8586# server that it fronts e.g. set to /etc/grid-security/certificates.  For these 
    8687# tests set to local ca directory 
    87 myproxy.client.caCertDir = %(here)s/ca 
     88myproxy.client.caCertDir = %(here)s/pki/ca 
    8889 
    8990[filter:OAuth2Authz] 
  • trunk/ndg_oauth/ndg_oauth_server/ndg/oauth/server/lib/access_token/myproxy_cert_token_generator.py

    r8030 r8105  
    6565 
    6666        # Get the user identification as set by an authentication filter. 
    67         myproxy_id = grant.additional_data.get(self.user_identifier_grant_data_key) 
     67        myproxy_id = grant.additional_data.get( 
     68                                            self.user_identifier_grant_data_key) 
    6869        if not myproxy_id: 
    6970            log.error('User identifier not stored with grant') 
     
    7273        # Attempt to obtain a certificate from MyProxy. 
    7374        try: 
    74             creds = myproxyclient.logon(myproxy_id, self.myproxy_global_password, certReq=cert_req) 
     75            creds = myproxyclient.logon(myproxy_id,  
     76                                        self.myproxy_global_password,  
     77                                        certReq=cert_req) 
    7578        except Exception, exc: 
    7679            log.error('MyProxy logon failed: %s', exc.__str__()) 
     
    7881 
    7982        token_id = creds[0] 
    80         return AccessToken(token_id, token_request, grant, self.token_type, self.lifetime) 
     83        return AccessToken(token_id, token_request, grant, self.token_type,  
     84                           self.lifetime) 
Note: See TracChangeset for help on using the changeset viewer.