Changeset 1509

Timestamp:

04/11/08 16:02:15 (9 months ago)

Author:

dbuss

Message:

change handling of token to only report errors if the transport wasn't encrypted.

Location:

trunk/rp

Files:

• common/python/infocard/infocardlib.py (modified) (5 diffs)
• trac/infocard_acct/0.11/infocard_acct/web_ui.py (modified) (1 diff)

trunk/rp/common/python/infocard/infocardlib.py

@@ -248 +248 @@
 #                                objencKey = self.objKeyInfo.encryptedCtx
 #                                self.objKeyInfo.loadKey(
-#                                    self.option.get(OPTION_CryptoKey), 
-#                                    self.option.get(OPTION_CryptoKeyPass),
-#                                    self.option.get(OPTION_CryptoKeyIsFile), 
-#                                    self.option.get(OPTION_CryptoKeyIsCert))
+#                                    self.options.get(OPTION_CryptoKey), 
+#                                    self.options.get(OPTION_CryptoKeyPass),
+#                                    self.options.get(OPTION_CryptoKeyIsFile), 
+#                                    self.options.get(OPTION_CryptoKeyIsCert))
 #                                key = objencKey.decryptKey(self.objKeyInfo)
 #                            else:
@@ -394 +394 @@
         for node in nodelist:
             self.metadata[META_Audience] = node.firstChild.data
-            self._doesMatchFuzzy(self.option.get(META_Audience), 
+            self._doesMatchFuzzy(self.options.get(META_Audience), 
                 self.metadata[META_Audience], 'Audience', 'mismatched-audience')
             break
@@ -422 +422 @@
         rClaims = None
         oClaims = None
-        if self.option.get(OPTIONoption.getal_claims):
-            oClaims = self.option.get(OPTIONoption.getal_claims).rsplit(' ')
-
-        if self.option.get(OPTION_required_claims):
-            rClaims = self.option.get(OPTION_required_claims).rsplit(' ')
+        if self.options.get(OPTION_optional_claims):
+            oClaims = self.options.get(OPTION_optional_claims).rsplit(' ')
+
+        if self.options.get(OPTION_required_claims):
+            rClaims = self.options.get(OPTION_required_claims).rsplit(' ')
             for claim in rClaims:
                 if claim and len(claim) and not self.getAssertionValues(claim):
@@ -470 +470 @@
         """ See if this attribute is allowed to be multivalued"""
         claim = ns + '/' + name
-        multiClaims = self.option.get(OPTION_multivalued_claims)
+        multiClaims = self.options.get(OPTION_multivalued_claims)
         if multiClaims and (re.search(claim, multiClaims) is not None):
             return True
@@ -631 +631 @@
     """ callback function for loading keys as needed """
     objKey.loadKeyInfo(
-        secToken.option.get(OPTION_CryptoKeyPublic), 
-        secToken.option.get(OPTION_CryptoCert),
-        secToken.option.get(OPTION_CryptoKeyIsFile))
+        secToken.options.get(OPTION_CryptoKeyPublic), 
+        secToken.options.get(OPTION_CryptoCert),
+        secToken.options.get(OPTION_CryptoKeyIsFile))
         
     objKey.loadKey(
-        secToken.option.get(OPTION_CryptoKey), 
-        secToken.option.get(OPTION_CryptoKeyPass),
-        secToken.option.get(OPTION_CryptoKeyIsFile), 
-        secToken.option.get(OPTION_CryptoKeyIsCert))    
+        secToken.options.get(OPTION_CryptoKey), 
+        secToken.options.get(OPTION_CryptoKeyPass),
+        secToken.options.get(OPTION_CryptoKeyIsFile), 
+        secToken.options.get(OPTION_CryptoKeyIsCert))    

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

@@ -313 +313 @@
         except (NameError, KeyError):
             processor = self._get_option(req, 'processorTag')
-            secToken = processor.processToken(req.args.get('xmlToken'))
+            transport = 'http'
+            referer = self._referer(req)
+            if referer and referer.startswith('https'):
+                transport = 'https'
+            secToken = processor.processToken(req.args.get('xmlToken'), transport)
             req.environ['Security_Token'] = secToken
         return secToken