Changeset 1231 for trunk/rp/trac

Timestamp:

01/23/08 10:01:46 (12 months ago)

Author:

dbuss

Message:

Tickets 369, 341, 319

Location:

trunk/rp/trac/infocard_acct/0.11

Files:

• doit (modified) (1 diff)
• infocard_acct/session.py (modified) (3 diffs)
• infocard_acct/templates/infocard-detail.html (modified) (1 diff)
• infocard_acct/web_ui.py (modified) (4 diffs)
• setup.py (modified) (1 diff)

trunk/rp/trac/infocard_acct/0.11/doit

@@ -10 +10 @@
 rm /var/log/apache2/access_log
 rm /usr/local/lib/python2.5/site-packages/InfoCardAcct*
-rm -rf /tmp/eggcache/InfoCardAccountManager-0.1def-py2.5.egg-tmp
 rm -rf dist
 rm -rf build

trunk/rp/trac/infocard_acct/0.11/infocard_acct/session.py

@@ -67 +67 @@
 #               self.log.debug('SecTokenPreferences setup %s %s' % (req, req.session))
                 if secToken and req.session:
-                        email = secToken.getAssertion('http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress')
-                        fullname = secToken.getAssertion('http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname')
-                        last =  secToken.getAssertion('http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname')
+                        email = secToken.getAssertionValues('http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress')
+                        fullname = secToken.getAssertionValues('http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname')
+                        last =  secToken.getAssertionValues('http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname')
 
                         if not fullname:
@@ -100 +100 @@
         def login(self, req, secToken):
                 if secToken and req.session:
-                        metaData = secToken.getMetaData()
+                        metaData = secToken.getMetaDataValues()
                         if metaData:
                                 for key in metaData.keys():
@@ -106 +106 @@
                                 req.session['tok_meta'] = ''.join("tok_meta_%s " \
                                         % (key) for key in metaData.keys())
-                        claims = secToken.getAssertion()
+                        claims = secToken.getAssertionValues()
                         if claims and claims.keys():
                                 for key in claims.keys():

trunk/rp/trac/infocard_acct/0.11/infocard_acct/templates/infocard-detail.html

@@ -69 +69 @@
         </table>
         
-        <py:with vars="claims =infocard.getAssertion()">
+        <py:with vars="claims =infocard.getAssertionValues()">
          <table py:if="claims" class="listing" id="claims">
                 <thead>

trunk/rp/trac/infocard_acct/0.11/infocard_acct/web_ui.py

@@ -135 +135 @@
         processor = InfoCardProcessor()
         if processor:
-            processor.set_decode(self.privateKey, self.privateKeyPassPhrase, True, False)
-            processor.set_claims(
+            processor.setDecode(self.privateKey, self.privateKeyPassPhrase, True, False)
+            processor.setClaims(
                 self._get_option_from_options(options, 'required_claims'), 
                 self._get_option_from_options(options, 'optional_claims'))
-            processor.set_options(options)
+            processor.setOptions(options)
             options['processorTag'] = processor
 #       self.log.debug("For %s required: %s, optional: %s" % 
@@ -206 +206 @@
                     elif secToken:
                         if secToken and secToken.isValid:
-                            cardkeyhash = secToken.getMetaData(infocard.infocardlib.META_CardKeyHash)
+                            cardkeyhash = secToken.getMetaDataValues(infocard.infocardlib.META_CardKeyHash)
                             self._setup_session(req)
                         elif secToken:
@@ -305 +305 @@
         except (NameError, KeyError):
             processor = self._get_option(req, 'processorTag')
-            secToken = processor.process_token(req.args.get('xmlToken'))
+            secToken = processor.processToken(req.args.get('xmlToken'))
             req.environ['Security_Token'] = secToken
         return secToken
@@ -336 +336 @@
                 secToken = self._get_token(req)
                 if secToken and secToken.isValid:
-                    user = AssociationManager(self.env).check_association(secToken.getMetaData(infocard.infocardlib.META_CardKeyHash))
+                    user = AssociationManager(self.env).check_association(secToken.getMetaDataValues(infocard.infocardlib.META_CardKeyHash))
                     if user:
                         #self.log.debug('web_user:LoginModule:_remote_user:check_association returned : \"%s\"', user)

trunk/rp/trac/infocard_acct/0.11/setup.py

@@ -146 +146 @@
                 infocard_acct.groups = infocard_acct.groups
                 infocard_acct.session = infocard_acct.session
+        
+        infocard = infocard_acct.infocard
      """,