awsraw 0.1.3 → 0.1.4

data/lib/awsraw/s3/signer.rb

@@ -10,6 +10,7 @@ module AWSRaw
     #
     # See http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAuthentication.html
     class Signer
+      SUBRESOURCES = %w(acl lifecycle location logging notification partNumber policy requestPayment torrent uploadId uploads versionId versioning versions website)
 
       def initialize(access_key_id, secret_access_key)
         @access_key_id     = access_key_id
@@ -56,12 +57,26 @@ module AWSRaw
       end
 
       def canonicalized_resource(request)
-        # TODO: Should also append the sub-resource.
         if request.host =~ /^(.+)\.s3\.amazonaws\.com/
           bucket = request.host.split(/\./).first
-          '/' + bucket + request.path
+          resource = '/' + bucket + request.path
         else
-          request.path
+          resource = request.path
+        end
+        resource + canonicalized_subresource(request)
+      end
+
+      def canonicalized_subresource(request)
+        return "" unless request.query
+        subresources =
+          request.query.split('&')
+            .map { |s| s.split('=') }
+            .select { |k,v| SUBRESOURCES.include? k }
+            .map { |k,v| k + (v ? "=#{v}" : "") }
+        if subresources.any?
+          "?" + subresources.join("&")
+        else
+          ""
         end
       end
 

data/lib/awsraw/version.rb

@@ -1,3 +1,3 @@
 module Awsraw
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/s3/signer_spec.rb

@@ -7,45 +7,67 @@ describe AWSRaw::S3::Signer do
   subject { AWSRaw::S3::Signer.new(access_key_id, secret_access_key) }
 
   context "examples from Amazon docs" do
-    it "signs a get request correctly" do
-      request = stub(
-        :method  => "GET",
-        :host    => "s3.amazonaws.com",
-        :path    => "/johnsmith/photos/puppy.jpg",
-        :headers => { "Date" => "Tue, 27 Mar 2007 19:36:42 +0000" }
-      )
+    context "Example Object GET" do
+      it "signs a get request correctly" do
+        request = stub(
+          :method  => "GET",
+          :host    => "s3.amazonaws.com",
+          :path    => "/johnsmith/photos/puppy.jpg",
+          :query   => nil,
+          :headers => { "Date" => "Tue, 27 Mar 2007 19:36:42 +0000" }
+        )
 
-      subject.string_to_sign(request).should ==
-        "GET\n\n\nTue, 27 Mar 2007 19:36:42 +0000\n/johnsmith/photos/puppy.jpg"
+        subject.string_to_sign(request).should ==
+          "GET\n\n\nTue, 27 Mar 2007 19:36:42 +0000\n/johnsmith/photos/puppy.jpg"
 
-      subject.signature(request).should == "AWS #{access_key_id}:bWq2s1WEIj+Ydj0vQ697zp+IXMU="
-    end
+        subject.signature(request).should == "AWS #{access_key_id}:bWq2s1WEIj+Ydj0vQ697zp+IXMU="
+      end
+
+      it "signs an upload correctly" do
+        request = stub(
+          :method  => "PUT",
+          :host    => "s3.amazonaws.com",
+          :path    => "/static.johnsmith.net/db-backup.dat.gz",
+          :query   => nil,
+          :headers => {
+            "User-Agent"                   => "curl/7.15.5",
+            "Date"                         => "Tue, 27 Mar 2007 21:06:08 +0000",
+            "x-amz-acl"                    => "public-read",
+            "Content-Type"                 => "application/x-download",
+            "Content-MD5"                  => "4gJE4saaMU4BqNR0kLY+lw==",
+            "X-Amz-Meta-ReviewedBy"        => "joe@johnsmith.net,jane@johnsmith.net",
+            "X-Amz-Meta-FileChecksum"      => "0x02661779",
+            "X-Amz-Meta-ChecksumAlgorithm" => "crc32",
+            "Content-Disposition"          => "attachment; filename=database.dat",
+            "Content-Encoding"             => "gzip",
+            "Content-Length"               => "5913339"
+          }
+        )
+
+        subject.string_to_sign(request).should ==
+          "PUT\n4gJE4saaMU4BqNR0kLY+lw==\napplication/x-download\nTue, 27 Mar 2007 21:06:08 +0000\nx-amz-acl:public-read\nx-amz-meta-checksumalgorithm:crc32\nx-amz-meta-filechecksum:0x02661779\nx-amz-meta-reviewedby:joe@johnsmith.net,jane@johnsmith.net\n/static.johnsmith.net/db-backup.dat.gz"
 
-    it "signs an upload correctly" do
-      request = stub(
-        :method => "PUT",
-        :host    => "s3.amazonaws.com",
-        :path   => "/static.johnsmith.net/db-backup.dat.gz",
-        :headers => {
-          "User-Agent"                   => "curl/7.15.5",
-          "Date"                         => "Tue, 27 Mar 2007 21:06:08 +0000",
-          "x-amz-acl"                    => "public-read",
-          "Content-Type"                 => "application/x-download",
-          "Content-MD5"                  => "4gJE4saaMU4BqNR0kLY+lw==",
-          "X-Amz-Meta-ReviewedBy"        => "joe@johnsmith.net,jane@johnsmith.net",
-          "X-Amz-Meta-FileChecksum"      => "0x02661779",
-          "X-Amz-Meta-ChecksumAlgorithm" => "crc32",
-          "Content-Disposition"          => "attachment; filename=database.dat",
-          "Content-Encoding"             => "gzip",
-          "Content-Length"               => "5913339"
-        }
-      )
-
-      subject.string_to_sign(request).should ==
-        "PUT\n4gJE4saaMU4BqNR0kLY+lw==\napplication/x-download\nTue, 27 Mar 2007 21:06:08 +0000\nx-amz-acl:public-read\nx-amz-meta-checksumalgorithm:crc32\nx-amz-meta-filechecksum:0x02661779\nx-amz-meta-reviewedby:joe@johnsmith.net,jane@johnsmith.net\n/static.johnsmith.net/db-backup.dat.gz"
-
-      subject.signature(request).should == "AWS #{access_key_id}:ilyl83RwaSoYIEdixDQcA4OnAnc="
+        subject.signature(request).should == "AWS #{access_key_id}:ilyl83RwaSoYIEdixDQcA4OnAnc="
+      end
     end
 
+    context "Example Fetch" do
+      let(:request) { stub(
+        :method  => "GET",
+        :host    => "johnsmith.s3.amazonaws.com",
+        :path    => "/",
+        :query   => "acl",
+        :headers => { "Date" => "Tue, 27 Mar 2007 19:44:46 +0000" }
+      )}
+
+      it "generates the correct string to sign" do
+        subject.string_to_sign(request).should ==
+          "GET\n\n\nTue, 27 Mar 2007 19:44:46 +0000\n/johnsmith/?acl"
+      end
+
+      it "signs the request correctly" do
+        subject.signature(request).should == "AWS #{access_key_id}:c2WLPFtWHVgbEmeEG93a4cG37dM="
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsraw
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,18 +87,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2102654929379621144
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2102654929379621144
 requirements: []
 rubyforge_project: awsraw
 rubygems_version: 1.8.23
@@ -111,3 +105,4 @@ test_files:
 - spec/s3/md5_digester_spec.rb
 - spec/s3/query_string_signer_spec.rb
 - spec/s3/signer_spec.rb
+has_rdoc: