change error name

Author: kathap

app/controllers/v3/application_controller.rb

@@ -93,7 +93,7 @@ class ApplicationController < ActionController::Base
   rescue_from CloudController::Errors::CompoundError, with: :handle_compound_error
   rescue_from ActionDispatch::Http::Parameters::ParseError, with: :handle_invalid_request_body
   rescue_from Sequel::DatabaseConnectionError, Sequel::DatabaseDisconnectError, with: :handle_db_connection_error
-  rescue_from OpenSSL::Cipher::CipherError, with: :handle_decryption_error
+  rescue_from OpenSSL::Cipher::CipherError, with: :handle_key_derivation_error
 
   def configuration
     Config.config
@@ -220,8 +220,8 @@ def handle_db_connection_error(_)
     handle_api_error(error)
   end
 
-  def handle_decryption_error(_)
-    error = CloudController::Errors::ApiError.new_from_details('InternalServerError', 'Failed to decrypt credentials')
+  def handle_key_derivation_error(_)
+    error = CloudController::Errors::V3::ApiError.new_from_details('InternalServerError', 'Failed to decrypt credentials')
     handle_api_error(error)
   end
 

app/controllers/v3/service_credential_bindings_controller.rb

@@ -135,7 +135,7 @@ def details
                   else
                     begin
                       service_credential_binding.credentials
-                    rescue VCAP::CloudController::Encryptor::EncryptorError => e
+                    rescue VCAP::CloudController::Encryptor::KeyDerivationError => e
                       logger.error("Failed to decrypt credentials: #{e.message}")
                       raise CloudController::Errors::V3::ApiError.new_from_details('InternalServerError', 'Failed to decrypt credentials')
                     end

lib/cloud_controller/encryptor.rb

@@ -8,7 +8,7 @@
 module VCAP::CloudController
   module Encryptor
     ENCRYPTION_ITERATIONS = 2048
-    class EncryptorError < StandardError; end
+    class KeyDerivationError < StandardError; end
     class << self
       ALGORITHM = 'AES-128-CBC'.freeze
 
@@ -87,7 +87,7 @@ def run_cipher(cipher, input, salt, key, iterations:)
             cipher.key = OpenSSL::PKCS5.pbkdf2_hmac(key, salt, iterations, 16, OpenSSL::Digest.new('SHA256'))
           rescue OpenSSL::Cipher::CipherError => e
             logger.error("Failed to derive cipher key due to missing key for encryption_key_label=#{current_encryption_key_label}: #{e.class}: #{e.message}") if key.nil?
-            raise EncryptorError
+            raise KeyDerivationError
           end
           cipher.iv = salt
         end

spec/request/service_credential_bindings_spec.rb

@@ -637,7 +637,7 @@ def check_filtered_bindings(*bindings)
       it 'fails to decrypt the credentials and returns a 500 error' do
         app_binding.class.db[:service_bindings].where(id: app_binding.id).update(encryption_key_label: 'invalid-key-label')
 
-        allow(VCAP::CloudController::Encryptor).to receive(:run_cipher).and_raise(VCAP::CloudController::Encryptor::EncryptorError)
+        allow(VCAP::CloudController::Encryptor).to receive(:run_cipher).and_raise(VCAP::CloudController::Encryptor::KeyDerivationError)
         api_call.call(admin_headers)
 
         expect(last_response).to have_status_code(500)

spec/unit/controllers/v3/application_controller_spec.rb

@@ -38,7 +38,7 @@ def not_found
       raise CloudController::Errors::NotFound.new_from_details('NotFound')
     end
 
-    def decryption_error
+    def key_derivation_error
       raise OpenSSL::Cipher::CipherError.new
     end
 
@@ -324,18 +324,18 @@ def warnings_incorrect_type
     end
   end
 
-  describe '#handle_decryption_error' do
+  describe '#handle_key_derivation_error' do
     let!(:user) { set_current_user(VCAP::CloudController::User.make) }
 
     before do
       allow_any_instance_of(ErrorPresenter).to receive(:raise_500?).and_return(false)
       routes.draw do
-        get 'decryption_error' => 'anonymous#decryption_error'
+        get 'key_derivation_error' => 'anonymous#key_derivation_error'
       end
     end
 
     it 'rescues from OpenSSL::Cipher::CipherError and renders an error presenter1' do
-      get :decryption_error
+      get :key_derivation_error
       expect(response).to have_http_status(:internal_server_error)
       expect(response).to have_error_message(/Failed to decrypt credentials/)
     end