bearer_token: py3

bt5/erp5_bearer_token/ExtensionTemplateItem/portal_components/extension.erp5.BearerToken.py

 import hashlib
 import hmac
 from Products.ERP5Type.Cache import DEFAULT_CACHE_SCOPE
+import six
 
 CACHE_FACTORY_NAME = 'bearer_token_cache_factory'
 
 def getHMAC(self, key, body):
+  # type: (erp5.portal_type.Base, bytes, bytes) -> str
   digest = hmac.new(key, body, digestmod=hashlib.md5)
   return digest.hexdigest()
 
@@ -22,6 +24,10 @@ def _getCacheFactory(self, cache_factory_name):
   return cache_tool.getRamCacheRoot().get(cache_factory_name)
 
 def setBearerToken(self, key, body, cache_factory_name=CACHE_FACTORY_NAME):
+  # type: (erp5.portal_type.Base, str, Any, str) -> None
+  if not isinstance(key, six.string_types):
+    __traceback_info__ = key
+    raise TypeError("Wrong key type %s" % (type(key)))
   cache_factory = _getCacheFactory(self, cache_factory_name)
   cache_duration = cache_factory.cache_duration
   for cache_plugin in cache_factory.getCachePluginList():
@@ -29,6 +35,8 @@ def setBearerToken(self, key, body, cache_factory_name=CACHE_FACTORY_NAME):
                      body, cache_duration=cache_duration)
 
 def getBearerToken(self, key, cache_factory_name=CACHE_FACTORY_NAME):
+  # type: (erp5.portal_type.Base, str, str) -> Any
+  assert isinstance(key, six.string_types)
   cache_factory = _getCacheFactory(self, cache_factory_name)
   for cache_plugin in cache_factory.getCachePluginList():
     cache_entry = cache_plugin.get(key, DEFAULT_CACHE_SCOPE)

bt5/erp5_bearer_token/SkinTemplateItem/portal_skins/erp5_bearer_token/Base_extractBearerTokenInformation.py

@@ -5,9 +5,9 @@ except KeyError:
   # not found
   return None
 
-key = context.getPortalObject().portal_preferences.getPreferredBearerTokenKey()
+key = context.getPortalObject().portal_preferences.getPreferredBearerTokenKey().encode()
 
-if context.Base_getHMAC(key, str(token_dict)) != token:
+if context.Base_getHMAC(key, str(token_dict).encode('utf-8')) != token:
   # bizzare, not valid
   return None
 

bt5/erp5_bearer_token/SkinTemplateItem/portal_skins/erp5_bearer_token/Base_getBearerTokenKey.py

 if REQUEST is not None:
   # mini security
   return None
-return context.getPortalObject().portal_preferences.getPreferredBearerTokenKey()
+return (context.getPortalObject().portal_preferences.getPreferredBearerTokenKey() or '').encode('utf-8')

bt5/erp5_bearer_token/SkinTemplateItem/portal_skins/erp5_bearer_token/Person_getBearerToken.py

@@ -14,7 +14,7 @@ token = {
   'remote-addr': context.REQUEST.get('REMOTE_ADDR')
 }
 
-hmac = context.Base_getHMAC(key, str(token))
+hmac = context.Base_getHMAC(key, str(token).encode('utf-8'))
 
 context.Base_setBearerToken(hmac, token)
 

bt5/erp5_bearer_token/TestTemplateItem/portal_components/test.erp5.testERP5BearerToken.py

@@ -108,7 +108,7 @@ class TestERP5BearerToken(ERP5TypeTestCase):
       'remote-addr': self.portal.REQUEST.get('REMOTE_ADDR')
     }
     hmac = self.portal.Base_getHMAC(self.portal.Base_getBearerTokenKey(), str(
-      token))
+      token).encode('utf-8'))
     self.portal.Base_setBearerToken(hmac, token)
     reference = self.getTokenCredential(self.portal.REQUEST)
     self.assertEqual(reference, None)