From b20dd54aa24a2c401772bf5f3c5807afe10c504b Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 10 Feb 2019 07:35:01 +0000
Subject: [PATCH] Don't save password if password command is available.
---
borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
index 2e6d4fd..2480d3b 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
@@ -73,6 +73,14 @@
}
public void save() {
+ if (this.configuration.getRepoConfigs() != null) {
+ for (BorgRepoConfig repoConfig : this.configuration.getRepoConfigs()) {
+ if (StringUtils.isNotBlank(repoConfig.getPasswordCommand())) {
+ log.info("Removing password command from config because password command is given: " + repoConfig.getPasswordCommand());
+ repoConfig.setPassphrase(null); // Don't use password (anymore) if password command is available.
+ }
+ }
+ }
String json = JsonUtils.toJson(configuration, true);
try {
if (configFile.exists()) {
--
Gitblit v1.10.0