From 65f65796b2befd53b12fa76d05a640d30c0867cf Mon Sep 17 00:00:00 2001
From: Nho Quy Dinh <nonononoki@gmail.com>
Date: Tue, 17 Dec 2024 12:13:44 +0100
Subject: [PATCH] Throw Exception on db decryption/encryption issue

---
 .../component/TextEncryptorConverter.java      | 18 ++++++++++--------
 .../alovoa/model/DatabaseRuntimeException.java |  8 ++++++++
 2 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/com/nonononoki/alovoa/model/DatabaseRuntimeException.java

diff --git a/src/main/java/com/nonononoki/alovoa/component/TextEncryptorConverter.java b/src/main/java/com/nonononoki/alovoa/component/TextEncryptorConverter.java
index c6075a23..835523f9 100644
--- a/src/main/java/com/nonononoki/alovoa/component/TextEncryptorConverter.java
+++ b/src/main/java/com/nonononoki/alovoa/component/TextEncryptorConverter.java
@@ -13,6 +13,8 @@
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+
+import com.nonononoki.alovoa.model.DatabaseRuntimeException;
 import jakarta.persistence.AttributeConverter;
 
 import org.springframework.beans.factory.annotation.Value;
@@ -36,21 +38,21 @@ public class TextEncryptorConverter implements AttributeConverter<String, String
 
 	SecureRandom random = new SecureRandom();
 
-	private IvParameterSpec getIvSpec() {
+	private synchronized IvParameterSpec getIvSpec() {
 		if (ivSpec == null) {
 			ivSpec = new IvParameterSpec(salt.getBytes(StandardCharsets.UTF_8));
 		}
 		return ivSpec;
 	}
 
-	private SecretKeySpec getKeySpec() {
+	private synchronized SecretKeySpec getKeySpec() {
 		if (keySpec == null) {
 			keySpec = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES");
 		}
 		return keySpec;
 	}
 
-	private Cipher getEnCipher() throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException,
+	private synchronized Cipher getEnCipher() throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException,
 			InvalidAlgorithmParameterException {
 		if (enCipher == null) {
 			enCipher = Cipher.getInstance(TRANSFORMATION);
@@ -59,7 +61,7 @@ private Cipher getEnCipher() throws NoSuchAlgorithmException, NoSuchPaddingExcep
 		return enCipher;
 	}
 
-	private Cipher getDeCipher() throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException,
+	private synchronized Cipher getDeCipher() throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException,
 			InvalidAlgorithmParameterException {
 		if (deCipher == null) {
 			deCipher = Cipher.getInstance(TRANSFORMATION);
@@ -86,20 +88,20 @@ public String decode(String dbData)
 	}
 
 	@Override
-	public String convertToDatabaseColumn(String attribute) {
+	public String convertToDatabaseColumn(String attribute) throws DatabaseRuntimeException {
 		try {
 			return encode(attribute);
 		} catch (Exception e) {
-			return attribute;
+			throw new DatabaseRuntimeException(e);
 		}
 	}
 
 	@Override
-	public String convertToEntityAttribute(String dbData) {
+	public String convertToEntityAttribute(String dbData) throws DatabaseRuntimeException  {
 		try {
 			return decode(dbData);
 		} catch (Exception e) {
-			return dbData;
+			throw new DatabaseRuntimeException(e);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/nonononoki/alovoa/model/DatabaseRuntimeException.java b/src/main/java/com/nonononoki/alovoa/model/DatabaseRuntimeException.java
new file mode 100644
index 00000000..01b8ae98
--- /dev/null
+++ b/src/main/java/com/nonononoki/alovoa/model/DatabaseRuntimeException.java
@@ -0,0 +1,8 @@
+package com.nonononoki.alovoa.model;
+
+public class DatabaseRuntimeException extends RuntimeException {
+
+	public DatabaseRuntimeException(Exception e) {
+		super(e);
+	}
+}