zuora_connect 3.1.4 → 3.1.5.pre.c

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 493dd9cc489602b3f459c2eb71bf944ae8e4d48dd5179a68836e6b6586ce02de
-  data.tar.gz: 79dfe48b44bf8c8fd9f95931ae8d7b9db43d4194cc62172a3ca08778678e003d
+  metadata.gz: 46d27ab8e67bb535b556c6691e8f3e699bede791df15ef15a1017b89044db1f1
+  data.tar.gz: 5bed177dd9a2974e416b344c70060b22239554c60d0ed078907c0069b6eec230
 SHA512:
-  metadata.gz: 887d066e13ff882c1b2a96290d88207359d710a1b87989a5442aa45e152e4312213c936e14adbc6c1b0f11c29edaaf8107803a4733b55684279803ae55e3a2ac
-  data.tar.gz: d774d37dc4adab8073d88521c59bb4d58a994626f81e17c1b9421b9273b56f5f7903c50375614d613c5961846fd0f52de94eb19b58a2d0ec956051668f41b0b0
+  metadata.gz: 72bba22075d8d4990c36206db79ae31683759efa35af50b5338df0b9d93d751e35dbb465a2a399ea512e4b0f9b8fb5e7e5872e2a5f1f2d327b8f7cb427e34f93
+  data.tar.gz: 53233188e104192526968fc1973f065172e82a6cd637e5d5b9bdf3d4102c7dae2cffd150780c71349803872db9b4e46fc3a547c48c3350b0ac7f6dee31c874e3

data/app/controllers/zuora_connect/static_controller.rb

@@ -4,10 +4,9 @@ module ZuoraConnect
     before_action :clear_connect_app_session,        :only =>   [:health, :initialize_app, :provision, :instance_user, :instance_drop]
     after_action :persist_connect_app_session,       :except => [:health, :initialize_app, :provision, :instance_user, :instance_drop]
 
-    skip_before_action :verify_authenticity_token, :only => [:initialize_app, :provision]
+    skip_before_action :verify_authenticity_token, :only => [:initialize_app, :provision, :instance_drop]
     http_basic_authenticate_with name: ENV['PROVISION_USER'], password: ENV['PROVISION_SECRET'], :only => [:provision, :instance_user, :instance_drop]
 
-
     def health
       if params[:error].present?
         begin
@@ -52,6 +51,10 @@ module ZuoraConnect
     end
 
     def provision
+      if ZuoraConnect.configuration.disable_provisioning
+        render(json: { status: 403, message: 'Provisioning is suspended' }, status: 403) && return
+      end
+
       create_new_instance
       unless performed?
         render json: {
@@ -120,25 +123,30 @@ module ZuoraConnect
     end
 
     def instance_drop
-      ZuoraConnect::AppInstance.read_master_db do
-        instance_id = params[:id]
-        @appinstance = ZuoraConnect::AppInstance.find(instance_id)
-        if @appinstance.drop_instance
-          ZuoraConnect::AppInstance.destroy(instance_id)
-          msg = Apartment::Tenant.drop(instance_id)
-
-          if msg.error_message.present?
-            render json: { "message" => msg.error_message }, status: :bad_request
+      host = request.headers.fetch("HOST", nil)
+      if host.present? && ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(host)
+        ZuoraConnect::AppInstance.read_master_db do
+          instance_id = params[:id]
+          @appinstance = ZuoraConnect::AppInstance.find(instance_id)
+          if @appinstance.drop_instance
+            ZuoraConnect::AppInstance.destroy(instance_id)
+            msg = Apartment::Tenant.drop(instance_id)
+
+            if msg.error_message.present?
+              render json: { "message" => msg.error_message }, status: :bad_request
+            else
+              render json: {
+                status: 200,
+                message: 'Success',
+                app_instance_id: instance_id
+              }, status: 200
+            end
           else
-            render json: {
-              status: 200,
-              message: 'Success',
-              app_instance_id: instance_id
-            }, status: 200
+            render json: { "message" => @appinstance.drop_message }, status: :bad_request
           end
-        else
-          render json: { "message" => @appinstance.drop_message }, status: :bad_request
         end
+      else
+        render json: { "message" => "Host #{host} is not internal" }, status: :bad_request
       end
     rescue StandardError => e
       message = 'Failed to drop instance'

data/app/models/zuora_connect/app_instance_base.rb

@@ -516,8 +516,11 @@ module ZuoraConnect
         else
           ZuoraConnect::Exceptions::Error.new("Invalid encryption method '#{encryption_type}'.")
         end
-      rescue ArgumentError => ex
-        if ex.message == 'invalid base64' && encryption_type == :envelope && (kms_tries += 1) < 3
+      rescue ArgumentError, OpenSSL::Cipher::CipherError => ex
+        if (
+          ex.is_a?(ArgumentError) && ['invalid base64'].include?(ex.message) ||
+          ex.is_a?(OpenSSL::Cipher::CipherError) && ['wrong final block length', 'bad decrypt'].include?(ex.message)
+        ) && encryption_type == :envelope && (kms_tries += 1) < 3
           ZuoraConnect.logger.warn("Fallback to encryption 'direct', from '#{encryption_type}'", ex, self.default_ougai_items)
           encryption_type = :direct 
           retry

data/lib/zuora_connect/configuration.rb

@@ -7,7 +7,7 @@ module ZuoraConnect
 
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
 
-    attr_accessor :dev_mode_logins, :dev_mode_options, :dev_mode_mode, :dev_mode_appinstance, :dev_mode_user, :dev_mode_pass, :dev_mode_admin, :dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :insert_migrations, :skip_connect, :encryption_type, :local_task_data
+    attr_accessor :dev_mode_logins, :dev_mode_options, :dev_mode_mode, :dev_mode_appinstance, :dev_mode_user, :dev_mode_pass, :dev_mode_admin, :dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :insert_migrations, :skip_connect, :encryption_type, :local_task_data, :disable_provisioning
 
     def initialize
       @default_locale = :en
@@ -23,6 +23,7 @@ module ZuoraConnect
       @skip_connect = false
       @encryption_type = :direct
       @local_task_data = false
+      @disable_provisioning = false
 
       # Setting the app name for telegraf write
       @enable_metrics = false

data/lib/zuora_connect/controllers/helpers.rb

@@ -446,6 +446,10 @@ module ZuoraConnect
 
             #We have no deployed instance for this tenant
             else
+              if ZuoraConnect.configuration.disable_provisioning
+                raise ZuoraConnect::Exceptions::AccessDenied.new("Provisioning is suspended")
+              end
+
               #Ensure user can access oauth creation API
               if !session["ZuoraCurrentUserInfo"]['permissions'].include?("permission.userManagement")
                 Thread.current[:appinstance] = nil
@@ -579,7 +583,15 @@ module ZuoraConnect
                 zuora_details.merge!({:error => ex.response.body})
               end
               ZuoraConnect.logger.error("UI Authorization Error", ex, zuora: zuora_details)
-              render "zuora_connect/static/error_unhandled", locals: {exception: ex, skip_exception: true}, layout: false, status: 500
+
+              respond_to do |format|
+                format.html {
+                  render "zuora_connect/static/error_unhandled", locals: {exception: ex, skip_exception: true}, layout: false, status: 500
+                }
+                format.js {
+                  render "zuora_connect/static/error_unhandled", locals: {exception: ex, skip_exception: true}, layout: false, status: 500
+                }
+              end
             end
             return
           end
@@ -601,6 +613,10 @@ module ZuoraConnect
           @appinstance = ZuoraConnect::AppInstance.find_by(:id => values["appInstance"].to_i)
 
           if @appinstance.blank?
+            if ZuoraConnect.configuration.disable_provisioning
+              raise ZuoraConnect::Exceptions::AccessDenied.new("Provisioning is suspended")
+            end
+
             Apartment::Tenant.switch!("public")
             begin
               Apartment::Tenant.create(values["appInstance"].to_s)

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.1.4"
+  VERSION = "3.1.5-c"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5.pre.c
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -452,9 +452,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key: