diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/CryptoUtils.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/CryptoUtils.java index a3ffe29d661054e190b19da023b708de91950b1b..97b3b626ccd740fed81e24df4e0386c6f9c252fe 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/CryptoUtils.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/CryptoUtils.java @@ -1,6 +1,7 @@ package de.hdm_stuttgart.battlearena.Persistance.Classes; import java.io.File; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.security.InvalidKeyException; import java.security.Key; @@ -18,11 +19,11 @@ import java.nio.charset.StandardCharsets; public class CryptoUtils{ private static String parts[] = new String[2]; private static final String ALGORITHM = "AES"; - private static final String TRANSFORMATION = "AES"; + private static final String TRANSFORMATION = "AES/ECB/PKCS5Padding"; /*public static void encrypt(String key, File inputFile, File outputFile) throws CryptoException { - doCrypto(Cipher.ENCRYPT_MODE, key, inputFile); + doCrypto(Cipher.ENCRYPT_MODE, key, inputFile,outputFile); }*/ public static String[] decrypt(String key, File inputFile) @@ -44,7 +45,7 @@ public class CryptoUtils{ byte[] outputBytes = cipher.doFinal(inputBytes); String completeString = new String(outputBytes, StandardCharsets.UTF_8); - System.out.println(completeString); + //System.out.println(completeString); parts = completeString.split(";"); inputStream.close(); diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/DBalt.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/DBalt.java index bff8f4284442a75f01cd7f12403e5fea1464384d..8f6ddfef95ef43e3660a665aa0903f25945c9acf 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/DBalt.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/DBalt.java @@ -24,12 +24,9 @@ public class DBalt implements IDataBasealt { protected static void getlogindata() throws CryptoException { parts = CryptoUtils.decrypt(key, encryptedFile); - String completeString = parts[0] + parts[1]; - parts = completeString.split("="); - user = parts[1]; - password = parts[2]; - user = user.replace("password", ""); - log.info("AzureDB_logindetails: user: " + user +" password: " + password); + user = parts[0]; + password = parts[1]; + log.info("AzureDB logindetails: user: " + user + " password: " + password); } private static final Logger log = LogManager.getLogger(DBalt.class); diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/OracleDB.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/OracleDB.java index 82006d89e97a1a243944dd164d45d165daf633db..c265529a52abda7dbe45094735410d6c70bb5326 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/OracleDB.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/OracleDB.java @@ -23,7 +23,7 @@ public class OracleDB implements ISQLDataBase { //static File decryptedFile = new File("src\\main\\resources\\database\\document.decrypted"); private static final Logger log = LogManager.getLogger(OracleDB.class); - public void getlogindata() throws CryptoException { + public static void getlogindata() throws CryptoException { parts = CryptoUtils.decrypt(key, encryptedFile); user = parts[0]; password = parts[1]; diff --git a/src/main/resources/database/AzureDB_logindetails b/src/main/resources/database/AzureDB_logindetails index 1911780ef54a37f40c4b37e5f4a478f8c7874d28..444a71af54555cac318e7f97c9f186628cd9d16b 100644 Binary files a/src/main/resources/database/AzureDB_logindetails and b/src/main/resources/database/AzureDB_logindetails differ diff --git a/src/main/resources/database/document.encrypted b/src/main/resources/database/document.encrypted index 4628fda970ac9930417a073c4bac11ac2cafdc69..837a9fbcf781d32fe5ecb8608ad6a314235ba395 100644 Binary files a/src/main/resources/database/document.encrypted and b/src/main/resources/database/document.encrypted differ