(ranger) branch master updated: RANGER-5169: Error while migrating Masterkey from older format to external key store (#556)

[abhi]

This is an automated email from the ASF dual-hosted git repository.

abhi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 1b8482a02 RANGER-5169: Error while migrating Masterkey from older 
format to external key store (#556)
1b8482a02 is described below

commit 1b8482a02de45cc32cf8c5c675d7c59e339e153f
Author: Vikas Kumar <talktovikas...@gmail.com>
AuthorDate: Fri Apr 11 22:28:14 2025 +0530

    RANGER-5169: Error while migrating Masterkey from older format to external 
key store (#556)
---
 .../main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git 
a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java 
b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
index 46cfd62af..d07a8adbd 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
@@ -71,11 +71,12 @@ public class RangerMasterKey implements RangerKMSMKI {
     private final RangerMasterKeyDao masterKeyDao;
 
     public RangerMasterKey() {
-        this.masterKeyDao = null;
+        this(null);
     }
 
     public RangerMasterKey(DaoManager daoManager) {
         this.masterKeyDao = daoManager != null ? 
daoManager.getRangerMasterKeyDao() : null;
+        init();
     }
 
     public static void getPasswordParam(String paddedEncryptedPwd) {
@@ -194,8 +195,6 @@ public boolean generateMasterKey(String password) throws 
Throwable {
         logger.debug("==> RangerMasterKey.generateMasterKey()");
         logger.info("Generating Master Key...");
 
-        init();
-
         if (!checkMKExistence(this.masterKeyDao)) {
             logger.info("Master Key doesn't exist in DB, Generating the Master 
Key");
 
@@ -252,8 +251,6 @@ public String getMasterKey(String password) throws 
Throwable {
     public void generateMKFromHSMMK(String password, byte[] key) throws 
Throwable {
         logger.debug("==> RangerMasterKey.generateMKFromHSMMK()");
 
-        init();
-
         if (!checkMKExistence(this.masterKeyDao)) {
             logger.info("Master Key doesn't exist in DB, Generating the Master 
Key");
 
@@ -274,8 +271,6 @@ public void generateMKFromHSMMK(String password, byte[] 
key) throws Throwable {
     public void generateMKFromKeySecureMK(String password, byte[] key) throws 
Throwable {
         logger.debug("==> RangerMasterKey.generateMKFromKeySecureMK()");
 
-        init();
-
         if (!checkMKExistence(this.masterKeyDao)) {
             logger.info("Master Key doesn't exist in DB, Generating the Master 
Key");