uricp 0.0.31 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4895addf1e14cf9a918d89e471fe0f30e12189bd942303806590aff1368a294
-  data.tar.gz: 97be8b34f73e4e0070cd6a0f6878a5f7dd9db465d7b5fd236c4497e72f5b83cd
+  metadata.gz: 5646c45d26dfa89933ac2cb28089ac771dff6a43719fcaba2304e741060a0b7f
+  data.tar.gz: 05172e7eab7420dc2b393ad93328d0250c2ae804b4fb3c1707c87e3f11d5180b
 SHA512:
-  metadata.gz: fb45da786826b356a2a95b0764eb7e3d117d0933da0f0729e3473ee4715266217fe642fbe819a87f7b7330809bded5d1f7a92cc39c5c27c8766776577bec19e8
-  data.tar.gz: edc045ffc50f615a1f40ef8d4700c541658095ecef4eee84bbf196071a1e233c165eab0f8dd5c237d56aacbfe30ca7722db8398fd45de5fb46a6718356229368
+  metadata.gz: 9a8830466e53007d4f2459a610978fb458e7771e8bdd7af61a69b502b42247b68f98b50801c900d7798437f4e56d4aadfe5ceeb9d4e946856c5c969b043bb1ac
+  data.tar.gz: 57a7b66754c00b8fd48d4c8149fbbe47357ff9e7033013f9b5f33735c179a7350e1bd815e83ef03d68f8e9323c1615a853fafbe1031ad115f15dd7fa07b89c22

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.31)
+    uricp (0.0.34)
       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
@@ -20,7 +21,7 @@ module Uricp::CurlPrimitives
   end
 
   def curl_command
-    'curl --fail --silent'
+    'curl --fail --silent --location '
   end
 
   def authentication
@@ -31,6 +32,11 @@ module Uricp::CurlPrimitives
     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
@@ -40,7 +46,7 @@ module Uricp::CurlPrimitives
   end
 
   def curl_download_to_pipe
-    "#{curl_command} #{authentication unless temp_url?} '#{from}' |"
+    "#{curl_command} #{authentication if orbit?(from) && !temp_url?} '#{from}' |"
   end
 
   def curl_manifest(object_manifest, destination = to)

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,8 +76,9 @@ module Uricp::Strategy
 
     def headers
       headers = { 'Range' => 'bytes=0-7' }
-      return headers if !http_authentication? || temp_url?
-      headers['X-Auth-Token'] = options['authenticator'].call
+      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.31'
+  VERSION = '0.0.34'
   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.31
+  version: 0.0.34
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba