workato-connector-sdk 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab098bba65e812d5ec811d584358c98d6d51e42433019af516a7cff3d1817e1d
-  data.tar.gz: 4433f811d9d144826a40868958a4c783fd18ab6834b230b5332d0b7fc7f6dfac
+  metadata.gz: dc61d331c5e90aefecdbb3f336ae69937bb29b68f7bd7719d81bcdb5c3c86bd9
+  data.tar.gz: b229cca847d63f6e209f84d10e82aa63fda5b87408f4af80c0c5608f2bc42654
 SHA512:
-  metadata.gz: bded379a7c421201fb92a51db40cc7b4d14e35f84c28bfd42cb26259aba4d1e1f0e99c49793ea84df2dc4adce0564e643aa01f5bc2b42990ee66a5a4fd58efbb
-  data.tar.gz: bec9736d31ebf8d492924e54e3b4e255d6672a6eb059dfcdcb604d968c876bddfd9512d553aff5a6b01bb36c9025d1496b0062315381b97f4130cfe71efa51a3
+  metadata.gz: 5c235fca45159067ee8a175893692d739b4ad484f25538a6791e2a4f09fec895e719b6cbfb2159be790427f29226cea9be018d460679cafff1aa81416d9f8e14
+  data.tar.gz: 95d48a7b47e8dde25b95491594914a1f3a4e932c92edbaa94c98f6a80621b4c536b259465f46af21f5d634a1a18c021b9453e4b44b9f0ea0522a13db9a239ad7

data/VERSION

@@ -1 +1 @@
-1.3.8
+1.3.9

data/lib/workato/connector/sdk/errors.rb

@@ -14,6 +14,8 @@ module Workato
 
       InvalidDefinitionError = Class.new(Error)
 
+      InvalidURIError = Class.new(Error)
+
       class UnexpectedMethodDefinitionError < InvalidDefinitionError
         attr_reader :name
         attr_reader :definition

data/lib/workato/connector/sdk/request.rb

@@ -21,12 +21,14 @@ module Workato
 
         using BlockInvocationRefinements
 
+        ALLOWED_URI_TYPES = [URI::Generic, String].freeze
+        private_constant :ALLOWED_URI_TYPES
+
         def initialize(uri, method: 'GET', connection: nil, action: nil)
           super(nil)
           @uri = uri
           @method = method
           @connection = connection
-          @base_uri = connection&.base_uri(connection&.settings || {})
           @action = action
           @headers = {}
           @case_sensitive_headers = {}
@@ -273,6 +275,8 @@ module Workato
             begin
               request = RestClientRequest.new(rest_request_params)
               response = execute_request(request)
+            rescue URI::InvalidURIError => e
+              Kernel.raise(InvalidURIError, e.message)
             rescue RestClient::Unauthorized => e
               Kernel.raise e unless @digest_auth
 
@@ -331,8 +335,18 @@ module Workato
         end
 
         def build_url
-          uri = if @base_uri
-                  merge_uris(@base_uri, @uri)
+          uri = if (base_uri = @connection&.base_uri)
+                  unless valid_uri?(@uri)
+                    raise_invalid_uri_error(
+                      "Expected String or URI as request URL, got: #{@uri.class.name}"
+                    )
+                  end
+                  unless valid_uri?(base_uri)
+                    raise_invalid_uri_error(
+                      "Expected String or URI as output of base_uri lambda, got: #{base_uri.class.name}"
+                    )
+                  end
+                  merge_uris(base_uri, @uri)
                 else
                   URI.parse(@uri)
                 end
@@ -357,6 +371,14 @@ module Workato
           uri.to_s
         end
 
+        def valid_uri?(path)
+          ALLOWED_URI_TYPES.any? { |type| path.is_a?(type) }
+        end
+
+        def raise_invalid_uri_error(message)
+          Kernel.raise(InvalidURIError, message)
+        end
+
         def merge_uris(uri1, uri2)
           (uri1.is_a?(::String) ? URI.parse(uri1) : uri1).merge(uri2)
         end
@@ -549,6 +571,23 @@ module Workato
             net.extra_chain_cert = ssl_extra_chain_cert if ssl_extra_chain_cert
             net
           end
+
+          private
+
+          def parse_url_with_auth!(url)
+            # Fix Ruby 2.7 vs 3.0 incompatibility
+            # In ruby 2.7 URI.parse("http:///foo/bar").hostname returns nil
+            # In ruby 3.0 URI.parse("http:///foo/bar").hostname returns ""
+            uri = URI.parse(url)
+
+            if uri.hostname.nil? || uri.hostname.empty?
+              raise URI::InvalidURIError, "bad URI(no host provided): #{url}"
+            end
+
+            super
+          rescue ArgumentError => e
+            raise URI::InvalidURIError, "Invalid URL: #{e.message}"
+          end
         end
 
         private_constant :RestClientRequest

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workato-connector-sdk
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Pavel Abolmasov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2023-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport