refactor: created a hard copy of the modifiedMap so it is not passed …

…to the configuration service and applied
eclipse-kura · Oct 10, 2023 · 4465939 · 4465939
1 parent 04b4ce4
commit 4465939
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...e.kura.nm/src/main/java/org/eclipse/kura/nm/configuration/NMConfigurationServiceImpl.java b/...e.kura.nm/src/main/java/org/eclipse/kura/nm/configuration/NMConfigurationServiceImpl.java
@@ -235,9 +235,10 @@ public synchronized void update(Map<String, Object> receivedProperties) {
 
             mergeNetworkConfigurationProperties(modifiedProps, this.networkProperties.getProperties());
 
+            this.networkProperties = new NetworkProperties(discardModifiedNetworkInterfaces(new HashMap<>(modifiedProps)));
+
             decryptAndConvertPasswordProperties(modifiedProps);
             decryptAndConvertCertificatesProperties(modifiedProps, interfaces);
-            this.networkProperties = new NetworkProperties(discardModifiedNetworkInterfaces(modifiedProps));
 
             writeNetworkConfigurationSettings(modifiedProps);
             writeFirewallNatRules(interfaces, modifiedProps);
@@ -353,9 +354,9 @@ private void findAndDecodeCertificatesForInterface(String interfaceName, Map<Str
             try {
                 String valueString = value.toString();
                 if (isCertificate(key)) {
-                    modifiedProps.put(key, decryptCertificate(valueString, keystoreService));
+                    modifiedProps.put(key, getTrustedCertificateFromKeystore(valueString, keystoreService));
                 } else {
-                    modifiedProps.put(key, decryptPrivateKey(valueString, keystoreService));
+                    modifiedProps.put(key, getTrustedPrivateKeyFromKeystore(valueString, keystoreService));
                 }
             } catch (KuraException e) {
                 logger.error("Unable to decode key/certificate {} from keystore.", key, e);
@@ -368,7 +369,7 @@ private boolean isCertificate(String key) {
         return key.contains("cert");
     }
 
-    private Certificate decryptCertificate(String certificateName, KeystoreService keystoreService)
+    private Certificate getTrustedCertificateFromKeystore(String certificateName, KeystoreService keystoreService)
             throws KuraException {
         if (keystoreService.getEntry(certificateName) instanceof TrustedCertificateEntry) {
             TrustedCertificateEntry cert = (TrustedCertificateEntry) keystoreService.getEntry(certificateName);
@@ -382,7 +383,7 @@ private Certificate decryptCertificate(String certificateName, KeystoreService k
         }
     }
 
-    private PrivateKey decryptPrivateKey(String privateKeyName, KeystoreService keystoreService) throws KuraException {
+    private PrivateKey getTrustedPrivateKeyFromKeystore(String privateKeyName, KeystoreService keystoreService) throws KuraException {
         PrivateKeyEntry key = (PrivateKeyEntry) keystoreService.getEntry(privateKeyName);
 
         return key.getPrivateKey();