Skip to content

Commit e220585

Browse files
committed
chore: add new key store file format
1 parent 4df0c64 commit e220585

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

dotenvx-spring-boot/src/main/java/org/mvnsearch/dotenvx/spring/encryptor/DefaultLazyEncryptor.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,13 @@ private HashMap<String, String> getGlobalKeyStore() {
119119
final Path globalEnvKeysPath = Path.of(System.getProperty("user.home"), ".dotenvx", ".env.keys.json");
120120
if (globalEnvKeysPath.toFile().exists()) {
121121
try {
122-
final Map<String, Object> store = objectMapper.readValue(globalEnvKeysPath.toFile(), Map.class);
123-
if (store != null) {
124-
for (String publicKey : store.keySet()) {
125-
Object pair = store.get(publicKey);
122+
Map<String, Object> keyStore = objectMapper.readValue(globalEnvKeysPath.toFile(), Map.class);
123+
if (!keyStore.isEmpty()) {
124+
if (keyStore.containsKey("version") && keyStore.containsKey("keys")) {
125+
keyStore = (Map<String, Object>) keyStore.get("keys");
126+
}
127+
for (String publicKey : keyStore.keySet()) {
128+
Object pair = keyStore.get(publicKey);
126129
if (pair instanceof Map<?, ?>) {
127130
String privateKye = ((Map<?, ?>) pair).get("private_key").toString();
128131
globalKeyPairs.put(publicKey, privateKye);

0 commit comments

Comments
 (0)