From 47e3b0396cd637a358fc69bfadb72cd8d1b63076 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Tue, 17 May 2022 11:26:14 -0300 Subject: [PATCH 1/2] Log exception on keystore build for custom certificate --- .../security/keystore/KeystoreManagerImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java index bed74bf4c3e8..ef55aeeb69de 100644 --- a/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java +++ b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java @@ -109,15 +109,15 @@ public byte[] getKeystoreBits(String name, String aliasForCertificateInStore, St try { return CertificateHelper.buildAndSaveKeystore(certs, storePassword); } catch (KeyStoreException e) { - s_logger.warn("Unable to build keystore for " + name + " due to KeyStoreException"); + s_logger.warn("Unable to build keystore for " + name + " due to KeyStoreException", e); } catch (CertificateException e) { - s_logger.warn("Unable to build keystore for " + name + " due to CertificateException"); + s_logger.warn("Unable to build keystore for " + name + " due to CertificateException", e); } catch (NoSuchAlgorithmException e) { - s_logger.warn("Unable to build keystore for " + name + " due to NoSuchAlgorithmException"); + s_logger.warn("Unable to build keystore for " + name + " due to NoSuchAlgorithmException", e); } catch (InvalidKeySpecException e) { - s_logger.warn("Unable to build keystore for " + name + " due to InvalidKeySpecException"); + s_logger.warn("Unable to build keystore for " + name + " due to InvalidKeySpecException", e); } catch (IOException e) { - s_logger.warn("Unable to build keystore for " + name + " due to IOException"); + s_logger.warn("Unable to build keystore for " + name + " due to IOException", e); } return null; } From c87af21dc76e67f6d63eb3e52106e3fed2958e5c Mon Sep 17 00:00:00 2001 From: nvazquez Date: Wed, 18 May 2022 07:57:09 -0300 Subject: [PATCH 2/2] Refactor --- .../security/keystore/KeystoreManagerImpl.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java index ef55aeeb69de..34755dbd3e47 100644 --- a/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java +++ b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java @@ -108,16 +108,12 @@ public byte[] getKeystoreBits(String name, String aliasForCertificateInStore, St try { return CertificateHelper.buildAndSaveKeystore(certs, storePassword); - } catch (KeyStoreException e) { - s_logger.warn("Unable to build keystore for " + name + " due to KeyStoreException", e); - } catch (CertificateException e) { - s_logger.warn("Unable to build keystore for " + name + " due to CertificateException", e); - } catch (NoSuchAlgorithmException e) { - s_logger.warn("Unable to build keystore for " + name + " due to NoSuchAlgorithmException", e); - } catch (InvalidKeySpecException e) { - s_logger.warn("Unable to build keystore for " + name + " due to InvalidKeySpecException", e); - } catch (IOException e) { - s_logger.warn("Unable to build keystore for " + name + " due to IOException", e); + } catch (KeyStoreException | CertificateException | NoSuchAlgorithmException | InvalidKeySpecException | IOException e) { + String msg = String.format("Unable to build keystore for %s due to %s", name, e.getClass().getSimpleName()); + s_logger.warn(msg); + if (s_logger.isDebugEnabled()) { + s_logger.debug(msg, e); + } } return null; }