right_aws 3.0.0 → 3.0.3

data/History.txt

@@ -327,3 +327,15 @@ the source key.
     - SDB: ConsistentRead support
     - bunch of micro bugs
 
+=== 3.0.1
+  Release Notes:
+  - Fixed: 
+    - SignatureDoesNotMatch on file download via get_link()
+    - S3#bucket should not fail for non admin creds
+    - couple doc typos
+
+=== 3.0.2
+  Release Notes:
+  - Fixed:
+    - S3 Content-Type not set in Ruby 1.9.2
+    - error in rds_interface describe_db_snapshots in Ruby 1.9.2

data/lib/acf/right_acf_interface.rb

@@ -126,6 +126,7 @@ module RightAws
         path += "?" + params.to_a.collect{ |key,val| "#{AwsUtils::amz_escape(key)}=#{AwsUtils::amz_escape(val.to_s)}" }.join("&")
       end
       # Headers
+      headers = AwsUtils::fix_headers(headers)
       headers['content-type'] ||= 'text/xml' if body
       headers['date'] = Time.now.httpdate
       # Auth

data/lib/awsbase/right_awsbase.rb

@@ -43,9 +43,10 @@ module RightAws
       Base64.encode64(OpenSSL::HMAC.digest(@@digest1, aws_secret_access_key, auth_string)).strip
     end
 
-    # Escape a string accordingly Amazon rulles
+    # Escape a string accordingly Amazon rules
     # http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/index.html?REST_RESTAuth.html
     def self.amz_escape(param)
+      param = param.flatten.join('') if param.is_a?(Array) # ruby 1.9.x Array#to_s fix
       param.to_s.gsub(/([^a-zA-Z0-9._~-]+)/n) do
         '%' + $1.unpack('H2' * $1.size).join('%').upcase
       end
@@ -66,6 +67,16 @@ module RightAws
       service_hash
     end
 
+    def self.fix_headers(headers)
+      result = {}
+      headers.each do |header, value|
+        next if !header.is_a?(String) || value.nil?
+        header = header.downcase
+        result[header] = value if result[header].right_blank?
+      end
+      result
+    end
+
     # Signature Version 0
     # A deprecated guy (should work till septemper 2009)
     def self.sign_request_v0(aws_secret_access_key, service_hash)

data/lib/awsbase/version.rb

@@ -2,7 +2,7 @@ module RightAws #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 3  unless defined?(MAJOR)
     MINOR = 0  unless defined?(MINOR)
-    TINY  = 0  unless defined?(TINY)
+    TINY  = 3  unless defined?(TINY)
 
     STRING = [MAJOR, MINOR, TINY].join('.') unless defined?(STRING)
   end

data/lib/ec2/right_ec2_images.rb

@@ -162,7 +162,9 @@ module RightAws
     #                       :root_device_name => "/dev/sda1",
     #                       :block_device_mappings => [ { :ebs_snapshot_id=>"snap-7360871a",
     #                                                     :ebs_delete_on_termination=>true,
-    #                                                     :device_name=>"/dev/sda1"} ] }
+    #                                                     :device_name=>"/dev/sda1"},
+    #                                                   { :virtual_name => 'ephemeral0',}
+    #                                                     :device_name=>"/dev/sdb"} ]
     #  ec2.register_image(image_reg_params) #=> "ami-b2a1f7a4"
     #
     def register_image(options)

data/lib/ec2/right_ec2_vpc2.rb

@@ -345,6 +345,7 @@ module RightAws
                     :tags            => {}}
         when %r{/routeSet/item$}       then @route_set       = {}
         when %r{/associationSet/item$} then @association_set = {}
+        when %r{/tagSet/item$}         then @aws_tag = {}
         end
       end
       def tagend(name)

data/lib/route_53/right_route_53_interface.rb

@@ -206,6 +206,7 @@ module RightAws
         path += "?" + params.to_a.collect{ |key,val| "#{AwsUtils::amz_escape(key)}=#{AwsUtils::amz_escape(val.to_s)}" }.join("&")
       end
       # Headers
+      headers = AwsUtils::fix_headers(headers)
       headers['content-type'] ||= 'text/xml' if body
       headers['date']           = Time.now.httpdate
       # Auth

data/lib/s3/right_s3.rb

@@ -97,10 +97,24 @@ module RightAws
     #  (section: Canned Access Policies)
     #
     def bucket(name, create=false, perms=nil, headers={})
-      headers['x-amz-acl'] = perms if perms
-      @interface.create_bucket(name, headers) if create
-      buckets.each { |bucket| return bucket if bucket.name == name }
-      nil
+      result = nil
+      if create
+        headers['x-amz-acl'] = perms if perms
+        @interface.create_bucket(name, headers) 
+      end
+      begin
+        buckets.each do |bucket| 
+          if bucket.name == name 
+            result = bucket
+            break
+          end
+        end
+      rescue RightAws::AwsError => e
+        # With non root creds one can use bucket(s) but can't list them
+        raise e unless e.message['AccessDenied']
+        result = Bucket::new(self, name)
+      end
+      result
     end
     
 

data/lib/s3/right_s3_interface.rb

@@ -78,10 +78,11 @@ module RightAws
       #  
       # Params is a hash:
       #
-      #    {:server       => 's3.amazonaws.com'   # Amazon service host: 's3.amazonaws.com'(default)
-      #     :port         => 443                  # Amazon service port: 80 or 443(default)
-      #     :protocol     => 'https'              # Amazon service protocol: 'http' or 'https'(default)
-      #     :logger       => Logger Object}       # Logger instance: logs to STDOUT if omitted }
+      #    {:server        => 's3.amazonaws.com'   # Amazon service host: 's3.amazonaws.com'(default)
+      #     :port          => 443                  # Amazon service port: 80 or 443(default)
+      #     :protocol      => 'https'              # Amazon service protocol: 'http' or 'https'(default)
+      #     :logger        => Logger Object        # Logger instance: logs to STDOUT if omitted
+      #     :no_subdomains => true}                # Force placing bucket name into path instead of domain name
       #
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
       init({ :name             => 'S3', 
@@ -174,8 +175,8 @@ module RightAws
         # calculate request data
       server, path, path_to_sign = fetch_request_params(headers)
       data = headers[:data]
-        # remove unset(==optional) and symbolyc keys
-      headers.each{ |key, value| headers.delete(key) if (value.nil? || key.is_a?(Symbol)) }
+        # make sure headers are downcased strings
+      headers = AwsUtils::fix_headers(headers)
         #
       headers['content-type'] ||= ''
       headers['date']           = Time.now.httpdate
@@ -851,17 +852,22 @@ module RightAws
     #      Query API: Links
     #-----------------------------------------------------------------
 
+    def s3_link_escape(text)
+      #CGI::escape(text.to_s).gsub(/[+]/, '%20')
+      AwsUtils::amz_escape(text.to_s)
+    end
+    
       # Generates link for QUERY API
     def generate_link(method, headers={}, expires=nil) #:nodoc:
         # calculate request data
       server, path, path_to_sign = fetch_request_params(headers)
-      path_to_sign = CGI.unescape(path_to_sign)
+
         # expiration time
       expires ||= DEFAULT_EXPIRES_AFTER
       expires   = Time.now.utc + expires if expires.is_a?(Fixnum) && (expires < ONE_YEAR_IN_SECONDS)
       expires   = expires.to_i
-        # remove unset(==optional) and symbolyc keys
-      headers.each{ |key, value| headers.delete(key) if (value.nil? || key.is_a?(Symbol)) }
+        # make sure headers are downcased strings
+      headers = AwsUtils::fix_headers(headers)
         #generate auth strings
       auth_string = canonical_string(method, path_to_sign, headers, expires)
       signature   = CGI::escape(AwsUtils::sign( @aws_secret_access_key, auth_string))
@@ -908,7 +914,7 @@ module RightAws
       #  s3.list_bucket_link('my_awesome_bucket') #=> url string
       #
     def list_bucket_link(bucket, options=nil, expires=nil, headers={})
-      bucket += '?' + options.map{|k, v| "#{k.to_s}=#{CGI::escape v.to_s}"}.join('&') unless options.right_blank?
+      bucket += '?' + options.map{|k, v| "#{k.to_s}=#{s3_link_escape(v)}"}.join('&') unless options.right_blank?
       generate_link('GET', headers.merge(:url=>bucket), expires)
     rescue
       on_exception
@@ -919,7 +925,7 @@ module RightAws
       #  s3.put_link('my_awesome_bucket',key, object) #=> url string
       #
     def put_link(bucket, key, data=nil, expires=nil, headers={})
-      generate_link('PUT', headers.merge(:url=>"#{bucket}/#{CGI::escape key}", :data=>data), expires)
+      generate_link('PUT', headers.merge(:url=>"#{bucket}/#{s3_link_escape(key)}", :data=>data), expires)
     rescue
       on_exception
     end
@@ -945,11 +951,11 @@ module RightAws
       #
     def get_link(bucket, key, expires=nil, headers={}, response_params={})
       if response_params.size > 0
-        response_params = '?' + response_params.map { |k, v| "#{k}=#{CGI::escape(v).gsub(/[+]/, '%20')}" }.join('&')
+        response_params = '?' + response_params.map { |k, v| "#{k}=#{s3_link_escape(v)}" }.join('&')
       else
         response_params = ''
       end
-      generate_link('GET', headers.merge(:url=>"#{bucket}/#{CGI::escape key}#{response_params}"), expires)
+      generate_link('GET', headers.merge(:url=>"#{bucket}/#{s3_link_escape(key)}#{response_params}"), expires)
     rescue
       on_exception
     end
@@ -959,7 +965,7 @@ module RightAws
       #  s3.head_link('my_awesome_bucket',key) #=> url string
       #
     def head_link(bucket, key, expires=nil,  headers={})
-      generate_link('HEAD', headers.merge(:url=>"#{bucket}/#{CGI::escape key}"), expires)
+      generate_link('HEAD', headers.merge(:url=>"#{bucket}/#{s3_link_escape(key)}"), expires)
     rescue
       on_exception
     end
@@ -969,7 +975,7 @@ module RightAws
       #  s3.delete_link('my_awesome_bucket',key) #=> url string
       #
     def delete_link(bucket, key, expires=nil, headers={})
-      generate_link('DELETE', headers.merge(:url=>"#{bucket}/#{CGI::escape key}"), expires)
+      generate_link('DELETE', headers.merge(:url=>"#{bucket}/#{s3_link_escape(key)}"), expires)
     rescue
       on_exception
     end
@@ -980,7 +986,7 @@ module RightAws
       #  s3.get_acl_link('my_awesome_bucket',key) #=> url string
       #
     def get_acl_link(bucket, key='', headers={})
-      return generate_link('GET', headers.merge(:url=>"#{bucket}/#{CGI::escape key}?acl"))
+      return generate_link('GET', headers.merge(:url=>"#{bucket}/#{s3_link_escape(key)}?acl"))
     rescue
       on_exception
     end
@@ -990,7 +996,7 @@ module RightAws
       #  s3.put_acl_link('my_awesome_bucket',key) #=> url string
       #
     def put_acl_link(bucket, key='', headers={})
-      return generate_link('PUT', headers.merge(:url=>"#{bucket}/#{CGI::escape key}?acl"))
+      return generate_link('PUT', headers.merge(:url=>"#{bucket}/#{s3_link_escape(key)}?acl"))
     rescue
       on_exception
     end

data/right_aws.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.authors = ['RightScale, Inc.']
   spec.email = 'support@rightscale.com'
   spec.summary = 'Interface classes for the Amazon EC2, SQS, and S3 Web Services'
-  spec.has_rdoc = true
   spec.rdoc_options = ['--main', 'README.txt', '--title', '']
   spec.extra_rdoc_files = ['README.txt']
   spec.required_ruby_version = '>= 1.8.7'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_aws
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 1
   prerelease: 
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 3
+  version: 3.0.3
 platform: ruby
 authors: 
 - RightScale, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-15 00:00:00 Z
+date: 2012-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: right_http_connection
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - libxml-ruby >= 0.5.2.0 is encouraged
 rubyforge_project: rightaws
-rubygems_version: 1.7.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Interface classes for the Amazon EC2, SQS, and S3 Web Services