zuora_connect 2.0.25 → 2.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fea76bb37d1ec660b8a128db1cca709c37e6e2214d3d521c51e4195a3f8164f
-  data.tar.gz: 4a14dabec4749c279c835ccf0d6fbe52c9fdca911b2513a610f06ac84cf095f6
+  metadata.gz: 239f7a1bb6772f339b0c133922484240ab3d1386977da45fd19c056efe8ab287
+  data.tar.gz: 953110b10aa289412dba1f78e7d20fef51c25fb7e7d5a727b7cc2e87e46a6bdf
 SHA512:
-  metadata.gz: f203e242d524d7936497fc760ec6a563e703e96e62745e27b650a98a4dea4d3717563a3ed7a20144d1dab4c51313694a5993e2d9cb02cb8abadc3e3160f75699
-  data.tar.gz: 87365e269b53f1e9d8f48841ba4c5b1a8892627a20f30b3a6af2fc31498446e7facecc1dd91546c03ce80e78f01e67185f37bd4ec47d68d6b333ac5246ad089e
+  metadata.gz: d36513091307381a8f13907ccd9e9c1302e2745fb071f7b895edca58d5e769e002ea749a65a55c71d7a1d86a085c54e07df628e208c0b134617021d75696dd4d
+  data.tar.gz: e422088de704297c8ab7cbf9a876f120059d9ed641ad31d6ed54fa43520e88ee5beb1b81c172e3adb10f9a82e3466a6946c9c057d88a26062e3a38052ec6925b

data/app/models/zuora_connect/app_instance_base.rb

@@ -19,6 +19,12 @@ module ZuoraConnect
     IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh', 'de']
     INTERNAL_HOSTS = []
     LOGIN_TENANT_DESTINATION = 'target_login'
+    AWS_AUTH_ERRORS = [
+      Aws::Sigv4::Errors::MissingCredentialsError,
+      Aws::Errors::MissingCredentialsError,
+      Aws::S3::Errors::AccessDenied,
+    ].freeze
+    AWS_AUTH_ERRORS_MSG = "AWS Auth Errors".freeze
 
     def init
       self.connect_user = 'Nobody'
@@ -250,8 +256,9 @@ module ZuoraConnect
 
     def refresh(session: {}, session_fallback: false)
       refresh_count ||= 0
+      skip_connect ||= false
       #Check how app was deployed
-      if !self['zuora_logins'].present?
+      if self.id < 25000000 && !skip_connect  
         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
@@ -263,7 +270,12 @@ module ZuoraConnect
           rescue JSON::ParserError => ex
             raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("JSON parse error", response.body, response.code)
           end
-          self.build_task(task_data: parsed_json, session: session)          
+
+          self.build_task(task_data: parsed_json, session: session)  
+          if self.kms_key.present?
+            self.zuora_logins = parsed_json
+            self.save(:validate => false)
+          end        
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
@@ -274,21 +286,31 @@ module ZuoraConnect
       self.cache_app_instance
       self.reset_mark_for_refresh
     rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
-      if (refresh_count += 1) < 3
-        sleep(30)
+      refresh_count += 1
+      if refresh_count < 3
+        sleep(10)
         ZuoraConnect.logger.debug("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
         retry
+      elsif refresh_count < 4 && self['zuora_logins'].present?
+        ZuoraConnect.logger.warn("REFRESH TASK - Fallback to local encrypted store", ex, self.default_ougai_items)
+        skip_connect = true
+        retry
       else
         ZuoraConnect.logger.fatal("REFRESH TASK - Connection Failed", ex, self.default_ougai_items)
         raise
       end
     rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
-      if (refresh_count += 1) < 3
+      refresh_count += 1
+      if refresh_count < 3
         ZuoraConnect.logger.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
         if ex.code == 401
           self.refresh_oauth
         end
         retry
+      elsif refresh_count < 4 && self['zuora_logins'].present?
+        ZuoraConnect.logger.warn("REFRESH TASK - Fallback to local encrypted store", ex, self.default_ougai_items)
+        skip_connect = true
+        retry
       else
         ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex, self.default_ougai_items)
         raise
@@ -301,26 +323,46 @@ module ZuoraConnect
       end
 
       def zuora_logins
+        raise  ZuoraConnect::Exceptions::ConnectCommunicationError.new("Zuora Logins is blank, cannot decrypt.") if super.blank?
         return JSON.parse(kms_decrypt(super))
       end
 
       def kms_decrypt(value)
+        kms_tries ||= 0
         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
+      rescue *AWS_AUTH_ERRORS => ex
+        Rails.logger.error(AWS_AUTH_ERRORS_MSG, ex)
+        if (kms_tries += 1) < 3
+          retry
+        else
+          raise
+        end
       end
 
       def kms_encrypt(value)
+        kms_tries ||= 0
         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
+      rescue *AWS_AUTH_ERRORS => ex
+        Rails.logger.error(AWS_AUTH_ERRORS_MSG, ex)
+        if (kms_tries += 1) < 3
+          retry
+        else
+          raise
+        end
+      end
+
+      def kms_key
+        return ENV['AWS_KMS_ARN'] || Rails.application.secrets.aws['AWS_KMS_ARN'] 
       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'])
+          return Aws::Credentials.new(Rails.application.secrets.aws['AWS_ACCESS_KEY_ID'], Rails.application.secrets.aws['AWS_SECRET_ACCESS_KEY'])
         else
           return nil
         end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.25"
+  VERSION = "2.0.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.25
+  version: 2.0.26
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -423,41 +423,41 @@ test_files:
 - test/integration/navigation_test.rb
 - test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
 - test/fixtures/zuora_connect/app_instances.yml
+- test/lib/generators/zuora_connect/datatable_generator_test.rb
+- test/models/zuora_connect/app_instance_test.rb
+- test/zuora_connect_test.rb
+- test/dummy/Rakefile
+- test/dummy/config.ru
+- test/dummy/public/422.html
+- test/dummy/public/404.html
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/bin/setup
-- test/dummy/bin/bundle
-- test/dummy/bin/rake
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/README.rdoc
 - test/dummy/bin/rails
-- test/dummy/config/routes.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/application.rb
+- test/dummy/bin/rake
+- test/dummy/bin/bundle
+- test/dummy/bin/setup
+- test/dummy/config/secrets.yml
 - test/dummy/config/boot.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/application.rb
+- test/dummy/config/routes.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/secrets.yml
 - test/dummy/config/locales/en.yml
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/public/favicon.ico
-- test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/dummy/config.ru
-- test/lib/generators/zuora_connect/datatable_generator_test.rb
 - test/test_helper.rb
-- test/zuora_connect_test.rb
-- test/models/zuora_connect/app_instance_test.rb