zuora_connect 3.1.3 → 3.1.5.pre.b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 669d11bc2e10ece9fb5f4d014b412739545cf7d17c6858b0588f8d6c566be41e
-  data.tar.gz: a077b09e7c4e5e3bdb10742c99100a11842d6d5bb31ca520a97d44c8e9ac51c0
+  metadata.gz: 299831b3de0ae8c2e95bd85ff682bb0f3cbd52e764b7b00befc0f67bcddf6235
+  data.tar.gz: 6bdb7c237e270176cfe457fcab0f0ce717a92444afd846d1aeb699fdf7369b35
 SHA512:
-  metadata.gz: b043fa5b788040e781843eb2c2f20aba5a7b2d1f8d014e89ac31aa3574a451473dd1d89a08d479f71215f6f386d288e5fdb315316fcf31de8121d39224778d7c
-  data.tar.gz: f151cb64ecddc869299c25f9a1012601ededb097e469fd86a060ca0c8b82e074559df24724600880a8afea9f3995550c9c504af311d1e24248fbdcfaa6013197
+  metadata.gz: 35c5b8515a84e82f797d67eebd74a0964980a044b11692b9055dde639661268d85a6bd20ba1600ad257e1b7fd43c4730bd1cd836334f8b8da51049a5afb60a22
+  data.tar.gz: 33ec657b9790811636763d6706dc41fc8fc29fac14d47c623eff14f7db9438b162533fc3cfcca21154bb2b4c88b79a9541f7d0cb170876572d03220c89291fcc

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 until 2022-08-17' }, 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/config/initializers/redis.rb

@@ -18,10 +18,29 @@ class Redis
   def self.current=(redis)
     @current = redis
   end
+
+  def self.subscriber
+    @subscriber ||= Redis.new
+  end
+
+  def self.subscriber=(redis)
+    @subscriber = redis
+  end
+
+  def self.publisher
+    @publisher ||= Redis.new
+  end
+
+  def self.publisher=(redis)
+    @publisher = redis
+  end
 end
 
 if defined?(Redis.current)
   Redis.current = Redis.new(:id => "#{ZuoraObservability::Env.full_process_name(process_name: 'Redis')}", :url => redis_url, :timeout => 6, :reconnect_attempts => 2)
+  Redis.subscriber = Redis.new(:id => "#{ZuoraObservability::Env.full_process_name(process_name: 'RedisSubscriber')}", :url => redis_url, :timeout => 6, :reconnect_attempts => 2)
+  Redis.publisher = Redis.new(:id => "#{ZuoraObservability::Env.full_process_name(process_name: 'RedisPublisher')}", :url => redis_url, :timeout => 6, :reconnect_attempts => 2)
+
   browser_urls['Redis'] = { "url" => redis_url }
   if defined?(Resque.redis)
     if resque_url != redis_url

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.3"
+  VERSION = "3.1.5-b"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.5.pre.b
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-08-15 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: