ruby-manta 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5526525955be143def0033e1f1e72e5a57fe3aef
-  data.tar.gz: b4d4c6a1d8976375027b705e1484419cb4a5daf7
+  metadata.gz: 4ac1cb7a31f6bd034a46082aa48450086999752e
+  data.tar.gz: 6d19bdfbafe9f4a3ccaf820fb4bcbf246aa9cc99
 SHA512:
-  metadata.gz: 931e4b54947627df97a45131e712d10bc641138800d17b6c9fd57c1c137646816cb0709807289284aab9682b841bcb50db70ad58b2a4d31ac89dc27b0dfc4c1a
-  data.tar.gz: 2211861bc3ce04d358aeeb530ec7382e06de454b662f424e64ead06f2bc38c64159fd2fc674bab40534eeb4f753eea52ce209481d4cd179b9d12193e13d168c2
+  metadata.gz: 316e6c5fda31c797fd8b17cecb1726ea252faed34982a193428529bff774c305850cf6cbc9446f30dafc74f658d43b0b955cece8d04fe08b2ce57049c82f0124
+  data.tar.gz: be58ff1da8a33e125b29d509ab33f454cfaa54d2d594c67b46a1470c81ae6171b77d3eb786f8d69f9cb5116555e8c17f28f8aea72f7b2d572ce65c0b22c143f6

data/README.md

@@ -154,9 +154,9 @@ unencrypted key.
 Installation
 ------------
 
-If you're one of the chaps using Ruby 1.9.*, life is easy:
+If you're one of the chaps using Ruby 1.9 or higher, life is easy:
 
-    gem install ruby-manta-1.0.1.gem
+    gem install ruby-manta
 
 Done.
 
@@ -696,11 +696,11 @@ make a request to Manta at the given path. This is typically used to GET
 an object.
 
 expires is a Time object or integer representing time after epoch; this
-determines how long the signed URL will be valid for. The method is the HTTP
-method (:get, :put, :post, :delete) the signed URL is allowed to be used
-for. The path must be a valid object (or directory?) path. Lastly, the
-optional args is an array containing pairs of query args that will be
-appended at the end of the URL.
+determines how long the signed URL will be valid for. The method is either a
+single HTTP method (:get, :put, :post, :delete, :options) or a list of such
+methods that the signed URL is allowed to be used for. The path must start
+with /<user>/stor. Lastly, the optional args is an array containing pairs of
+query args that will be appended at the end of the URL.
 
 The returned URL is signed, and can be used either over HTTP or HTTPS until
 it reaches the expiry date.

data/lib/ruby-manta.rb

@@ -24,6 +24,7 @@ require 'digest'
 require 'time'
 require 'json'
 require 'cgi'
+require 'uri'
 
 require File.expand_path('../version', __FILE__)
 
@@ -37,8 +38,8 @@ class MantaClient
   MAX_LIMIT        = 1000
   HTTP_AGENT       = "ruby-manta/#{LIB_VERSION} (#{RUBY_PLATFORM}; #{OpenSSL::OPENSSL_VERSION}) ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
   HTTP_SIGNATURE   = 'Signature keyId="/%s/keys/%s",algorithm="%s",signature="%s"'
-  OBJ_PATH_REGEX   = Regexp.new('^/.+/(?:stor|public|reports)(?:/|$)')
-  JOB_PATH_REGEX   = Regexp.new('^/.+?/jobs/.+?(?:/live|$)')
+  OBJ_PATH_REGEX   = Regexp.new('^/[^/]+(?:/?$|/stor|/public|/reports|/jobs)(?:/|$)')
+  JOB_PATH_REGEX   = Regexp.new('^/[^/]+/jobs(?:/|$)')
 
   # match one or more protocol and hostnames, with optional port numbers.
   # E.g. "http://example.com https://example.com:8443"
@@ -99,7 +100,7 @@ class MantaClient
       @digest_name = 'dsa-sha1'
       algorithm    = OpenSSL::PKey::DSA
     else
-      raise UnsupportedKeyError
+      raise UnsupportedKey
     end
 
     @priv_key    = algorithm.new(priv_key_data)
@@ -296,10 +297,8 @@ class MantaClient
         return true, result.headers if method == :head
 
         json_chunks = result.body.split("\n")
-        sent_num_entries = result.headers['Result-Set-Size'].to_i
 
-        if (json_chunks.size != sent_num_entries && json_chunks.size != limit) ||
-           json_chunks.size > limit
+        if json_chunks.size > limit
           raise CorruptResult
         end
 
@@ -649,19 +648,20 @@ class MantaClient
 
   # Generates a signed URL which can be used by unauthenticated users to
   # make a request to Manta at the given path. This is typically used to GET
-  # an object.
+  # an object, or to make a CORS preflighted PUT request.
   #
   # expires is a Time object or integer representing time after epoch; this
-  # determines how long the signed URL will be valid for. The method is the HTTP
-  # method (:get, :put, :post, :delete) the signed URL is allowed to be used
-  # for. The path must start with /<user>/stor. Lastly, the optional args is an
-  # array containing pairs of query args that will be appended at the end of
-  # the URL.
+  # determines how long the signed URL will be valid for. The method is either a
+  # single HTTP method (:get, :put, :post, :delete, :options) or a list of such
+  # methods that the signed URL is allowed to be used for. The path must start
+  # with /<user>/stor. Lastly, the optional args is an array containing pairs of
+  # query args that will be appended at the end of the URL.
   #
   # The returned URL is signed, and can be used either over HTTP or HTTPS until
   # it reaches the expiry date.
   def gen_signed_url(expires, method, path, args=[])
-    raise ArgumentError unless [:get, :put, :post, :delete].include? method
+    methods = method.is_a?(Array) ? method : [method]
+    raise ArgumentError unless (methods - [:get, :put, :post, :delete, :options]).empty?
     raise ArgumentError unless path =~ OBJ_PATH_REGEX
 
     key_id = '/%s/keys/%s' % [@user, @fingerprint]
@@ -670,14 +670,17 @@ class MantaClient
     args.push([ 'algorithm', @digest_name ])
     args.push([ 'keyId',     key_id       ])
 
+    method = methods.map {|m| m.to_s.upcase }.sort.join(",")
+    host   = URI.encode(@host.split('/').last)
+    path   = URI.encode(path)
+
+    args.push(['method', method]) if methods.count > 1
+
     encoded_args = args.sort.map do |key, val|
       # to comply with RFC 3986
       CGI.escape(key.to_s) + '=' + CGI.escape(val.to_s)
     end.join('&')
 
-    method = method.to_s.upcase
-    host   = @host.split('/').last
-
     plaintext = "#{method}\n#{host}\n#{path}\n#{encoded_args}"
     signature = @priv_key.sign(@digest, plaintext)
     encoded_signature = CGI.escape(Base64.strict_encode64(signature))
@@ -739,7 +742,7 @@ class MantaClient
   def obj_url(path)
     raise ArgumentError unless path =~ OBJ_PATH_REGEX
 
-    @host + path
+    URI.encode(@host + path)
   end
 
 
@@ -753,7 +756,7 @@ class MantaClient
              args.join('/')
            end
 
-    @host + path
+    URI.encode(@host + path)
   end
 
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 class MantaClient
-  LIB_VERSION = '1.1.0'
+  LIB_VERSION = '1.2.0'
 end

data/ruby-manta.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/version', __FILE__)
 Gem::Specification.new do |s|
   s.name        = 'ruby-manta'
   s.version     = MantaClient::LIB_VERSION
-  s.date        = '2013-06-24'
+  s.date        = '2013-10-24'
   s.summary     = "Interface for Joyent's Manta service."
   s.description = "A simple low-abstraction layer which communicates with Joyent's Manta service." 
   s.authors     = ['Joyent']

data/tests/test_ruby-manta.rb

@@ -178,6 +178,15 @@ class TestMantaClient < MiniTest::Unit::TestCase
 
 
 
+  def test_root_directory
+    result, headers = @@client.list_directory('/' + @@user)
+    assert headers.is_a? Hash
+    assert_equal result.size, 4
+    assert_equal result.map { |r| r['name'] }.sort, ['jobs', 'public', 'reports', 'stor']
+  end
+
+
+
   def test_objects
     result, headers = @@client.put_object(@@test_dir_path + '/obj1', 'foo-data')
     assert_equal result, true
@@ -292,12 +301,25 @@ class TestMantaClient < MiniTest::Unit::TestCase
 
 
   def test_signed_urls
-    @@client.put_object(@@test_dir_path + '/obj1', 'foo-data')
+
+    client = HTTPClient.new
+    
+    put_url = @@client.gen_signed_url(Time.now + 500000, [:put, :options],
+                                      @@test_dir_path + '/obj1')
+
+    result = client.options("https://" + put_url, {
+      'Access-Control-Request-Headers' => 'access-control-allow-origin, accept, content-type',
+      'Access-Control-Request-Method' => 'PUT'
+    })
+
+    assert_equal result.status, 200
+
+    result = client.put("https://" + put_url, 'foo-data', { 'Content-Type' => 'text/plain' })
+    assert_equal result.status, 204
 
     url = @@client.gen_signed_url(Time.now + 500000, :get,
                                   @@test_dir_path + '/obj1')
 
-    client = HTTPClient.new
     result = client.get('http://' + url)
     assert_equal result.body, 'foo-data'
   end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: ruby-manta
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Joyent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.0.1
 description: A simple low-abstraction layer which communicates with Joyent's Manta
@@ -62,12 +62,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []