Merge branch 'master' into open-source

server.coffee

@@ -82,9 +82,10 @@ server = Http.createServer (req, resp) ->
       digest:   query_digest
     })
 
-    if url.pathname?
+    if url.pathname? && dest_url
       hmac = Crypto.createHmac("sha1", shared_key)
       hmac.update(dest_url)
+
       hmac_digest = hmac.digest('hex')
 
       if hmac_digest == query_digest

test/proxy_test.rb

@@ -94,14 +94,18 @@ def test_404s_on_environmental_excludes
 class CamoProxyQueryStringTest < Test::Unit::TestCase
   include CamoProxyTests
 
-  def request(image_url)
+  def request_uri(image_url)
     hexdigest = OpenSSL::HMAC.hexdigest(
       OpenSSL::Digest::Digest.new('sha1'), config['key'], image_url)
 
     uri = Addressable::URI.parse("#{config['host']}/#{hexdigest}")
     uri.query_values = { 'url' => image_url, 'repo' => '', 'path' => '' }
 
-    RestClient.get(uri.to_s)
+    uri.to_s
+  end
+
+  def request(image_url)
+    RestClient.get(request_uri(image_url))
   end
 end
 
@@ -112,11 +116,14 @@ def hexenc(image_url)
     image_url.to_enum(:each_byte).map { |byte| "%02x" % byte }.join
   end
 
-  def request(image_url)
+  def request_uri(image_url)
     hexdigest = OpenSSL::HMAC.hexdigest(
       OpenSSL::Digest::Digest.new('sha1'), config['key'], image_url)
     encoded_image_url = hexenc(image_url)
-    uri = "#{config['host']}/#{hexdigest}/#{encoded_image_url}"
-    RestClient.get(uri)
+    "#{config['host']}/#{hexdigest}/#{encoded_image_url}"
+  end
+
+  def request(image_url)
+    RestClient.get(request_uri(image_url))
   end
 end