Changeset 8105 for trunk/ndg_oauth/ndg_oauth_server

Timestamp:

23/08/12 09:34:21 (9 years ago)

Author:

pjkersha

Message:

modifications for slcs example

Location:

trunk/ndg_oauth/ndg_oauth_server/ndg/oauth/server

Files:

• examples/slcs/pki (added)
• examples/slcs/pki/__init__.py (added)
• examples/slcs/pki/ca (added)
• examples/slcs/pki/ca/530f7122.0 (added)
• examples/slcs/pki/ca/98ef0ee5.0 (added)
• examples/slcs/pki/ca/__init__.py (added)
• examples/slcs/slcs_oauth_server.ini (modified) (2 diffs)
• lib/access_token/myproxy_cert_token_generator.py (modified) (3 diffs)

trunk/ndg_oauth/ndg_oauth_server/ndg/oauth/server/examples/slcs/slcs_oauth_server.ini

@@ -78 +78 @@
 # MyProxy server which this MyProxy WSGI app is a client to.  Set here to the 
 # fully qualified domain name or else set the MYPROXY_SERVER environment
-# variable.  See the documentation for the MyProxyClient egg for details
-myproxy.client.hostname = localhost
+# variable.  Setting here overrides any environment variable setting.  See the 
+# documentation for the MyProxyClient package for details
+#myproxy.client.hostname = localhost
 #myproxy.client.port = 7512
 
@@ -85 +86 @@
 # server that it fronts e.g. set to /etc/grid-security/certificates.  For these
 # tests set to local ca directory
-myproxy.client.caCertDir = %(here)s/ca
+myproxy.client.caCertDir = %(here)s/pki/ca
 
 [filter:OAuth2Authz]

trunk/ndg_oauth/ndg_oauth_server/ndg/oauth/server/lib/access_token/myproxy_cert_token_generator.py

@@ -65 +65 @@
 
         # Get the user identification as set by an authentication filter.
-        myproxy_id = grant.additional_data.get(self.user_identifier_grant_data_key)
+        myproxy_id = grant.additional_data.get(
+                                            self.user_identifier_grant_data_key)
         if not myproxy_id:
             log.error('User identifier not stored with grant')
@@ -72 +73 @@
         # Attempt to obtain a certificate from MyProxy.
         try:
-            creds = myproxyclient.logon(myproxy_id, self.myproxy_global_password, certReq=cert_req)
+            creds = myproxyclient.logon(myproxy_id, 
+                                        self.myproxy_global_password, 
+                                        certReq=cert_req)
         except Exception, exc:
             log.error('MyProxy logon failed: %s', exc.__str__())
@@ -78 +81 @@
 
         token_id = creds[0]
-        return AccessToken(token_id, token_request, grant, self.token_type, self.lifetime)
+        return AccessToken(token_id, token_request, grant, self.token_type, 
+                           self.lifetime)