zuora_connect 2.0.5c → 2.0.5d

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b454c39eb3067e78ba49f731132d632415132f2b6e5a5494577f7e515d0c3242
-  data.tar.gz: 9ede4f77763bb4583cd3fcf59221cac3e2746b7ef6e1a5ecbbfaf37f7700aa49
+  metadata.gz: c0ff8f546dd8038d10c402331ad6d5ec1f33f76b331a4a1d51907d68bf7d7d9a
+  data.tar.gz: ddac3bb5e57606df42cc0b1b9d0ce0a2952934a4bbec84626a87e236ac7ed2c8
 SHA512:
-  metadata.gz: de9fbf453309f308425373a5c3d8e3bdcc79f2375385fe45d83338ec7317bfc45e951ecef56b3a6022fbcff5db2df41725ab934dc4bbee61690f715637421861
-  data.tar.gz: 5bf32ef5cbacc60b236e41a4088cbf5862ecbcb95b548e525633078149ffcbb115172557b31fdc9ced6a7a07ac72eab87e6b77df269d4530bcd1fa47b2f717bb
+  metadata.gz: 12badcb6c2223cbd2345177f85c5155e31204c4072a1f9c9bfa5d84594032e42a162c39451a28462c755185a397ac0d9d41249420561734b9ca5f3661f025fdb
+  data.tar.gz: 4beea5d05e156bc8e999e0d5a50fcb8d8a094114443bfaeda17dead0a6a8c691e0879f8c93cc9809fecf316c784d4e0ba68ca5dcb08e83780773a06f85831b75

data/app/models/zuora_connect/app_instance_base.rb

@@ -207,7 +207,7 @@ module ZuoraConnect
     def refresh(session: {}, session_fallback: false)
       refresh_count ||= 0
       #Check how app was deployed
-      if !self.zuora_logins.present?
+      if !self['zuora_logins'].present?
         start = Time.now
         response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
         response_time = Time.now - start
@@ -222,7 +222,7 @@ module ZuoraConnect
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
       else
-        self.build_task(task_data: JSON.parse(self.zuora_logins), session: session)
+        self.build_task(task_data: self.zuora_logins, session: session)
         self.last_refresh = Time.now.to_i
         self.cache_app_instance
         self.reset_mark_for_refresh
@@ -250,7 +250,39 @@ module ZuoraConnect
       end
     end
 
-    #### START Metrics Mathods ####
+    #### START KMS ENCRYPTION Methods ####
+      def zuora_logins=(val)
+        write_attribute(:zuora_logins, kms_encrypt(val.to_json))
+      end
+
+      def zuora_logins
+        return JSON.parse(kms_decrypt(super))
+      end
+
+      def kms_decrypt(value)
+        kms_client = Aws::KMS::Client.new({region: Rails.application.secrets.aws['AWS_REGION'], credentials: self.aws_auth_client}.delete_if { |k, v| v.blank? })
+        resp = kms_client.decrypt({ciphertext_blob: [value].pack("H*") })
+        return resp.plaintext
+      end
+
+      def kms_encrypt(value)
+        kms_client = Aws::KMS::Client.new({region: Rails.application.secrets.aws['AWS_REGION'], credentials: self.aws_auth_client}.delete_if {|k,v| v.blank? })
+        kms_key = ENV['AWS_KMS_ARN'] || Rails.application.secrets.aws['AWS_KMS_ARN'] 
+
+        resp = kms_client.encrypt({key_id: kms_key, plaintext: value})
+        return resp.ciphertext_blob.unpack('H*').first
+      end
+
+      def aws_auth_client
+        if Rails.env.to_s == 'development'
+         return Aws::Credentials.new(Rails.application.secrets.aws['AWS_ACCESS_KEY_ID'], Rails.application.secrets.aws['AWS_SECRET_ACCESS_KEY'])
+        else
+          return nil
+        end
+      end
+    #### END KMS ENCRYPTION Methods ####
+
+    #### START Metrics Methods ####
       def logitem(item: {}, reset: false)
         self.logitems = {} if self.logitems.class != Hash
         if item.class == Hash
@@ -334,9 +366,9 @@ module ZuoraConnect
         end
         return @data
       end
-    #### END Task Mathods ####
+    #### END Task Methods ####
 
-    #### START Task Mathods ####
+    #### START Task Methods ####
       def build_task(task_data: {}, session: {})
         session = {} if session.blank?
         self.task_data = task_data
@@ -445,9 +477,9 @@ module ZuoraConnect
           raise
         end
       end
-    #### END Task Mathods ####
+    #### END Task Methods ####
 
-    #### START Connect OAUTH methods ####
+    #### START Connect OAUTH Methods ####
       def check_oauth_state(method)
         #Refresh token if already expired
         if self.oauth_expired?
@@ -505,7 +537,7 @@ module ZuoraConnect
           raise
         end
       end
-    #### END Connect OAUTH methods ####
+    #### END Connect OAUTH Methods ####
 
     #### START AppInstance Temporary Persistance Methods ####
       def marked_for_refresh?

data/lib/zuora_connect/configuration.rb

@@ -3,7 +3,7 @@ module ZuoraConnect
 
     attr_accessor :default_locale, :default_time_zone, :url, :mode, :delayed_job,:private_key, :additional_apartment_models
 
-    attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish, :blpop_queue, :app_access_permissions
+    attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish, :blpop_queue
 
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
 
@@ -19,7 +19,6 @@ module ZuoraConnect
       @additional_apartment_models = []
       @silencer_resque_finish = true
       @blpop_queue = false
-      @app_access_permissions = false
 
       # Setting the app name for telegraf write
       @enable_metrics = false

data/lib/zuora_connect/controllers/helpers.rb

@@ -37,13 +37,16 @@ module ZuoraConnect
 
           if appinstances.size == 0
             render json: {"status": 401, "message": "Missing mapping or no deployment for '#{zuora_host}-#{zuora_entity_id}' ."}, status: :unauthorized
+            return
           elsif appinstances.size > 1
             render json: {"status": 401, "message": "More than one app instance binded to host and entity ids. Please indicate correct instance via 'zuora-instance-id' header"}, status: :unauthorized
+            return
           else
             @appinstance = appinstances.first
+            check_instance
           end
       
-        elsif params['test'].blank? || request.headers.fetch("Authorization", "").include?("Basic ")
+        elsif request.headers.fetch("Authorization", "").include?("Basic ")
           authenticate_or_request_with_http_basic do |username, password|
             @appinstance = ZuoraConnect::AppInstance.where(:token => password).first
             @appinstance ||= ZuoraConnect::AppInstance.where(:api_token => password).first
@@ -51,17 +54,7 @@ module ZuoraConnect
             check_instance
           end
         else
-          response.set_header('WWW-Authenticate', "Basic realm=\"Application\"")
-          case params['test']
-          when "1"
-            render json: {"status": 401, "message": "Access Denied"}, status: :unauthorized
-          when "2"
-            render html: "HTTP Basic: Access denied.\n", status: :unauthorized
-
-          when "3"
-            render plain: "Access Denied", status: :unauthorized
-          end
-          #check_instance
+          check_instance
         end
         
         if @appinstance.present?
@@ -69,10 +62,28 @@ module ZuoraConnect
         end
       end
 
+       #API ONLY
+      def check_instance
+        if defined?(@appinstance) && @appinstance.present?
+          if @appinstance.new_session_for_api_requests(:params => params)
+            @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
+          end
+          Thread.current[:appinstance] = @appinstance
+          PaperTrail.whodunnit = "API User" if defined?(PaperTrail)
+          ElasticAPM.set_user("API User")  if defined?(ElasticAPM) && ElasticAPM.running?
+          return true
+        else
+          response.set_header('WWW-Authenticate', "Basic realm=\"Application\"")
+          render json: {"status": 401, "message": "Access Denied"}, status: :unauthorized
+          return false
+        end
+      end
+
       def authenticate_connect_app_request
         ElasticAPM.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
         Thread.current[:appinstance] = nil
         start_time = Time.now
+
         if ZuoraConnect.configuration.mode == "Production"
           if request.headers['ZuoraCurrentEntity'].present?
 
@@ -227,10 +238,9 @@ module ZuoraConnect
                   "tenant_ids": client_describe["accessibleEntities"].map{|e| e['entityId'] }.push(client_describe["tenantId"]).uniq,
                 }
 
-                @appinstance = ZuoraConnect::AppInstance.new(:id => next_id, :zuora_logins => task_data.to_json, :oauth_expires_at => Time.now + 1000.years)
+                @appinstance = ZuoraConnect::AppInstance.new(:id => next_id, :zuora_logins => task_data, :oauth_expires_at => Time.now + 1000.years)
                 @appinstance.save(:validate => false)
-                @appinstance.apartment_switch
-
+                @appinstance.refresh
                 session["appInstance"] = @appinstance.id
               rescue => ex
                 ZuoraConnect.logger.error(ex)
@@ -367,24 +377,6 @@ module ZuoraConnect
         end
         session["#{@appinstance.id}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
       end
-
-      #API ONLY
-      def check_instance
-        if defined?(@appinstance) && @appinstance.present?
-          if @appinstance.new_session_for_api_requests(:params => params)
-            @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
-          end
-          Thread.current[:appinstance] = @appinstance
-          PaperTrail.whodunnit = "API User" if defined?(PaperTrail)
-          ElasticAPM.set_user("API User")  if defined?(ElasticAPM) && ElasticAPM.running?
-          return true
-        else
-          response.set_header('WWW-Authenticate', "Basic realm=\"Application\"")
-          #render json: {"status": 401, "message": "Access Denied"}, status: :unauthorized
-          render html: "HTTP Basic: Access denied.\n", status: :unauthorized
-          render plain: "Access Denied", status: :unauthorized
-        end
-      end
     end
   end
 end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5c"
+  VERSION = "2.0.5d"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.5c
+  version: 2.0.5d
 platform: ruby
 authors:
 - Connect Team