Unicode-aware handling of non-ASCII object keys in multipart uploads

basho · Feb 12, 2014 · 449d099 · 449d099
1 parent dff637f
commit 449d099
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/riak_cs_wm_object_upload.erl b/src/riak_cs_wm_object_upload.erl
@@ -98,7 +98,7 @@ process_post(RD, Ctx=#context{local_context=LocalCtx,
                        [{'xmlns', "http://s3.amazonaws.com/doc/2006-03-01/"}],
                        [
                         {'Bucket', [binary_to_list(Bucket)]},
-                        {'Key', [Key]},
+                        {'Key', [unicode:characters_to_list(list_to_binary(Key), unicode)]},
                         {'UploadId', [binary_to_list(base64url:encode(UploadId))]}
                        ]
                      },

diff --git a/src/riak_cs_wm_object_upload_part.erl b/src/riak_cs_wm_object_upload_part.erl
@@ -108,7 +108,7 @@ process_post(RD, Ctx=#context{local_context=LocalCtx,
                               [
                                {'Location', [lists:append(["http://", binary_to_list(Bucket), ".s3.amazonaws.com/", Key])]},
                                {'Bucket', [binary_to_list(Bucket)]},
-                               {'Key', [Key]},
+                               {'Key', [unicode:characters_to_list(list_to_binary(Key), unicode)]},
                                {'ETag', [binary_to_list(UploadId64)]}
                               ]
                              },
@@ -296,7 +296,7 @@ to_xml(RD, Ctx=#context{local_context=LocalCtx,
                       [{'xmlns', "http://s3.amazonaws.com/doc/2006-03-01/"}],
                       [
                        {'Bucket', [binary_to_list(Bucket)]},
-                       {'Key', [Key]},
+                       {'Key', [unicode:characters_to_list(list_to_binary(Key), unicode)]},
                        {'UploadId', [binary_to_list(base64url:encode(UploadId))]},
                        {'Initiator',    % TODO: replace with ARN data?
                         [{'ID', [UserKeyId]},