files.com 1.1.744 → 1.1.745

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8af62f099ab3fe1820b5ff20e5dc202bee1a742c42505961cd9d00c7c894d66
-  data.tar.gz: 337cc2a388ec0cc310a9fe9473906ce64eeaa20bd8a17ea74b9c2dc1a43f6ef8
+  metadata.gz: 76561ada788c8c00625ff151cad4800e0e9d8d6daf4acd434baa34b7d28be212
+  data.tar.gz: e063b0dcec5148771d97c8cca16cd090c307fff2b55a5c7cfa16942460ad9546
 SHA512:
-  metadata.gz: c30b00f9b88d92ea33ba15f91cf370478862dce94240b2118027294efeb76a24885a0f100cfb7ee6771e51ff3c84d0bb2f20edd688bb7972ba72178db7e8ffda
-  data.tar.gz: 8a559215377d6c771e06610d57ac45e29d30ee1a0a7c51945a77ee620e650a450892964060de75d255cdf21610969116e5adaa9df35a5983507d9c48598db27d
+  metadata.gz: b4cf0e52efc0fe229a2564bd784c579b4220a69cef0a493d6e8acaf20a4084cad8d99ffa36e073ec01e73242939119ee6fc241316fde6c0c706df5cfda9fac2d
+  data.tar.gz: 5e6a9e900cb910d8a17218adc1ee61d2a7308b68620e9111bc8f1e424f3a0ba80c26d064617a8d840c63574ba5879444865dca534f318d67d7c339506576cff1

data/_VERSION

@@ -1 +1 @@
-1.1.744
+1.1.745

data/lib/files.com/api_client.rb

@@ -150,9 +150,10 @@ module Files
     def remote_request(method, url, headers = {}, body = nil)
       context = RequestLogContext.new
       context.method       = method
-      context.path         = url
+      context.path         = "[transfer]"
+      Util.log_debug("Transfer request", method: method, url: url)
 
-      execute_request_with_rescues(Files.base_url, context, skip_body_logging: true) do
+      execute_request_with_rescues(Files.base_url, context, skip_body_logging: true, is_transfer: true) do
         conn.run_request(method, url, body, headers) do |req|
           req.options.open_timeout = Files.open_timeout
           req.options.timeout = Files.read_timeout
@@ -215,7 +216,7 @@ module Files
       raise AuthenticationError, "The provided Session ID is invalid (it contains whitespace)"
     end
 
-    def execute_request_with_rescues(base_url, context, skip_body_logging: false)
+    def execute_request_with_rescues(base_url, context, skip_body_logging: false, is_transfer: false)
       num_retries = 0
       begin
         request_start = Time.now
@@ -240,14 +241,18 @@ module Files
           retry
         end
 
+        Util.log_debug("Transfer error details", error_message: e.message) if is_transfer
+
         case e
         when Faraday::ClientError, Faraday::ServerError
           if e.response and has_error_type?(e)
-            handle_error_response(e.response, error_context)
+            handle_error_response(e.response, error_context, is_transfer: is_transfer)
           else
-            handle_network_error(e, error_context, num_retries, base_url)
+            handle_network_error(e, error_context, num_retries, base_url, is_transfer: is_transfer)
           end
         else
+          raise e.exception("Transfer request failed (#{e.class})"), cause: nil if is_transfer
+
           raise
         end
       end
@@ -266,7 +271,7 @@ module Files
       str
     end
 
-    private def handle_error_response(http_resp, context)
+    private def handle_error_response(http_resp, context, is_transfer: false)
       begin
         resp = Response.from_faraday_hash(http_resp)
         error_data = resp.data[:error] || resp.data[:errors]
@@ -275,17 +280,22 @@ module Files
 
         raise Error, "Unknown error" unless error_data
       rescue JSON::ParserError, Error
+        raise APIError.new("Transfer request failed", http_status: http_resp[:status]), cause: nil if is_transfer
+
         raise general_api_error(http_resp[:status], http_resp[:body])
       end
 
-      error = specific_api_error(resp, error_data, context)
+      error = specific_api_error(resp, error_data, context, is_transfer: is_transfer)
 
       error.response = resp
-      raise(error)
+      raise error, cause: nil if is_transfer
+
+      raise error
     end
 
-    private def specific_api_error(resp, error_data, _context)
-      Util.log_error("API error", status: resp.http_status, error_message: error_data[:message])
+    private def specific_api_error(resp, error_data, _context, is_transfer: false)
+      message = is_transfer ? "Transfer request failed" : error_data[:message]
+      Util.log_error("API error", status: resp.http_status, error_message: message)
 
       opts = {
         http_body: resp.http_body,
@@ -295,28 +305,34 @@ module Files
         code: error_data[:code] || resp.http_status,
       }
 
-      return APIError.new(error_data[:message], **opts) unless resp&.data&.dig(:type)
+      return APIError.new(message, **opts) unless resp&.data&.dig(:type)
 
       begin
         error_type = resp.data[:type].split("/").last
         error_class_name = "#{error_type.split("-").map(&:capitalize).join}Error"
         error_class = Files.const_get(error_class_name)
-        error_class.new(error_data[:message], **opts)
+        error_class.new(message, **opts)
       rescue NameError
-        APIError.new(error_data[:message], **opts)
+        APIError.new(message, **opts)
       end
     end
 
-    private def handle_network_error(error, _context, num_retries, base_url = nil)
+    private def handle_network_error(error, _context, num_retries, base_url = nil, is_transfer: false)
       base_url ||= Files.base_url
 
-      error_message = error.message.empty? ? error.response[:body] : error.message
+      error_message = if is_transfer
+                        error.class.name
+                      else
+                        error.message.empty? ? error.response[:body] : error.message
+                      end
 
       Util.log_error("Network error", error_message: error_message)
       message = "Could not connect to Files.com at URL #{base_url}. Please check your internet connection and try again. If this problem persists, you should check Files.com's service status at https://status.files.com, or contact your primary account representative."
       message += " Request was retried #{num_retries} times." if num_retries > 0
       message += "\n\n(Network error: #{error_message})"
 
+      raise APIConnectionError, message, cause: nil if is_transfer
+
       raise APIConnectionError, message
     end
 
@@ -372,7 +388,8 @@ module Files
     end
 
     private def log_response_error(context, request_start, error)
-      Util.log_error("Error", elapsed: Time.now - request_start, error_message: error.message, method: context.method, path: context.path)
+      Util.log_error("Error", elapsed: Time.now - request_start, error_type: error.class, method: context.method, path: context.path)
+      Util.log_debug("Error details", error_message: error.message)
     end
 
     class RequestLogContext

data/lib/files.com/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Files
-  VERSION = "1.1.744"
+  VERSION = "1.1.745"
 end

data/spec/lib/api_client_spec.rb

@@ -3,6 +3,67 @@ require "spec_helper"
 RSpec.describe Files::ApiClient do
   let(:subject) { described_class.new }
 
+  describe "signed transfer privacy" do
+    it "keeps API error types without echoing a transfer URL" do
+      url = "https://transfer.example.test/private-part?signature=secret"
+      output = StringIO.new
+      original_logger = Files.logger
+      Files.logger = Logger.new(output, level: Logger::INFO)
+      connection = Faraday.new do |builder|
+        builder.response :raise_error
+        builder.adapter :test do |stub|
+          stub.put(url) { [ 404, {}, { type: "not-found", error: url }.to_json ] }
+        end
+      end
+
+      expect { described_class.new(connection).remote_request(:put, url, {}, "part") }.to raise_error(Files::NotFoundError) { |error|
+        expect(error.http_status).to eq(404)
+        expect(error.full_message).not_to include(url, "private-part", "secret")
+      }
+      expect(output.string).not_to include(url, "private-part", "secret")
+    ensure
+      Files.logger = original_logger
+    end
+
+    it "keeps the URL out of normal logs and errors while retaining retries and debug details" do
+      url = "https://transfer.example.test/private-part?X-Amz-Credential=credential&X-Amz-Signature=signature"
+      original_logger = Files.logger
+      original_retries = Files.max_network_retries
+      original_delay = Files.initial_network_retry_delay
+      Files.max_network_retries = 1
+      Files.initial_network_retry_delay = 0
+
+      [ Logger::INFO, Logger::DEBUG ].each do |level|
+        output = StringIO.new
+        Files.logger = Logger.new(output, level: level)
+        attempts = 0
+        connection = Faraday.new do |builder|
+          builder.adapter :test do |stub|
+            stub.put(url) do
+              attempts += 1
+              raise Faraday::ConnectionFailed, "connection reset for #{url}"
+            end
+          end
+        end
+
+        expect { described_class.new(connection).remote_request(:put, url, {}, "part") }.to raise_error(Faraday::ConnectionFailed) { |error|
+          expect(error.full_message).not_to include(url, "private-part", "credential", "signature")
+        }
+        expect(attempts).to eq(2)
+        if level == Logger::INFO
+          expect(output.string).to include("Request", "Error")
+          expect(output.string).not_to include(url, "private-part", "credential", "signature")
+        else
+          expect(output.string).to include(url, "connection reset")
+        end
+      end
+    ensure
+      Files.logger = original_logger
+      Files.max_network_retries = original_retries
+      Files.initial_network_retry_delay = original_delay
+    end
+  end
+
   describe "#execute_request_with_rescues" do
     let(:context) { double('context', method: 'some method', path: 'some path') }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: files.com
 version: !ruby/object:Gem::Version
-  version: 1.1.744
+  version: 1.1.745
 platform: ruby
 authors:
 - files.com