Merge pull request #1871 from gabrtv/fix-config-ints

Fix integer handling when encoding configuration

Author: Gabriel Monroy

api/tests/test_config.py

@@ -148,6 +148,12 @@ def test_config_set_unicode(self):
         self.assertEqual(response.status_code, 201)
         self.assertIn('POWERED_BY', json.loads(response.data['values']))
         self.assertEqual(json.loads(response.data['values'])['POWERED_BY'], 'Кроликов')
+        # set an integer to test unicode regression
+        body = {'values': json.dumps({'INTEGER': 1})}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+        self.assertIn('INTEGER', json.loads(response.data['values']))
+        self.assertEqual(json.loads(response.data['values'])['INTEGER'], 1)
 
     @mock.patch('requests.post', mock_import_repository_task)
     def test_config_str(self):

api/utils.py

@@ -108,6 +108,14 @@ def fingerprint(key):
     return ':'.join(a + b for a, b in zip(fp_plain[::2], fp_plain[1::2]))
 
 
+def encode(obj):
+    """Return UTF-8 encoding for string objects."""
+    if isinstance(obj, basestring):
+        return obj.encode('utf-8')
+    else:
+        return obj
+
+
 if __name__ == "__main__":
     import doctest
     doctest.testmod()

registry/private.py

@@ -6,9 +6,10 @@
 import urlparse
 import uuid
 
+from django.conf import settings
 from docker.utils import utils
 
-from django.conf import settings
+from api.utils import encode
 
 
 def publish_release(source, config, target):
@@ -158,7 +159,6 @@ def _put_tag(image_id, repository_path, tag):
 
 # utility functions
 
-
 def _construct_env(env, config):
     "Update current environment with latest config"
     new_env = []
@@ -168,10 +168,10 @@ def _construct_env(env, config):
         if k in config:
             # update values defined by config
             v = config.pop(k)
-        new_env.append("{}={}".format(k.encode('utf-8'), v.encode('utf-8')))
+        new_env.append("{}={}".format(encode(k), encode(v)))
     # add other config ENV items
     for k, v in config.items():
-        new_env.append("{}={}".format(k.encode('utf-8'), v.encode('utf-8')))
+        new_env.append("{}={}".format(encode(k), encode(v)))
     return new_env