From 8426fc9abf10c0ce2b039d26830e000361dac604 Mon Sep 17 00:00:00 2001
From: Nathan Sutton <nate@zencoder.com>
Date: Wed, 26 Mar 2014 23:34:00 -0500
Subject: [PATCH] Removed unicode NFC normalization of S3 object keys.

S3 does not require normalization of S3 object keys and uses strict byte
comparison of object keys, not equivalent unicode character comparisons,
to store and retrieve objects. This means that storing and retrieving objects
with fog would cause the objects to be inaccessible by other libraries,
languages, and systems that don't normalize object keys. Given that there is
no benefit to normalization, except perhaps reducing byte count of object
keys, it ought to be removed.
---
 fog.gemspec                      |  1 -
 lib/fog/aws/core.rb              |  9 ---------
 lib/fog/aws/storage.rb           |  9 ---------
 tests/aws/signed_params_tests.rb | 14 +++++++++-----
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/fog.gemspec b/fog.gemspec
index bb08d219c..cf59273f7 100644
--- a/fog.gemspec
+++ b/fog.gemspec
@@ -62,7 +62,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('fission')
   s.add_development_dependency('pry')
   s.add_development_dependency('google-api-client', '~> 0.6', '>= 0.6.2')
-  s.add_development_dependency('unf')
 
   if ENV["FOG_USE_LIBVIRT"]
     s.add_development_dependency('ruby-libvirt','~> 0.5.0')
diff --git a/lib/fog/aws/core.rb b/lib/fog/aws/core.rb
index da4090c03..635fcba43 100644
--- a/lib/fog/aws/core.rb
+++ b/lib/fog/aws/core.rb
@@ -89,15 +89,6 @@ module Fog
     end
 
     def self.escape(string)
-      unless @unf_loaded_or_warned
-        begin
-          require('unf/normalizer')
-        rescue LoadError
-          Fog::Logger.warning("Unable to load the 'unf' gem. Your AWS strings may not be properly encoded.")
-        end
-        @unf_loaded_or_warned = true
-      end
-      string = defined?(::UNF::Normalizer) ? ::UNF::Normalizer.normalize(string, :nfc) : string
       string.gsub(/([^a-zA-Z0-9_.\-~]+)/) {
         "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
       }
diff --git a/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb
index d5c8be90b..5f2b22a50 100644
--- a/lib/fog/aws/storage.rb
+++ b/lib/fog/aws/storage.rb
@@ -177,15 +177,6 @@ module Fog
 
         # NOTE: differs from Fog::AWS.escape by NOT escaping `/`
         def escape(string)
-          unless @unf_loaded_or_warned
-            begin
-              require('unf/normalizer')
-            rescue LoadError
-              Fog::Logger.warning("Unable to load the 'unf' gem. Your AWS strings may not be properly encoded.")
-            end
-            @unf_loaded_or_warned = true
-          end
-          string = defined?(::UNF::Normalizer) ? ::UNF::Normalizer.normalize(string, :nfc) : string
           string.gsub(/([^a-zA-Z0-9_.\-~\/]+)/) {
             "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
           }
diff --git a/tests/aws/signed_params_tests.rb b/tests/aws/signed_params_tests.rb
index 07258cf0f..64b9a9f90 100644
--- a/tests/aws/signed_params_tests.rb
+++ b/tests/aws/signed_params_tests.rb
@@ -3,11 +3,15 @@
 Shindo.tests('AWS | signed_params', ['aws']) do
   returns( Fog::AWS.escape( "'Stöp!' said Fred_-~./" ) ) { "%27St%C3%B6p%21%27%20said%20Fred_-~.%2F" }
 
-  tests('Keys should be canonicalised using Unicode NFC') do
-    returns( Fog::AWS.escape( ["00E9".to_i(16)].pack("U*") ) ) { "%C3%A9" }
+  tests('Unicode characters should be escaped') do
+    unicode = ["00E9".to_i(16)].pack("U*")
+    escaped = "%C3%A9"
+    returns( escaped ) { Fog::AWS.escape( unicode ) }
+  end
 
-    tests('Characters with combining mark should be combined and then escaped') do
-      returns( Fog::AWS.escape( ["0065".to_i(16), "0301".to_i(16)].pack("U*") ) ) { "%C3%A9" }
-    end
+  tests('Unicode characters with combining marks should be escaped') do
+    unicode = ["0065".to_i(16), "0301".to_i(16)].pack("U*")
+    escaped = "e%CC%81"
+    returns( escaped ) { Fog::AWS.escape( unicode ) }
   end
 end