zuora_connect 3.1.5 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce9871a6d530d5d0146cf591445fd21ec4f1cba986944b8b966ddc493c5f1a1
-  data.tar.gz: db1756a9a29035a6180ce3370021432a6b255567b8aeaea1eb36ad3f25651ff6
+  metadata.gz: d04a0fdede87007e236c944ed42bfc822846276fce78a310d22bb89961ed6bee
+  data.tar.gz: fe5e370e36988531ff42f08e493a39118a9e0de078e3334df9c1a3c79ad3460f
 SHA512:
-  metadata.gz: aea09cd52f629f8feb5a57a2e200040ad0371a64086c15a662f3408f77ef930211dceb2b01ebbfecc7ca437f268b262a60f52f05d43a3b0ca17e830db72a7e63
-  data.tar.gz: b324ac9bd0f233b04e641efafc2e62e4344218c84f99005fbe67a31a301ececb56411966b67b7a7333ee6581500ee72af4780aea6fa7c58dc15abd60c29c8169
+  metadata.gz: c8836d2516b37c25dce916ed9f976a5bff9456254378301d7a2d5ca457b6d6fc778eb28a7d73d0c16f27f1adc683c12610f8f5b60461a962abae682a7e8d4a7c
+  data.tar.gz: e8f4bff78c8fd8160f5a681743cdefe108d0b9a8a3e4e1e6c96fc72b9990e13c27800d91e8dc3b23db008425d23d5d7d3c53f1473300f5d817dda38e48998332

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,4 +1,5 @@
 module ZuoraConnect
+  require "resolv"
   class StaticController < ApplicationController
     before_action :authenticate_connect_app_request, :except => [:health, :initialize_app, :provision, :instance_user, :instance_drop]
     before_action :clear_connect_app_session,        :only =>   [:health, :initialize_app, :provision, :instance_user, :instance_drop]
@@ -51,6 +52,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,7 +125,7 @@ module ZuoraConnect
 
     def instance_drop
       host = request.headers.fetch("HOST", nil)
-      if host.present? && ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(host)
+      if host.present? && (ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(host) || host =~ Resolv::IPv4::Regex)
         ZuoraConnect::AppInstance.read_master_db do
           instance_id = params[:id]
           @appinstance = ZuoraConnect::AppInstance.find(instance_id)

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', 'data must not be empty'].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/app/models/zuora_connect/zuora_user.rb

@@ -3,7 +3,7 @@ module ZuoraConnect
     self.table_name = "zuora_users"
     attr_accessor :session
 
-    cattr_accessor :current_user_id
+    cattr_accessor :current_user_id, :current_org_id, :current_org_child_org_ids
 
     # zuora_user_id/zuora_entity_id both come from cookie or headers
     # zuora_current_identity comes from session

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

@@ -227,6 +227,39 @@ module ZuoraConnect
         return (request.headers['ZuoraCurrentEntity'].present? || cookies['ZuoraCurrentEntity'].present?)
       end
 
+      def org_relation_mapping(root_org_relation)
+        relation = {}
+
+        return relation if root_org_relation.blank?
+
+        root_org_id = root_org_relation.dig(0, 'rootOrgId')
+        relation[root_org_id] = []
+
+        root_org_relation.each do |child_org|
+          relation[child_org['id']] = []
+        end
+
+        root_org_relation.each do |child_org|
+          parent_org_id = child_org['parentOrgId']
+          relation[parent_org_id].push(child_org['id'])
+        end
+
+        relation
+      end
+
+      def get_child_orgs_from_relation_mapping(relation_mapping, org_id)
+        if relation_mapping.blank? || org_id.blank? || relation_mapping[org_id].blank?
+          return []
+        end
+
+        child_orgs = relation_mapping[org_id].dup
+        relation_mapping[org_id].each do |child_org_id|
+          child_orgs += get_child_orgs_from_relation_mapping(relation_mapping, child_org_id)
+        end
+
+        child_orgs
+      end
+
       def create_new_instance
         ZuoraConnect::AppInstance.read_master_db do
           Thread.current[:appinstance] = nil
@@ -446,6 +479,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
@@ -553,6 +590,58 @@ module ZuoraConnect
               session["appInstance"] = @appinstance.id
             end
 
+            zuora_org_id = cookies['Zuora-Org-Id'] || request.headers['Zuora-Org-Id']
+            zuora_return_nested_orgs_data =
+              cookies['Zuora-Return-Nested-Orgs-Data'].to_bool ||
+                request.headers['Zuora-Return-Nested-Orgs-Data'].to_bool
+            ZuoraConnect::ZuoraUser.current_org_id = zuora_org_id
+            ZuoraConnect::ZuoraUser.current_org_child_org_ids = []
+
+            if zuora_org_id.present? && zuora_return_nested_orgs_data
+              cached_org_relationship = Redis.current.get("MultiOrgRelationship:#{@appinstance.id}")
+
+              if cached_org_relationship.present?
+                cached_org_relationship = JSON.parse(cached_org_relationship)
+                ZuoraConnect::ZuoraUser.current_org_child_org_ids =
+                  get_child_orgs_from_relation_mapping(cached_org_relationship, ZuoraConnect::ZuoraUser.current_org_id)
+              else
+                child_org_list, _ =
+                  zuora_client.rest_call(
+                    url: zuora_client.
+                      rest_endpoint("tenant-registry/listChildOrgsForOrg/#{ZuoraConnect::ZuoraUser.current_org_id}").
+                      gsub('v1/', ''),
+                    session_type: zuora_client.is_a?(ZuoraAPI::Oauth) ? :bearer : :basic,
+                    headers: auth_headers,
+                    zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id
+                  )
+
+                root_org_id = (child_org_list || {}).dig(0, 'rootOrgId').to_s
+                if root_org_id.present?
+                  root_child_org_list, _ =
+                    zuora_client.rest_call(
+                      url: zuora_client.
+                        rest_endpoint("tenant-registry/listChildOrgsForOrg/#{root_org_id}").
+                        gsub('v1/', ''),
+                      session_type: zuora_client.is_a?(ZuoraAPI::Oauth) ? :bearer : :basic,
+                      headers: auth_headers,
+                      zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id
+                    )
+
+                  org_relationship = org_relation_mapping(root_child_org_list)
+                  Redis.current.setex(
+                    "MultiOrgRelationship:#{@appinstance.id}",
+                    1.day,
+                    org_relationship.to_json
+                  )
+
+                  ZuoraConnect::ZuoraUser.current_org_child_org_ids =
+                    get_child_orgs_from_relation_mapping(org_relationship, ZuoraConnect::ZuoraUser.current_org_id)
+                else
+                  ZuoraConnect.logger.info("Failed to get root org id for #{@appinstance.id}")
+                end
+              end
+            end
+
           rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
             output_xml, input_xml, response = zuora_client.soap_call(errors: [], z_session: false, zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id) do |xml|
               xml['api'].getUserInfo
@@ -579,7 +668,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 +698,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/exceptions.rb

@@ -65,5 +65,19 @@ module ZuoraConnect
         @message || @default_message
       end
     end
+
+
+    class OrganizationAccessForbidden < Error
+      attr_writer :default_message
+
+      def initialize(message = nil)
+        @message = message
+        @default_message = "You are not authorized to access with the current organization."
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
   end
 end

data/lib/zuora_connect/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment