uricp 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -15,7 +15,7 @@ GEM
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     builder (3.2.2)
-    childprocess (0.5.5)
+    childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
     cucumber (1.3.19)
       builder (>= 2.1.2)

data/bin/segment_upload

@@ -14,6 +14,7 @@ class App
   main do |to_uri,|
     options['auth_uri'] = options['to_uri'] = URI(to_uri)
     options['segment-size'] = Filesize.from(options['segment-size'])
+    puts options.inspect
     Uricp::OrbitAuth.validate_options(options)
     Uricp::OrbitAuth.add_auth_token(options)
     validate_options
@@ -29,7 +30,7 @@ class App
       raise Uricp::UnsupportedURLtype,
         "unsupported url: Can only perform a segmented upload to an HTTP(S) URL"
     end
-    unless options['auth-token']
+    unless options['authenticator']
       raise OptionParser::MissingArgument,
         "Need authentication to proceed - supply 'auth-user' or 'auth-token'"
     end

data/bin/uricp

@@ -20,13 +20,22 @@ class App
     end
     validate_options
     Uricp::OrbitAuth.validate_options(options)
+    set_auth_env
     Uricp::OrbitAuth.add_auth_token(options)
-    ENV['URICP'] = "--auth-token='#{options['auth-token']}'"
     add_cache_name
     add_temp_area
     run_command
   end
 
+  def self.set_auth_env
+    cla = ""
+    cla << "--auth-user='#{options['auth-user']}' " if options['auth-user']
+    cla << "--auth-key='#{options['auth-key']}' " if options['auth-key']
+    cla << "--auth-token='#{options['auth-token']}' " if options['auth-token']
+    ENV['URICP'] = cla unless cla.empty?
+    debug "#{self.name} Environment Command Line Args are: #{ENV['URICP']}"
+  end
+
   def self.run_command
     command_list = build_command
     if options['dry-run']

data/features/segmented_upload.feature

@@ -26,3 +26,8 @@ Feature: Segmented Upload Command
     Then a 102400 byte entry should exist in container "temp_dlo" called "img-testb"
     And the container "temp_dlo" should contain 11 entries
 
+  Scenario: Create DLO with bad token and fail
+    Given a 102400 byte file named "/tmp/uricp/srv-testc"
+    When I upload "img-testc" with segment size "10kib" into container "temp_dlo" from "/tmp/uricp/srv-testc" with token "abcdef"
+    Then the exit status should not be 0
+    And the stderr should contain "failed"

data/features/segmented_upload_options.feature

@@ -3,6 +3,9 @@ Feature: Documented Help for Segmented Upload
   As a command line user
   I want to get detailed usage information
 
+  Background:
+    Given the default aruba timeout is 15 seconds
+
   Scenario: Basic UI
     When I get help for "segment_upload"
     Then the exit status should be 0
@@ -45,12 +48,12 @@ Feature: Documented Help for Segmented Upload
     And the stderr should contain "unsupported url"
 
   Scenario: authentication with normal http should fail
-    When I run `segment_upload --auth-user cli-xxxxx --auth-key fred http://orbit.brightbox.com/v1/acc-tqs4c/downloads`
+    When I run `segment_upload --from /dev/null --auth-user cli-xxxxx --auth-key fred http://orbit.brightbox.com/v1/acc-tqs4c/downloads`
     Then the exit status should not be 0
     And the stderr should contain "Cannot authenticate"
 
   Scenario: bad authentication should fail against orbit
-    When I run `segment_upload --auth-user cli-xxxxx --auth-key fred https://orbit.brightbox.com/v1/acc-xxxxx/test/test.img`
+    When I run `segment_upload --from /dev/null --auth-user cli-xxxxx --auth-key fred https://orbit.brightbox.com/v1/acc-xxxxx/test/test.img`
     Then the exit status should not be 0
     And the stderr should contain "Cannot authenticate"
 
@@ -60,6 +63,6 @@ Feature: Documented Help for Segmented Upload
     And the stderr should contain "Unparseable filesize"
 
   Scenario: should trap attempts to open a command
-    When I run `segment_upload --segment-size 100MB --auth-token abcdef --from ' |fred' https:///orbit.brightbox.com/v1/acc-xxxxx/test/test.img`
+    When I run `segment_upload --segment-size 100MB --auth-token abcdef --from ' |fred' https://orbit.brightbox.com/v1/acc-xxxxx/test/test.img`
     Then the exit status should not be 0
     And the stderr should contain "invalid argument"

data/features/step_definitions/orbit_steps.rb

@@ -145,6 +145,15 @@ When(/^I upload "([^"]*)" with segment size "([^"]*)" into container "([^"]*)" f
   }
 end
 
+When(/^I upload "([^"]*)" with segment size "([^"]*)" into container "([^"]*)" from "([^"]*)" with token "([^"]*)"$/) do |name, segment_size, container, source, token|
+  @current_container = container
+  @current_name = name
+  url = File.join(@current_storage_url, container, name)
+  steps %{
+    When I run `segment_upload --from #{source} --auth-token #{token} --segment-size #{segment_size} #{url}`
+  }
+end
+
 When(/^I upload "([^"]*)" with segment size "([^"]*)" into container "([^"]*)" from "([^"]*)" as a stream$/) do |name, segment_size, container, source|
   @current_container = container
   @current_name = name

data/lib/uricp/curl_primitives.rb

@@ -23,11 +23,11 @@ module Uricp::CurlPrimitives
     end
 
     def authentication
-      "-H X-Auth-Token:#{options['auth-token']}" if http_authentication?
+      "-H X-Auth-Token:#{options['authenticator'].call}" if http_authentication?
     end
 
     def http_authentication?
-      options['auth-token']
+      options['authenticator']
     end
 
     def curl_upload_from(source, destination = to)

data/lib/uricp/orbit_auth.rb

@@ -6,19 +6,23 @@ module Uricp
     AuthenticationFailure = Class.new(ArgumentError)
 
     def initialize(auth_uri, auth_id, auth_key)
-      auth_uri.open(
-        'X-Auth-User' => auth_id,
-	'X-Auth-Key' => auth_key,
-	'Range' => 'bytes=0-0'
-      ) do |uri|
-        @storage_url = uri.meta['x-storage-url']
-	@token = uri.meta['x-auth-token']
-      end
-    rescue OpenURI::HTTPError => e
-      raise AuthenticationFailure, "Cannot authenticate against #{auth_uri}"
+      @auth_uri = auth_uri
+      @auth_id = auth_id
+      @auth_key = auth_key
+    end
+
+    def storage_url
+      @storage_url ||
+        begin
+	  authenticate
+	  @storage_url
+	end
     end
 
-    attr_reader :storage_url, :token
+    def token
+      authenticate
+      @token
+    end
 
     def self.validate_options(options)
       if options['auth-token'] && (options['auth-key'] || options['auth-user'])
@@ -39,10 +43,14 @@ module Uricp
       if options['auth-user']
 	orbit_credentials = self.new(options['auth_uri'],
 			      options['auth-user'], options['auth-key'])
-	options['auth-token'] = orbit_credentials.token
-	options.delete('auth-key')
-	options.delete('auth-user')
+	options['authenticator'] = orbit_credentials.method(:token)
+      elsif options['auth-token']
+        orbit_token = options['auth-token']
+        options['authenticator'] = lambda { orbit_token }
       end
+      options.delete('auth-key')
+      options.delete('auth-user')
+      options.delete('auth-token')
     end
 
     def self.add_auth_to_optionparser(app)
@@ -54,6 +62,21 @@ module Uricp
 	"Use AUTH_KEY for authentication")
     end
 
+  private
+
+    def authenticate
+      @auth_uri.open(
+        'X-Auth-User' => @auth_id,
+	'X-Auth-Key' => @auth_key,
+	'Range' => 'bytes=0-0'
+      ) do |uri|
+        @storage_url = uri.meta['x-storage-url']
+	@token = uri.meta['x-auth-token']
+      end
+    rescue OpenURI::HTTPError => e
+      raise AuthenticationFailure, "Cannot authenticate against #{@auth_uri}"
+    end
+
   end
 
 end

data/lib/uricp/strategy/piped_remote_get.rb

@@ -43,7 +43,7 @@ module Uricp::Strategy
 
     def headers
       headers={'Range' => 'bytes=0-7'}
-      headers['X-Auth-Token'] = options['auth-token'] if http_authentication?
+      headers['X-Auth-Token'] = options['authenticator'].call if http_authentication?
       headers
     end
 

data/lib/uricp/version.rb

@@ -1,4 +1,4 @@
 module Uricp
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
   DEFAULT_SEGMENT_SIZE = "5 GiB"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler