grempe-amazon-ec2 0.3.3 → 0.3.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+=== 0.3.4 2009-01-31
+ * Added support in the helper binaries for EC2_URL server url for Euro servers
+
+=== 0.3.3 2009-01-24
+  * Removed docs related to the ability to get Response#xml which is deprecated
+  * Fixed conflict when aws/s3 gem was included in user code
+
 === 0.3.2 2008-12-11
  * Updated API version to 2008-12-01
  * Note : The new European EC2 zone should just work if you specify ':server => "eu-west-1.ec2.amazonaws.com"' when initializing EC2::Base.new().  Please report any issues you have with using this new service.

data/README.rdoc

@@ -74,6 +74,12 @@ Edit the file ~/.bash_login and add the following to the existing contents:
   export AMAZON_ACCESS_KEY_ID="YOUR_ACCESS_KEY_ID"
   export AMAZON_SECRET_ACCESS_KEY="YOUR_SECRET_ACCESS_KEY_ID"
 
+If you are using EC2 in the EU region, make sure you also set:
+
+  export EC2_URL="https://eu-west-1.ec2.amazonaws.com"
+
+(which you have already if you configured standard EC2 command line tools to work with this region).
+
 Once you save the file you should close and re-open your terminal so the new variables are made available. You’ll need to do this close/re-open step for each terminal window you have open (or issue the ‘source ~/.bash_login’ command in each). Make sure that this file is only readable by your user so you don’t inadvertently expose your credentials to other users on your system.
 
 You can verify that this setup is complete by running the ‘set’ in a command window and seeing that your credentials are in the list of shell variables.

data/Rakefile

@@ -11,8 +11,9 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
+desc "Package and then install the gem locally"
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM}-#{VERSION}}
+  sh %{sudo gem install pkg/#{GEM}-#{VER}}
 end
 
 Rake::TestTask.new do |t|

data/bin/setup.rb

@@ -10,10 +10,17 @@
 #++
 
 if ENV['AMAZON_ACCESS_KEY_ID'] && ENV['AMAZON_SECRET_ACCESS_KEY']
-  @ec2 = EC2::Base.new(
+  opts = {
     :access_key_id => ENV['AMAZON_ACCESS_KEY_ID'],
     :secret_access_key => ENV['AMAZON_SECRET_ACCESS_KEY']
-  )
+  }
+  if ENV['EC2_URL']
+    opts[:server] = URI.parse(ENV['EC2_URL']).host
+  end
+  @ec2 = EC2::Base.new(opts)
 end
 
+puts "Current Options:"
+pp opts
+
 include EC2

data/lib/EC2.rb

@@ -28,12 +28,24 @@ module EC2
   # from the query string to be signed.
   #   Note:  The parameters in the path passed in must already be sorted in
   #   case-insensitive alphabetical order and must not be url encoded.
-  def EC2.canonical_string(path)
-    buf = ""
-    path.split('&').each { |field|
-      buf << field.gsub(/\&|\?/,"").sub(/=/,"")
-    }
-    return buf
+  def EC2.canonical_string(params, host = DEFAULT_HOST, method="POST", base="/")
+    # Sort, and encode parameters into a canonical string.
+    sorted_params = params.sort {|x,y| x[0] <=> y[0]}
+    encoded_params = sorted_params.collect do |p|
+      encoded = (CGI::escape(p[0].to_s) + 
+                 "=" + CGI::escape(p[1].to_s))
+      # Ensure spaces are encoded as '%20', not '+'
+      encoded.gsub('+', '%20')
+    end
+    sigquery = encoded_params.join("&")
+
+    # Generate the request description string
+    req_desc = 
+      method + "\n" + 
+      host + "\n" + 
+      base + "\n" + 
+      sigquery
+
   end
 
   # Encodes the given string with the secret_access_key, by taking the
@@ -44,7 +56,7 @@ module EC2
     digest = OpenSSL::Digest::Digest.new('sha1')
     b64_hmac =
       Base64.encode64(
-        OpenSSL::HMAC.digest(digest, secret_access_key, str)).strip
+        OpenSSL::HMAC.digest(digest, secret_access_key, str)).gsub("\n","")
 
     if urlencode
       return CGI::escape(b64_hmac)
@@ -152,14 +164,13 @@ module EC2
           params.reject! { |key, value| value.nil? or value.empty?}
 
           params.merge!( {"Action" => action,
-                          "SignatureVersion" => "1",
+                          "SignatureVersion" => "2",
+                          "SignatureMethod" => 'HmacSHA1',
                           "AWSAccessKeyId" => @access_key_id,
                           "Version" => API_VERSION,
                           "Timestamp"=>Time.now.getutc.iso8601} )
 
-          sigquery = params.sort_by { |param| param[0].downcase }.collect { |param| param.join("=") }.join("&")
-
-          sig = get_aws_auth_param(sigquery, @secret_access_key)
+          sig = get_aws_auth_param(params, @secret_access_key)
 
           query = params.sort.collect do |param|
             CGI::escape(param[0]) + "=" + CGI::escape(param[1])
@@ -182,8 +193,8 @@ module EC2
       end
 
       # Set the Authorization header using AWS signed header authentication
-      def get_aws_auth_param(path, secret_access_key)
-        canonical_string =  EC2.canonical_string(path)
+      def get_aws_auth_param(params, secret_access_key)
+        canonical_string =  EC2.canonical_string(params)
         encoded_canonical = EC2.encode(secret_access_key, canonical_string)
       end
 

data/test/test_EC2.rb

@@ -39,9 +39,9 @@ context "The EC2 method " do
   end
 
 
-  specify "EC2.canonical_string(path) should data that is stripped of ?,&,= " do
-    path = "?name1=value1&name2=value2&name3=value3"
-    EC2.canonical_string(path).should.equal "name1value1name2value2name3value3"
+  specify "EC2.canonical_string(path) should conform to Amazon's requirements " do
+    path = {"name1" => "value1", "name2" => "value2", "name3" => "value3"}
+    EC2.canonical_string(path).should.equal "POST\nec2.amazonaws.com\n/\nname1=value1&name2=value2&name3=value3"
   end
 
   specify "EC2.encode should return the expected string" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grempe-amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Glenn Rempe