Use config_entry_decoder key for config encryption

Fixes #979

Author: acogoluegnes

src/rabbit.app.src

@@ -100,7 +100,7 @@
          %% see rabbitmq-server#248
          %% and rabbitmq-server#667
          {channel_operation_timeout, 15000},
-         {decoder_config, [
+         {config_entry_decoder, [
              {cipher, aes_cbc256},
              {hash, sha512},
              {iterations, 1000},

src/rabbit.erl

@@ -443,13 +443,13 @@ stop_and_halt() ->
 start_apps(Apps) ->
     app_utils:load_applications(Apps),
 
-    DecoderConfig = case application:get_env(rabbit, decoder_config) of
+    ConfigEntryDecoder = case application:get_env(rabbit, config_entry_decoder) of
         undefined ->
             [];
         {ok, Val} ->
             Val
     end,
-    PassPhrase = case proplists:get_value(passphrase, DecoderConfig) of
+    PassPhrase = case proplists:get_value(passphrase, ConfigEntryDecoder) of
         prompt ->
             IoDevice = get_input_iodevice(),
             io:setopts(IoDevice, [{echo, false}]),
@@ -467,9 +467,9 @@ start_apps(Apps) ->
             PP
     end,
     Algo = {
-        proplists:get_value(cipher, DecoderConfig, rabbit_pbe:default_cipher()),
-        proplists:get_value(hash, DecoderConfig, rabbit_pbe:default_hash()),
-        proplists:get_value(iterations, DecoderConfig, rabbit_pbe:default_iterations()),
+        proplists:get_value(cipher, ConfigEntryDecoder, rabbit_pbe:default_cipher()),
+        proplists:get_value(hash, ConfigEntryDecoder, rabbit_pbe:default_hash()),
+        proplists:get_value(iterations, ConfigEntryDecoder, rabbit_pbe:default_iterations()),
         PassPhrase
     },
     decrypt_config(Apps, Algo),
@@ -527,16 +527,16 @@ decrypt_app(App, [{Key, Value}|Tail], Algo) ->
             end
         end
     catch
-        exit:{bad_configuration, decoder_config} ->
-            exit({bad_configuration, decoder_config});
+        exit:{bad_configuration, config_entry_decoder} ->
+            exit({bad_configuration, config_entry_decoder});
         _:Msg ->
             rabbit_log:info("Error while decrypting key '~p'. Please check encrypted value, passphrase, and encryption configuration~n", [Key]),
             exit({decryption_error, {key, Key}, Msg})
     end,
     decrypt_app(App, Tail, Algo).
 
 decrypt({encrypted, _}, {_, _, _, undefined}) ->
-    exit({bad_configuration, decoder_config});
+    exit({bad_configuration, config_entry_decoder});
 decrypt({encrypted, EncValue}, {Cipher, Hash, Iterations, Password}) ->
     rabbit_pbe:decrypt_term(Cipher, Hash, Iterations, Password, EncValue);
 decrypt(List, Algo) when is_list(List) ->

test/unit_SUITE.erl

@@ -366,7 +366,7 @@ decrypt_start_app_file(Config) ->
 
 do_decrypt_start_app(Config, Passphrase) ->
     %% Configure rabbit for decrypting configuration.
-    application:set_env(rabbit, decoder_config, [
+    application:set_env(rabbit, config_entry_decoder, [
         {cipher, aes_cbc256},
         {hash, sha512},
         {iterations, 1000},
@@ -393,7 +393,7 @@ do_decrypt_start_app(Config, Passphrase) ->
 
 decrypt_start_app_undefined(Config) ->
     %% Configure rabbit for decrypting configuration.
-    application:set_env(rabbit, decoder_config, [
+    application:set_env(rabbit, config_entry_decoder, [
         {cipher, aes_cbc256},
         {hash, sha512},
         {iterations, 1000}
@@ -407,13 +407,13 @@ decrypt_start_app_undefined(Config) ->
     try
         rabbit:start_apps([rabbit_shovel_test])
     catch
-        exit:{bad_configuration,decoder_config} -> ok;
+        exit:{bad_configuration, config_entry_decoder} -> ok;
         _:_ -> exit(unexpected_exception)
     end.
 
 decrypt_start_app_wrong_passphrase(Config) ->
     %% Configure rabbit for decrypting configuration.
-    application:set_env(rabbit, decoder_config, [
+    application:set_env(rabbit, config_entry_decoder, [
         {cipher, aes_cbc256},
         {hash, sha512},
         {iterations, 1000},