awsraw 0.1.5 → 0.1.6

data/lib/awsraw/s3/query_string_signer.rb

@@ -14,16 +14,16 @@ module AWSRaw
     # curl, wget, etc) about all the special AWS headers. The query string
     # authentication method is useful in those cases.
     class QueryStringSigner < Signer
-      def sign_with_query_string(url, expires)
-        query_string_hash = query_string_hash(url, expires)
+      def sign_with_query_string(url, expires, headers = {})
+        query_string_hash = query_string_hash(url, expires, headers)
 
         uri = URI.parse(url)
         uri.query = query_string_hash.map { |k,v| "#{k}=#{v}" }.join("&")
         uri.to_s
       end
 
-      def query_string_hash(url, expires)
-        string_to_sign = string_to_sign(url, expires)
+      def query_string_hash(url, expires, headers = {})
+        string_to_sign = string_to_sign(url, expires, headers)
         signature = encoded_signature(string_to_sign)
 
         {
@@ -33,16 +33,13 @@ module AWSRaw
         }
       end
 
-      def string_to_sign(url, expires)
+      def string_to_sign(url, expires, headers)
         [
           "GET",
-          # Assume user-agent won't send Content-MD5 header
-          "",
-          # Assume user-agent won't send Content-Type header
-          "",
+          headers["Content-MD5"],
+          headers["Content-Type"],
           expires.to_s,
-          # Assume user-agent won't send any amz headers
-          canonicalized_amz_headers({}),
+          canonicalized_amz_headers(headers),
           canonicalized_resource(URI.parse(url))
         ].flatten.join("\n")
       end

data/lib/awsraw/version.rb

@@ -1,3 +1,3 @@
 module Awsraw
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/s3/query_string_signer_spec.rb

@@ -10,8 +10,9 @@ describe AWSRaw::S3::QueryStringSigner do
     it "signs a get request correctly" do
       url = "http://s3.amazonaws.com/johnsmith/photos/puppy.jpg"
       expiry = 1175139620
+      headers = {}
 
-      subject.string_to_sign(url, expiry).should ==
+      subject.string_to_sign(url, expiry, {}).should ==
         "GET\n\n\n#{expiry}\n/johnsmith/photos/puppy.jpg"
 
       subject.query_string_hash(url, expiry).should == {
@@ -27,8 +28,9 @@ describe AWSRaw::S3::QueryStringSigner do
     it "signs a get request to a non-us-east bucket" do
       url = "http://johnsmith.s3.amazonaws.com/photos/puppy.jpg"
       expiry = 1175139620
+      headers = {}
 
-      subject.string_to_sign(url, expiry).should ==
+      subject.string_to_sign(url, expiry, headers).should ==
         "GET\n\n\n#{expiry}\n/johnsmith/photos/puppy.jpg"
 
       subject.query_string_hash(url, expiry).should == {
@@ -41,5 +43,25 @@ describe AWSRaw::S3::QueryStringSigner do
         "http://johnsmith.s3.amazonaws.com/photos/puppy.jpg?AWSAccessKeyId=#{access_key_id}&Expires=#{expiry}&Signature=NpgCjnDzrM%2BWFzoENXmpNDUsSn8%3D"
     end
   end
+
+  context "custom headers" do
+    let(:url) { "http://s3.amazonaws.com/johnsmith/" }
+    let(:expiry) { 1175139620 }
+
+    it "changes the signature based on the Content-MD5 header" do
+      subject.string_to_sign(url, expiry, "Content-MD5" => "deadbeef").should ==
+        "GET\ndeadbeef\n\n#{expiry}\n/johnsmith/"
+    end
+
+    it "changes the signature based on the Content-Type header" do
+      subject.string_to_sign(url, expiry, "Content-Type" => "image/png").should ==
+        "GET\n\nimage/png\n#{expiry}\n/johnsmith/"
+    end
+
+    it "changes the signature based on x-amz-* headers" do
+      subject.string_to_sign(url, expiry, "x-amz-acl" => "public-read").should ==
+        "GET\n\n\n#{expiry}\nx-amz-acl:public-read\n/johnsmith/"
+    end
+  end
 end
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: awsraw
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
+  prerelease: 
 platform: ruby
 authors:
 - Pete Yandell
@@ -10,34 +11,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A client for Amazon Web Services in the style of FlickRaw
@@ -73,26 +78,27 @@ files:
 homepage: http://github.com/envato/awsraw
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: awsraw
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Minimal AWS client
 test_files:
 - spec/s3/client_spec.rb
@@ -101,3 +107,4 @@ test_files:
 - spec/s3/query_string_signer_spec.rb
 - spec/s3/request_spec.rb
 - spec/s3/signer_spec.rb
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 87374bc9711ba8212767836856d7e090f5c3893b
-  data.tar.gz: 65d1a59bfcc0b37ab7a6fb55e2eb5bf789476206
-SHA512:
-  metadata.gz: 7b578a0265a94387760fc5a371f8b77a002449b6f357200c0375bced4b996dd5db4b1963c84ab565facd3a87972d34aae983f391828297eada924c2bd777e9d2
-  data.tar.gz: 6feb80ffd5a50cbe3c6ebdb9de051f8512b9aa44d54a0f2e8506ef4422c379841df7a4cee702d81f37b6d4b394d17ba66a4db51b52c7164b7aba4fb841124a8a