Create default bucket uuid with dashes - Fixes #120

kinto/tests/test_default_bucket.py

@@ -1,4 +1,4 @@
-import uuid
+from uuid import UUID
 from .support import (BaseWebTest, unittest, get_user_headers,
                       MINIMALIST_RECORD)
 
@@ -15,7 +15,7 @@ def test_default_bucket_exists_and_has_user_id(self):
         result = bucket.json
         settings = self.app.app.registry.settings
         hmac_secret = settings['cliquet.userid_hmac_secret']
-        bucket_id = hmac_digest(hmac_secret, self.principal)[:32]
+        bucket_id = '%s' % UUID(hmac_digest(hmac_secret, self.principal)[:32])
 
         self.assertEqual(result['data']['id'], bucket_id)
         self.assertEqual(result['permissions']['write'], [self.principal])
@@ -40,7 +40,7 @@ def test_bucket_id_is_an_uuid(self):
         bucket = self.app.get(self.bucket_url, headers=self.headers)
         bucket_id = bucket.json['data']['id']
         try:
-            uuid.UUID(bucket_id)
+            UUID(bucket_id)
         except ValueError:
             self.fail('bucket_id: %s is not a valid UUID.' % bucket_id)
 

kinto/views/buckets.py

@@ -1,3 +1,5 @@
+from uuid import UUID
+
 from pyramid.httpexceptions import HTTPForbidden, HTTPPreconditionFailed
 from pyramid.security import NO_PERMISSION_REQUIRED
 from pyramid.view import view_config
@@ -57,7 +59,8 @@ def default_bucket(request):
     settings = request.registry.settings
     hmac_secret = settings['cliquet.userid_hmac_secret']
     # Build the user unguessable bucket_id UUID from its user_id
-    bucket_id = hmac_digest(hmac_secret, request.prefixed_userid)[:32]
+    bucket_id = '%s' % UUID(hmac_digest(hmac_secret,
+                                        request.prefixed_userid)[:32])
     path = request.path.replace('default', bucket_id)
     querystring = request.url[(request.url.index(request.path) +
                                len(request.path)):]