some incoming data has & escaped as & in the query string

atmos · Jul 1, 2011 · 39f6078 · 39f6078
1 parent 0edb605
commit 39f6078
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/server.coffee b/server.coffee
@@ -66,7 +66,8 @@ server = Http.createServer (req, resp) ->
 
     delete(req.headers.cookie)
 
-    [query_digest, encoded_url] = url.pathname.replace(/^\//, '').split("/", 2)
+    pathname = url.pathname.replace(/&amp;/, '&')
+    [query_digest, encoded_url] = pathname.replace(/^\//, '').split("/", 2)
     if encoded_url = hexdec(encoded_url)
       url_type = 'path'
       dest_url = encoded_url

diff --git a/server.js b/server.js
diff --git a/test/proxy_test.rb b/test/proxy_test.rb
@@ -28,6 +28,17 @@ def test_proxy_valid_google_chart_url
     assert_equal(200, response.code)
   end
 
+  def test_hmac_update_obscure_error
+    urls = [
+     "http://share.kyleneath.com/captures/Testing_-_TestingAppDelegate.m-20110309-142723.png",
+     "http://cdn.shopify.com/s/files/1/0051/4802/products/featured_2.jpg?1287582804"
+    ]
+    urls.each do |url|
+      response = request(url)
+      assert_equal(200, response.code)
+    end
+  end
+
   def test_404s_on_urls_without_an_http_host
     assert_raise RestClient::ResourceNotFound do
       request('/picture/Mincemeat/Pimp.jpg')