This may fix something, I don't know yet

DreamExposure · Oct 2, 2023 · 95fda89 · 95fda89
1 parent ce3fee2
commit 95fda89
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/cam/src/main/kotlin/org/dreamexposure/discal/cam/google/GoogleAuth.kt b/cam/src/main/kotlin/org/dreamexposure/discal/cam/google/GoogleAuth.kt
@@ -95,10 +95,11 @@ class GoogleAuth(
                 CredentialData(body.accessToken, Instant.now().plusSeconds(body.expiresIn.toLong()))
             }
             STATUS_CODE_BAD_REQUEST -> {
-                val body = objectMapper.readValue<ErrorData>(response.body!!.string())
+                val bodyRaw = response.body!!.string()
+                LOGGER.error("[Google] Access Token Request: $bodyRaw")
+                val body = objectMapper.readValue<ErrorData>(bodyRaw)
                 response.close()
 
-                LOGGER.error("[Google] Access Token Request: $body")
 
                 if (body.error == "invalid_grant") {
                     LOGGER.debug(DEFAULT, "[Google] Access to resource has been revoked")

diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/crypto/AESEncryption.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/crypto/AESEncryption.kt
@@ -16,21 +16,18 @@ class AESEncryption(privateKey: String) {
 
     private val ivParameterSpec = IvParameterSpec(key1.toByteArray(StandardCharsets.UTF_8))
     private val secretKeySpec = SecretKeySpec(privateKey.toByteArray(StandardCharsets.UTF_8), "AES")
-    private var cipher: Cipher?
+    private var encryptCipher: Cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING")
+    private var decryptCipher: Cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING")
 
     init {
-        try {
-            this.cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING")
-        } catch (ignore: Exception) {
-            this.cipher = null
-        }
+        this.encryptCipher.init(Cipher.ENCRYPT_MODE, this.secretKeySpec, this.ivParameterSpec)
+        this.decryptCipher.init(Cipher.ENCRYPT_MODE, this.secretKeySpec, this.ivParameterSpec)
     }
 
     @Deprecated("Use #decryptFixed(string) instead")
     fun encrypt(data: String): Mono<String> {
         return Mono.fromCallable {
-            this.cipher?.init(Cipher.ENCRYPT_MODE, this.secretKeySpec, this.ivParameterSpec)
-            val encrypted = this.cipher?.doFinal(data.toByteArray(StandardCharsets.UTF_8))
+            val encrypted = this.encryptCipher.doFinal(data.toByteArray(StandardCharsets.UTF_8))
 
             Base64.encodeBase64String(encrypted)
         }.doOnError {
@@ -43,8 +40,7 @@ class AESEncryption(privateKey: String) {
 
     fun encryptFixed(data: String): String {
         return try {
-            this.cipher?.init(Cipher.ENCRYPT_MODE, this.secretKeySpec, this.ivParameterSpec)
-            val encrypted = this.cipher?.doFinal(data.toByteArray(StandardCharsets.UTF_8))
+            val encrypted = this.encryptCipher.doFinal(data.toByteArray(StandardCharsets.UTF_8))
 
             Base64.encodeBase64String(encrypted)
         } catch (ex: Exception) {
@@ -56,8 +52,7 @@ class AESEncryption(privateKey: String) {
     @Deprecated("Use #decryptFixed(string) instead")
     fun decrypt(data: String): Mono<String> {
         return Mono.fromCallable {
-            this.cipher?.init(Cipher.DECRYPT_MODE, this.secretKeySpec, this.ivParameterSpec)
-            val decrypted = this.cipher?.doFinal(Base64.decodeBase64(data))
+            val decrypted = this.decryptCipher.doFinal(Base64.decodeBase64(data))
 
             String(decrypted!!, StandardCharsets.UTF_8)
         }.doOnError {
@@ -69,8 +64,7 @@ class AESEncryption(privateKey: String) {
 
     fun decryptFixed(data: String): String {
         return try {
-            this.cipher?.init(Cipher.DECRYPT_MODE, this.secretKeySpec, this.ivParameterSpec)
-            val decrypted = this.cipher?.doFinal(Base64.decodeBase64(data))
+            val decrypted = this.decryptCipher.doFinal(Base64.decodeBase64(data))
 
             String(decrypted!!, StandardCharsets.UTF_8)
         } catch (ex: Exception) {