Close #240

Author: Open Lowcode SAS

src/org/openlowcode/server/runtime/ServerConnection.java

@@ -334,7 +334,7 @@ public void performSecurityHandshake(MessageSimpleReader reader, MessageBuffered
 		byte[] encryptedaeskey = reader.returnNextLargeBinary("AESKEY").getContent();
 		byte[] decryptedaeskey = OLcServer.getServer().getSecuritymanager().decodeWithRSAPrivateKey(encryptedaeskey);
 		SecretKey aeskey = new SecretKeySpec(decryptedaeskey, 0, decryptedaeskey.length, "AES");
-		OLcServer.getServer().setAESCommunicator(new AESCommunicator(aeskey));
+		OLcServer.getServer().setAESCommunicator(new AESCommunicator(aeskey,writer.getMessageAudit()));
 		reader.returnNextEndStructure("SESAESKEY");
 		reader.returnNextEndMessage();
 		logger.info("    ---- successfull security handshacke with client --- ");

src/org/openlowcode/tools/enc/AESCommunicator.java

@@ -41,20 +41,25 @@ public class AESCommunicator {
 	private Cipher decryptaescipher;
 	private Deflater deflater;
 	private Inflater inflater;
-
+	private boolean messageaudit=false;
 	/**
 	 * @param secretkey
 	 * @throws Exception
 	 */
 	public AESCommunicator(SecretKey secretkey) throws Exception {
+		this(secretkey,false);
+
+	}
+	
+	public AESCommunicator(SecretKey secretkey,boolean messageaudit) throws Exception {
 		this.secretkey = secretkey;
 		encryptaescipher = Cipher.getInstance("AES");
 		encryptaescipher.init(Cipher.ENCRYPT_MODE, secretkey);
 		decryptaescipher = Cipher.getInstance("AES");
 		decryptaescipher.init(Cipher.DECRYPT_MODE, secretkey);
 		deflater = new Deflater();
 		inflater = new Inflater();
-
+		this.messageaudit=messageaudit;
 	}
 
 	/**
@@ -64,6 +69,11 @@ public AESCommunicator(SecretKey secretkey) throws Exception {
 	 */
 	public byte[] zipandencrypt(String message) throws Exception {
 		try {
+			if (this.messageaudit) {
+				logger.info("--------------------------- FULL MESSAGE AUDIT (before encryption)-----------------------");
+				logger.info(message);
+				logger.info("--------------------------- FULL MESSAGE AUDIT END (after encryption) -------------------");
+			}
 			if (message==null) return null;
 			byte[] messagebinary = message.getBytes("UTF-8");
 			ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -151,6 +161,7 @@ public static void main(String args[]) {
 	 */
 	public static AESCommunicator performServerHandshake(MessageSimpleReader reader, MessageBufferedWriter writer)
 			throws Exception {
+		
 		reader.returnNextMessageStart();
 		reader.returnNextStartStructure("RSAKEY");
 		byte[] rsapublickey = reader.returnNextLargeBinary("PUBLICKEY").getContent();
@@ -164,7 +175,7 @@ public static AESCommunicator performServerHandshake(MessageSimpleReader reader,
 		byte[] aeskey = secretKey.getEncoded();
 
 		// ----------- keep AES keys ----
-		AESCommunicator aescommunicator = new AESCommunicator(secretKey);
+		AESCommunicator aescommunicator = new AESCommunicator(secretKey,writer.getMessageAudit());
 		// --- Encrypt AES key with RSA key ----
 
 		KeyFactory kf = KeyFactory.getInstance("RSA");

src/org/openlowcode/tools/messages/MessageBufferedWriter.java

@@ -31,6 +31,10 @@ public class MessageBufferedWriter extends MessageWriter {
 	private int closestructurestacklength;
 	private boolean messageaudit;
 
+	public boolean getMessageAudit() {
+		return this.messageaudit;
+	}
+	
 	@Override
 	public void checkConnection() {