From a7bf44513e5339cc00dafb809ae936d450f6e8a2 Mon Sep 17 00:00:00 2001 From: shrek2000 Date: Thu, 28 Nov 2019 15:19:26 +0200 Subject: Fix Sonar issues Fix usage of deprecated warn API. Issue-ID: SDC-2697 Signed-off-by: shrek2000 Change-Id: I0dcf89330c09f09a7436efb81a9b40e6ae001d73 --- .../java/org/onap/sdc/security/SecurityUtil.java | 153 +++++++++++---------- 1 file changed, 84 insertions(+), 69 deletions(-) diff --git a/security-util-lib/src/main/java/org/onap/sdc/security/SecurityUtil.java b/security-util-lib/src/main/java/org/onap/sdc/security/SecurityUtil.java index 98410d2..27d946f 100644 --- a/security-util-lib/src/main/java/org/onap/sdc/security/SecurityUtil.java +++ b/security-util-lib/src/main/java/org/onap/sdc/security/SecurityUtil.java @@ -20,133 +20,148 @@ package org.onap.sdc.security; -import fj.data.Either; -import org.onap.sdc.security.logging.wrappers.Logger; +import static java.nio.charset.StandardCharsets.UTF_8; -import javax.crypto.BadPaddingException; -import javax.crypto.Cipher; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.NoSuchPaddingException; -import javax.crypto.spec.SecretKeySpec; +import fj.data.Either; import java.io.UnsupportedEncodingException; -import java.nio.charset.StandardCharsets; import java.security.InvalidKeyException; import java.security.Key; import java.security.NoSuchAlgorithmException; import java.util.Base64; +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.spec.SecretKeySpec; +import org.onap.sdc.security.logging.enums.EcompLoggerErrorCode; +import org.onap.sdc.security.logging.wrappers.Logger; public class SecurityUtil { - private static final Logger LOG = Logger.getLogger( SecurityUtil.class ); - private static final byte[] KEY = new byte[]{-64,5,-32 ,-117 ,-44,8,-39, 1, -9, 36,-46,-81, 62,-15,-63,-75}; + private static final Logger LOG = Logger.getLogger(SecurityUtil.class); + private static final byte[] KEY = + new byte[] {-64, 5, -32, -117, -44, 8, -39, 1, -9, 36, -46, -81, 62, -15, -63, -75}; public static final SecurityUtil INSTANCE = new SecurityUtil(); - public static final String ALGORITHM = "AES" ; - public static final String CHARSET = StandardCharsets.UTF_8.name(); + public static final String ALGORITHM = "AES"; + public static final String CHARSET = UTF_8.name(); - public static Key secKey = null ; + public static Key secKey = null; /** - * * cmd commands >$PROGRAM_NAME decrypt "$ENCRYPTED_MSG" - * >$PROGRAM_NAME encrypt "message" - **/ + * >$PROGRAM_NAME encrypt "message" + **/ - private SecurityUtil(){ super(); } + private SecurityUtil() { + } static { - try{ - secKey = generateKey( KEY, ALGORITHM ); - } - catch(Exception e){ - LOG.warn("cannot generate key for {}", ALGORITHM); + try { + secKey = generateKey(KEY, ALGORITHM); + } catch (Exception e) { + LOG.warn(EcompLoggerErrorCode.PERMISSION_ERROR,"cannot generate key for {}", ALGORITHM); } } - - public static Key generateKey(final byte[] KEY, String algorithm){ + public static Key generateKey(final byte[] KEY, String algorithm) { return new SecretKeySpec(KEY, algorithm); } //obfuscates key prefix -> ********** - public String obfuscateKey(String sensitiveData){ + public String obfuscateKey(String sensitiveData) { - if (sensitiveData != null){ - int len = sensitiveData.length(); - StringBuilder builder = new StringBuilder(sensitiveData); - for (int i=0; i encrypt(String strDataToEncrypt){ - if (strDataToEncrypt != null ){ + public Either encrypt(String strDataToEncrypt) { + if (strDataToEncrypt != null) { try { LOG.debug("Encrypt key -> {}", secKey); - Cipher aesCipherForEncryption = Cipher.getInstance("AES"); // Must specify the mode explicitly as most JCE providers default to ECB mode!! + Cipher aesCipherForEncryption = Cipher.getInstance( + "AES"); // Must specify the mode explicitly as most JCE providers default to ECB mode!! aesCipherForEncryption.init(Cipher.ENCRYPT_MODE, secKey); byte[] byteDataToEncrypt = strDataToEncrypt.getBytes(); byte[] byteCipherText = aesCipherForEncryption.doFinal(byteDataToEncrypt); - String strCipherText = new String( Base64.getMimeEncoder().encode(byteCipherText), CHARSET ); + String strCipherText = new String(Base64.getMimeEncoder().encode(byteCipherText), CHARSET); LOG.debug("Cipher Text generated using AES is {}", strCipherText); return Either.left(strCipherText); - } catch( NoSuchAlgorithmException | UnsupportedEncodingException e){ - LOG.warn( "cannot encrypt data unknown algorithm or missing encoding for {}" ,secKey.getAlgorithm()); - } catch( InvalidKeyException e){ - LOG.warn( "invalid key recieved - > {} | {}" , Base64.getDecoder().decode( secKey.getEncoded() ), e.getMessage() ); - } catch( IllegalBlockSizeException | BadPaddingException | NoSuchPaddingException e){ - LOG.warn( "bad algorithm definition (Illegal Block Size or padding), please review you algorithm block&padding" , e.getMessage() ); + } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) { + LOG.warn(EcompLoggerErrorCode.PERMISSION_ERROR, + "cannot encrypt data unknown algorithm or missing encoding for {}", secKey.getAlgorithm()); + } catch (InvalidKeyException e) { + LOG.warn(EcompLoggerErrorCode.PERMISSION_ERROR, "invalid key recieved - > {} | {}", + new String(Base64.getDecoder().decode(secKey.getEncoded())), e.getMessage()); + } catch (IllegalBlockSizeException | BadPaddingException | NoSuchPaddingException e) { + LOG.warn(EcompLoggerErrorCode.PERMISSION_ERROR, + "bad algorithm definition (Illegal Block Size or padding), please review you algorithm block&padding", + e.getMessage()); } } - return Either.right("Cannot encrypt "+strDataToEncrypt); + return Either.right("Cannot encrypt " + strDataToEncrypt); } /** * Decrypt the Data - * @param byteCipherText - should be valid bae64 input in the length of 16bytes + * + * @param byteCipherText - should be valid bae64 input in the length of 16bytes * @param isBase64Decoded - is data already base64 encoded&aligned to 16 bytes - * a. Initialize a new instance of Cipher for Decryption (normally don't reuse the same object) - * b. Decrypt the cipher bytes using doFinal method + * a. Initialize a new instance of Cipher for Decryption (normally don't reuse the same + * object) + * b. Decrypt the cipher bytes using doFinal method */ - public Either decrypt(byte[] byteCipherText , boolean isBase64Decoded){ - if (byteCipherText != null){ + public Either decrypt(byte[] byteCipherText, boolean isBase64Decoded) { + if (byteCipherText != null) { byte[] alignedCipherText = byteCipherText; - try{ - if (isBase64Decoded) + try { + if (isBase64Decoded) { alignedCipherText = Base64.getDecoder().decode(byteCipherText); - LOG.debug("Decrypt key -> "+secKey.getEncoded()); - Cipher aesCipherForDecryption = Cipher.getInstance("AES"); // Must specify the mode explicitly as most JCE providers default to ECB mode!! + } + LOG.debug("Decrypt key -> " + secKey.getEncoded()); + Cipher aesCipherForDecryption = Cipher.getInstance( + "AES"); // Must specify the mode explicitly as most JCE providers default to ECB mode!! aesCipherForDecryption.init(Cipher.DECRYPT_MODE, secKey); byte[] byteDecryptedText = aesCipherForDecryption.doFinal(alignedCipherText); String strDecryptedText = new String(byteDecryptedText); - LOG.debug("Decrypted Text message is: {}" , obfuscateKey( strDecryptedText )); + LOG.debug("Decrypted Text message is: {}", obfuscateKey(strDecryptedText)); return Either.left(strDecryptedText); - } catch( NoSuchAlgorithmException e){ - LOG.warn( "cannot encrypt data unknown algorithm or missing encoding for {}" ,secKey.getAlgorithm()); - } catch( InvalidKeyException e){ - LOG.warn( "invalid key recieved - > {} | {}" , Base64.getDecoder().decode( secKey.getEncoded() ), e.getMessage() ); - } catch( IllegalBlockSizeException | BadPaddingException | NoSuchPaddingException e){ - LOG.warn( "bad algorithm definition (Illegal Block Size or padding), please review you algorithm block&padding" , e.getMessage() ); + } catch (NoSuchAlgorithmException e) { + LOG.warn(EcompLoggerErrorCode.PERMISSION_ERROR, + "cannot encrypt data unknown algorithm or missing encoding for {}", secKey.getAlgorithm()); + } catch (InvalidKeyException e) { + LOG.warn(EcompLoggerErrorCode.PERMISSION_ERROR, "invalid key recieved - > {} | {}", + new String(Base64.getDecoder().decode(secKey.getEncoded())), e.getMessage()); + } catch (IllegalBlockSizeException | BadPaddingException | NoSuchPaddingException e) { + LOG.warn(EcompLoggerErrorCode.PERMISSION_ERROR, + "bad algorithm definition (Illegal Block Size or padding), please review you algorithm block&padding", + e.getMessage()); } } return Either.right("Decrypt FAILED"); } - public Either decrypt(String byteCipherText){ + public Either decrypt(String byteCipherText) { try { - return decrypt(byteCipherText.getBytes(CHARSET),true); - } catch( UnsupportedEncodingException e ){ - LOG.warn( "Missing encoding for {} | {} " ,secKey.getAlgorithm() , e.getMessage()); + return decrypt(byteCipherText.getBytes(CHARSET), true); + } catch (UnsupportedEncodingException e) { + LOG.warn(EcompLoggerErrorCode.PERMISSION_ERROR, "Missing encoding for {} | {} ", secKey.getAlgorithm(), + e.getMessage()); } return Either.right("Decrypt FAILED"); } -- cgit 1.2.3-korg