workato-connector-sdk 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a456929ee155b6a048f547defcb4f3ccfcdd2172c1e0539ca601d8268bc0060
-  data.tar.gz: 588a1bae54828aa7fb750aaa53ca57336c14693478ac096b810b441008186fde
+  metadata.gz: 3fe38da4979356285b7bd535a889ce87324c0c9e79af94ab64bbfbabff03f104
+  data.tar.gz: 12ae318a25eaf1fddc7c31f22f9870d4af28e736781ef32ff766c32ae14876d2
 SHA512:
-  metadata.gz: 5ab021777798644396d5d910c6d3c6f6ebf7ef23956ca7c3b5e79ec2d01d9f59776ea7afa4cbf8c9d501d18c4fc8142e1d4794e15bb3ade22692a3a95c94e4f4
-  data.tar.gz: e101977c93f1d878cd27c7170e143fbaf7f1221b52d80c489c5ca37915783662bd8571041bae0d4ad75094851ad74f00e6434c331da902d580e9e13098eb21a5
+  metadata.gz: 2737cef0c57c48dc215dba1f3077669935fceb940be5484469e3901f6d848bee8af5bc408595a14a330bc96e3e553f088c25323867dc8d43d1b95930275c79af
+  data.tar.gz: 066b30f5e052e1dbd91c697b3e978ec548f0ffc76db9298168758e4b60f8ada8f1a13c1a603e0603d347e22fcca2e945fa3eeaedaa74139cef07b09b98b7c9ea

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/workato/cli/multi_auth_selected_fallback.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Workato

data/lib/workato/cli/oauth2_command.rb

@@ -1,6 +1,7 @@
 # typed: false
 # frozen_string_literal: true
 
+require 'thor'
 require 'securerandom'
 require 'workato/web/app'
 require_relative './multi_auth_selected_fallback'
@@ -70,7 +71,7 @@ module Workato
       end
 
       def require_gems
-        require 'oauth2'
+        require 'rest-client'
         require 'launchy'
         require 'rack'
       end
@@ -79,7 +80,7 @@ module Workato
         @thread = Thread.start do
           Rack::Handler::WEBrick.run(
             Workato::Web::App.new,
-            {
+            **{
               Port: port,
               BindAddress: options[:ip] || DEFAULT_ADDRESS,
               SSLEnable: https,
@@ -107,7 +108,7 @@ module Workato
         unless connector.connection.authorization.oauth2?
           raise 'Authorization type is not OAuth2. ' \
                 'For multi-auth connector ensure correct auth type was used. ' \
-                "Expected: 'oauth2', got: '#{connector.connection.authorization.type}''"
+                "Expected: 'oauth2', got: '#{connector.connection.authorization.type}'"
         end
       rescue Workato::Connector::Sdk::InvalidMultiAuthDefinition => e
         raise "#{e.message}. Please ensure:\n" \
@@ -116,16 +117,6 @@ module Workato
               'See more: https://docs.workato.com/developing-connectors/sdk/guides/authentication/multi_auth.html'
       end
 
-      def client
-        @client ||= OAuth2::Client.new(
-          connector.connection.authorization.client_id,
-          connector.connection.authorization.client_secret,
-          site: connector.connection.base_uri,
-          token_url: connector.connection.authorization.token_url,
-          redirect_uri: redirect_url
-        )
-      end
-
       def authorize_url
         return @authorize_url if defined?(@authorize_url)
 
@@ -193,7 +184,15 @@ module Workato
           extra_settings ||= {}
           extra_settings.merge(tokens)
         else
-          client.auth_code.get_token(code).to_hash
+          response = RestClient.post(
+            connector.connection.authorization.token_url,
+            code: code,
+            grant_type: :authorization_code,
+            client_id: connector.connection.authorization.client_id,
+            client_secret: connector.connection.authorization.client_secret,
+            redirect_uri: redirect_url
+          )
+          JSON.parse(response.body).to_hash
         end
       end
 

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

@@ -117,7 +117,7 @@ module Workato
           retry_on_response.each { |m| m.is_a?(::Integer) ? @retry_codes << m : @retry_matchers << m }
           @retry_codes = RETRY_DEFAULT_CODES if @retry_codes.empty?
           @retry_methods = (retry_on_request.presence || RETRY_DEFAULT_METHODS).map(&:to_s).map(&:downcase)
-          @retries_left = [[(max_retries.is_a?(::Integer) && max_retries) || MAX_RETRIES, MAX_RETRIES].min, 0].max
+          @retries_left = ((max_retries.is_a?(::Integer) && max_retries) || MAX_RETRIES).clamp(0, MAX_RETRIES)
         end
 
         sig { params(exception: RequestFailedError).returns(T::Boolean) }

data/lib/workato/connector/sdk/dsl/csv_package.rb

@@ -6,7 +6,7 @@ require 'csv'
 module Workato
   module Connector
     module Sdk
-      CsvError = Class.new(Sdk::RuntimeError)
+      CsvError = Class.new(Sdk::Error)
 
       CsvFormatError = Class.new(CsvError)
 
@@ -89,7 +89,7 @@ module Workato
           rescue CSV::MalformedCSVError => e
             raise CsvFormatError, e
           rescue ArgumentError => e
-            raise Sdk::RuntimeError, e.message
+            raise Sdk::ArgumentError, e.message
           end
 
           sig do
@@ -112,7 +112,7 @@ module Workato
 
             ::CSV.generate(str || String.new, **options, &blk)
           rescue ArgumentError => e
-            raise Sdk::RuntimeError, e.message
+            raise Sdk::ArgumentError, e.message
           end
 
           private

data/lib/workato/connector/sdk/dsl/workato_package.rb

@@ -10,14 +10,28 @@ using Workato::Extension::HashWithIndifferentAccess
 module Workato
   module Connector
     module Sdk
+      JSONParsingError = Class.new(Error)
+
       module Dsl
         class WorkatoPackage
-          JWT_ALGORITHMS = %w[RS256 RS384 RS512].freeze
-          private_constant :JWT_ALGORITHMS
+          JWT_RSA_ALGORITHMS = %w[RS256 RS384 RS512].freeze
+          private_constant :JWT_RSA_ALGORITHMS
 
           JWT_RSA_KEY_MIN_LENGTH = 2048
           private_constant :JWT_RSA_KEY_MIN_LENGTH
 
+          JWT_HMAC_ALGORITHMS = %w[HS256].freeze
+          private_constant :JWT_HMAC_ALGORITHMS
+
+          JWT_ECDSA_ALGORITHMS = %w[ES256 ES384 ES512].freeze
+          private_constant :JWT_ECDSA_ALGORITHMS
+
+          JWT_ECDSA_KEY_LENGTH_MAPPING = { 'ES256' => 256, 'ES384' => 384, 'ES512' => 521 }.freeze
+          private_constant :JWT_ECDSA_KEY_LENGTH_MAPPING
+
+          JWT_ALGORITHMS = (JWT_RSA_ALGORITHMS + JWT_HMAC_ALGORITHMS + JWT_ECDSA_ALGORITHMS).freeze
+          private_constant :JWT_ALGORITHMS
+
           VERIFY_RCA_ALGORITHMS = %w[SHA SHA1 SHA224 SHA256 SHA384 SHA512].freeze
           private_constant :VERIFY_RCA_ALGORITHMS
 
@@ -39,37 +53,52 @@ module Workato
           def jwt_encode(payload, key, algorithm, header_fields = {})
             algorithm = algorithm.to_s.upcase
             unless JWT_ALGORITHMS.include?(algorithm)
-              raise "Unsupported signing method. Supports only #{JWT_ALGORITHMS.join(', ')}. Got: '#{algorithm}'"
+              raise Sdk::ArgumentError,
+                    "Unsupported signing method. Supports only #{JWT_ALGORITHMS.join(', ')}. Got: '#{algorithm}'"
             end
 
-            rsa_private = OpenSSL::PKey::RSA.new(key)
-            if rsa_private.n.num_bits < JWT_RSA_KEY_MIN_LENGTH
-              raise "A RSA key of size #{JWT_RSA_KEY_MIN_LENGTH} bits or larger MUST be used with JWT."
+            if JWT_RSA_ALGORITHMS.include?(algorithm)
+              key = OpenSSL::PKey::RSA.new(key)
+              if key.n.num_bits < JWT_RSA_KEY_MIN_LENGTH
+                raise Sdk::ArgumentError,
+                      "A RSA key of size #{JWT_RSA_KEY_MIN_LENGTH} bits or larger MUST be used with JWT"
+              end
+            elsif JWT_ECDSA_ALGORITHMS.include?(algorithm)
+              key = OpenSSL::PKey::EC.new(key)
+              if key.group.order.num_bits != JWT_ECDSA_KEY_LENGTH_MAPPING[algorithm]
+                raise Sdk::ArgumentError,
+                      "An ECDSA key of size #{JWT_ECDSA_KEY_LENGTH_MAPPING[algorithm]} bits MUST be used with JWT"
+              end
             end
 
             header_fields = HashWithIndifferentAccess.wrap(header_fields).except(:typ, :alg)
-            ::JWT.encode(payload, rsa_private, algorithm, header_fields)
+            ::JWT.encode(payload, key, algorithm, header_fields)
+          rescue JWT::IncorrectAlgorithm
+            raise Sdk::ArgumentError, 'Mismatched algorithm and key'
+          rescue OpenSSL::PKey::PKeyError
+            raise Sdk::ArgumentError, 'Invalid key'
           end
 
           def verify_rsa(payload, certificate, signature, algorithm = 'SHA256')
             algorithm = algorithm.to_s.upcase
             unless VERIFY_RCA_ALGORITHMS.include?(algorithm)
-              raise "Unsupported signing method. Supports only #{VERIFY_RCA_ALGORITHMS.join(', ')}. Got: '#{algorithm}'"
+              raise Sdk::ArgumentError,
+                    "Unsupported signing method. Supports only #{VERIFY_RCA_ALGORITHMS.join(', ')}. Got: '#{algorithm}'"
             end
 
             cert = OpenSSL::X509::Certificate.new(certificate)
             digest = OpenSSL::Digest.new(algorithm)
             cert.public_key.verify(digest, signature, payload)
           rescue OpenSSL::PKey::PKeyError
-            raise 'An error occurred during signature verification. Check arguments'
+            raise Sdk::ArgumentError, 'An error occurred during signature verification. Check arguments'
           rescue OpenSSL::X509::CertificateError
-            raise 'Invalid certificate format'
+            raise Sdk::ArgumentError, 'Invalid certificate format'
           end
 
           def parse_yaml(yaml)
             ::Psych.safe_load(yaml)
-          rescue ::Psych::DisallowedClass => e
-            raise e.message
+          rescue ::Psych::Exception => e
+            raise Sdk::ArgumentError, "YAML Parsing error. #{e}"
           end
 
           def render_yaml(obj)
@@ -79,7 +108,7 @@ module Workato
           def parse_json(source)
             JSON.parse(source)
           rescue JSON::ParserError => e
-            raise JSONResponseFormatError, e
+            raise JSONParsingError, e
           end
 
           def uuid
@@ -88,7 +117,7 @@ module Workato
 
           def random_bytes(len)
             unless (len.is_a? ::Integer) && (len <= RANDOM_SIZE)
-              raise "The requested length or random bytes sequence should be <= #{RANDOM_SIZE}"
+              raise Sdk::ArgumentError, "The requested length or random bytes sequence should be <= #{RANDOM_SIZE}"
             end
 
             Types::Binary.new(::OpenSSL::Random.random_bytes(len))
@@ -97,7 +126,7 @@ module Workato
           def aes_cbc_encrypt(string, key, init_vector = nil)
             key_size = key.bytesize * 8
             unless ALLOWED_KEY_SIZES.include?(key_size)
-              raise 'Incorrect key size for AES'
+              raise Sdk::ArgumentError, 'Incorrect key size for AES'
             end
 
             cipher = ::OpenSSL::Cipher.new("AES-#{key_size}-CBC")
@@ -110,7 +139,7 @@ module Workato
           def aes_cbc_decrypt(string, key, init_vector = nil)
             key_size = key.bytesize * 8
             unless ALLOWED_KEY_SIZES.include?(key_size)
-              raise 'Incorrect key size for AES'
+              raise Sdk::ArgumentError, 'Incorrect key size for AES'
             end
 
             cipher = ::OpenSSL::Cipher.new("AES-#{key_size}-CBC")

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

@@ -10,6 +10,8 @@ module Workato
 
       RuntimeError = Class.new(Error)
 
+      ArgumentError = Class.new(Error)
+
       InvalidDefinitionError = Class.new(Error)
 
       class UnexpectedMethodDefinitionError < InvalidDefinitionError

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

@@ -212,7 +212,7 @@ module Workato
           attr_reader :input
 
           class Chunk < T::Struct
-            const :data, T.untyped
+            const :data, T.untyped # rubocop:disable Sorbet/ForbidUntypedStructProps
             const :from, Integer
             const :eof, T::Boolean
             const :next_from, T.nilable(Integer)

data/lib/workato/extension/array.rb

@@ -17,7 +17,7 @@ module Workato
           map { |r| r.to_csv(options) }.join
         else
           options.delete(:multi_line)
-          super(options)
+          super(**options)
         end
       end
 

data/lib/workato/extension/enumerable.rb

@@ -45,8 +45,6 @@ module Enumerable
     nil
   end
 
-  private
-
   def transform_select(&block)
     map do |*items|
       result = block.call(*items)

data/lib/workato/extension/extra_chain_cert.rb

@@ -12,10 +12,10 @@ module Workato
           attr_accessor :extra_chain_cert
 
           def self.included(base)
-            ssl_ivnames = base.const_get('SSL_IVNAMES', false)
+            ssl_ivnames = base.const_get('SSL_IVNAMES', false) # rubocop:disable Sorbet/ConstantsFromStrings
             ssl_ivnames << :@extra_chain_cert unless ssl_ivnames.include?(:@extra_chain_cert)
 
-            ssl_attributes = base.const_get('SSL_ATTRIBUTES', false)
+            ssl_attributes = base.const_get('SSL_ATTRIBUTES', false) # rubocop:disable Sorbet/ConstantsFromStrings
             ssl_attributes << :extra_chain_cert unless ssl_attributes.include?(:extra_chain_cert)
           end
         end

data/lib/workato/extension/metadata_fix_wrap_kw_args.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require 'active_support/messages/metadata'

data/lib/workato/extension/string.rb

@@ -45,8 +45,7 @@ module Workato
       end
 
       def strip_tags
-        @html_full_sanitizer ||= Rails::Html::Sanitizer.full_sanitizer.new
-        @html_full_sanitizer.sanitize(self)
+        Rails::Html::Sanitizer.full_sanitizer.new.sanitize(self)
       end
 
       def to_time(form = :local, format: nil)

data/lib/workato/types/binary.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Workato

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workato-connector-sdk
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Pavel Abolmasov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-09 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,20 +164,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.13.10
-- !ruby/object:Gem::Dependency
-  name: oauth2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement