uricp 0.0.30 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a10697c8ebadc4cb158670335272b8b4b4681aac70182c95a6dd2b842587d61a
-  data.tar.gz: a07ca44d72030583442c8e572754aa164498fc8dce625dfde001e107a02b3533
+  metadata.gz: 2b5228be7d35d62611b6e047bbcb950cc790dd900e0df5f4b85dbc81fc484fd2
+  data.tar.gz: 4abb4b519a0293050b61a149a864efe4767ceff27ea8fad63a8bf245084301d1
 SHA512:
-  metadata.gz: 35a87e4afe346283df0838e50c8a57b28893e7841582917ef11ee0eee76b20a0f52941616e78cef35c3b7d8d0ab2db5978d5c4cd338054e36bafabee50d12a82
-  data.tar.gz: fd3c6fda3b1624519abd26dd6bc8a54bda4d615ec098d1fb37cf279ab12640c643323b499f25e1fc811d9a2400fea59c55c4a2f1bcbe8c9ba90c629b73fb1775
+  metadata.gz: a354b1464046bdc6227145c1b8eba717437e9d51ea5d2d236e108ee81a8ac0972a5d3dec987a883eff0fc35d220453ce1afa1fffcc7e3ec3d2b8f97abab85442
+  data.tar.gz: 7f40a3b357f447a6b1f8201c320def28f93772ec9ff63f64a8e4b2dbf08b4a1cbb91ce3aa6a318ede61c43075da791cbc6c18109734828ffb294bc09185c0432

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.30)
+    uricp (0.0.32)
       childprocess (~> 1.0)
       filesize (= 0.0.2)
       methadone (~> 2.0.2)

data/lib/uricp/curl_primitives.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Uricp::CurlPrimitives
+  ORBIT_HOSTS = %w[orbit.brightbox.com orbit.gb1s.brightbox.com]
   attr_reader :options
 
   def from
@@ -24,22 +25,31 @@ module Uricp::CurlPrimitives
   end
 
   def authentication
-    "-H X-Auth-Token:#{options['authenticator'].call}" if http_authentication?
+    "-H 'X-Auth-Token:#{options['authenticator'].call}'" if http_authentication?
   end
 
   def http_authentication?
     options['authenticator']
   end
 
+  def orbit?(source)
+    return unless source.respond_to?(:host)
+    ORBIT_HOSTS.include?(source.host)
+  end
+
+  def temp_url?
+    from && from.query.to_s.include?('temp_url')
+  end
+
   def curl_upload_from(source, destination = to)
-    "#{curl_command} #{authentication} -T #{source} #{destination};"
+    "#{curl_command} #{authentication} -T '#{source}' '#{destination}';"
   end
 
   def curl_download_to_pipe
-    "#{curl_command} #{authentication} #{from} |"
+    "#{curl_command} #{authentication if orbit?(from) && !temp_url?} '#{from}' |"
   end
 
   def curl_manifest(object_manifest, destination = to)
-    "#{curl_command} #{authentication} -X PUT -H 'X-Object-Manifest: #{object_manifest}' #{destination} --data-binary ''"
+    "#{curl_command} #{authentication} -X PUT -H 'X-Object-Manifest: #{object_manifest}' '#{destination}' --data-binary ''"
   end
 end

data/lib/uricp/strategy/piped_remote_get.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'open-uri'
+require 'socket'
 module Uricp::Strategy
   class PipedRemoteGet
     include Uricp::Strategy::Common
@@ -75,7 +76,9 @@ module Uricp::Strategy
 
     def headers
       headers = { 'Range' => 'bytes=0-7' }
-      headers['X-Auth-Token'] = options['authenticator'].call if http_authentication?
+      if http_authentication? && orbit?(from) && !temp_url?
+        headers['X-Auth-Token'] = options['authenticator'].call
+      end
       headers
     end
   end

data/lib/uricp/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Uricp
-  VERSION = '0.0.30'
+  VERSION = '0.0.32'
   DEFAULT_SEGMENT_SIZE = '5 GiB'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.32
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba