From e7ce2909048fefc2d53c9278cdab23aa86b5f257 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fabien.boucher@enovance.com>
Date: Wed, 24 Apr 2013 23:05:28 +0200
Subject: [PATCH] Metadata retrieving from sqlite must be str for key

Encode metadata key as utf8 if key is unicode when
retriving it from sqlite database.

Change-Id: I4ba11543d1bed17098b5e52dd768c75b403188a1
Fixes: bug #1172202
---
 swift/common/db.py                         | 10 ++++++
 test/functionalnosetests/test_account.py   | 39 +++++++++++++++++++++
 test/functionalnosetests/test_container.py | 40 ++++++++++++++++++++++
 3 files changed, 89 insertions(+)

diff --git a/swift/common/db.py b/swift/common/db.py
index 77a697c449..081293328e 100644
--- a/swift/common/db.py
+++ b/swift/common/db.py
@@ -49,6 +49,14 @@ def utf8encode(*args):
     return [(s.encode('utf8') if isinstance(s, unicode) else s) for s in args]
 
 
+def utf8encodekeys(metadata):
+    uni_keys = [k for k in metadata.keys() if isinstance(k, unicode)]
+    for k in uni_keys:
+        sv = metadata[k]
+        del metadata[k]
+        metadata[k.encode('utf-8')] = sv
+
+
 class DatabaseConnectionError(sqlite3.DatabaseError):
     """More friendly error messages for DB Errors."""
 
@@ -550,6 +558,7 @@ class DatabaseBroker(object):
                 metadata = ''
         if metadata:
             metadata = json.loads(metadata)
+            utf8encodekeys(metadata)
         else:
             metadata = {}
         return metadata
@@ -575,6 +584,7 @@ class DatabaseBroker(object):
                 md = conn.execute('SELECT metadata FROM %s_stat' %
                                   self.db_type).fetchone()[0]
                 md = md and json.loads(md) or {}
+                utf8encodekeys(md)
             except sqlite3.OperationalError, err:
                 if 'no such column: metadata' not in str(err):
                     raise
diff --git a/test/functionalnosetests/test_account.py b/test/functionalnosetests/test_account.py
index ae6e3c4299..481632cfa7 100755
--- a/test/functionalnosetests/test_account.py
+++ b/test/functionalnosetests/test_account.py
@@ -62,6 +62,45 @@ class TestAccount(unittest.TestCase):
         self.assert_(resp.status in (200, 204), resp.status)
         self.assertEquals(resp.getheader('x-account-meta-test'), 'Value')
 
+    def test_unicode_metadata(self):
+        if skip:
+            raise SkipTest
+
+        def post(url, token, parsed, conn, name, value):
+            conn.request('POST', parsed.path, '',
+                         {'X-Auth-Token': token, name: value})
+            return check_response(conn)
+
+        def head(url, token, parsed, conn):
+            conn.request('HEAD', parsed.path, '', {'X-Auth-Token': token})
+            return check_response(conn)
+
+        uni_key = u'X-Account-Meta-uni\u0E12'
+        uni_value = u'uni\u0E12'
+        resp = retry(post, uni_key, '1')
+        resp.read()
+        self.assertTrue(resp.status in (201, 204))
+        resp = retry(head)
+        resp.read()
+        self.assert_(resp.status in (200, 204), resp.status)
+        self.assertEquals(resp.getheader(uni_key.encode('utf-8')), '1')
+        resp = retry(post, 'X-Account-Meta-uni', uni_value)
+        resp.read()
+        self.assertEquals(resp.status, 204)
+        resp = retry(head)
+        resp.read()
+        self.assert_(resp.status in (200, 204), resp.status)
+        self.assertEquals(resp.getheader('X-Account-Meta-uni'),
+                          uni_value.encode('utf-8'))
+        resp = retry(post, uni_key, uni_value)
+        resp.read()
+        self.assertEquals(resp.status, 204)
+        resp = retry(head)
+        resp.read()
+        self.assert_(resp.status in (200, 204), resp.status)
+        self.assertEquals(resp.getheader(uni_key.encode('utf-8')),
+                          uni_value.encode('utf-8'))
+
     def test_multi_metadata(self):
         if skip:
             raise SkipTest
diff --git a/test/functionalnosetests/test_container.py b/test/functionalnosetests/test_container.py
index e92a86c591..2a7280487e 100755
--- a/test/functionalnosetests/test_container.py
+++ b/test/functionalnosetests/test_container.py
@@ -99,6 +99,46 @@ class TestContainer(unittest.TestCase):
         self.assertEquals(resp.getheader('x-container-meta-one'), '1')
         self.assertEquals(resp.getheader('x-container-meta-two'), '2')
 
+    def test_unicode_metadata(self):
+        if skip:
+            raise SkipTest
+
+        def post(url, token, parsed, conn, name, value):
+            conn.request('POST', parsed.path + '/' + self.name, '',
+                         {'X-Auth-Token': token, name: value})
+            return check_response(conn)
+
+        def head(url, token, parsed, conn):
+            conn.request('HEAD', parsed.path + '/' + self.name, '',
+                         {'X-Auth-Token': token})
+            return check_response(conn)
+
+        uni_key = u'X-Container-Meta-uni\u0E12'
+        uni_value = u'uni\u0E12'
+        resp = retry(post, uni_key, '1')
+        resp.read()
+        self.assertEquals(resp.status, 204)
+        resp = retry(head)
+        resp.read()
+        self.assert_(resp.status in (200, 204), resp.status)
+        self.assertEquals(resp.getheader(uni_key.encode('utf-8')), '1')
+        resp = retry(post, 'X-Container-Meta-uni', uni_value)
+        resp.read()
+        self.assertEquals(resp.status, 204)
+        resp = retry(head)
+        resp.read()
+        self.assert_(resp.status in (200, 204), resp.status)
+        self.assertEquals(resp.getheader('X-Container-Meta-uni'),
+                          uni_value.encode('utf-8'))
+        resp = retry(post, uni_key, uni_value)
+        resp.read()
+        self.assertEquals(resp.status, 204)
+        resp = retry(head)
+        resp.read()
+        self.assert_(resp.status in (200, 204), resp.status)
+        self.assertEquals(resp.getheader(uni_key.encode('utf-8')),
+                          uni_value.encode('utf-8'))
+
     def test_PUT_metadata(self):
         if skip:
             raise SkipTest