Improved Encryption Logging

Author: ggallotti

common/src/main/java/com/genexus/util/Encryption.java

@@ -5,6 +5,8 @@
 import com.genexus.common.interfaces.SpecificImplementation;
 import java.nio.charset.StandardCharsets;
 
+import com.genexus.diagnostics.core.ILogger;
+import com.genexus.diagnostics.core.LogManager;
 import org.apache.commons.codec.binary.Base64;
 import org.bouncycastle.crypto.BlockCipher;
 import org.bouncycastle.crypto.BufferedBlockCipher;
@@ -23,6 +25,7 @@
 
 public class Encryption
 {
+	public static final ILogger logger = LogManager.getLogger(Encryption.class);
     public static String AJAX_ENCRYPTION_KEY = "GX_AJAX_KEY";
 	public static String AJAX_ENCRYPTION_IV = "GX_AJAX_IV";
 	public static String AJAX_SECURITY_TOKEN = "AJAX_SECURITY_TOKEN";
@@ -180,12 +183,12 @@ public static String decrypt64(String value, String key, boolean safeEncoding)
 		}
 		catch (InvalidKeyException e)
 		{
-			System.err.println(e);
+			logger.error("decrypt64 error", e);
 			throw new InvalidGXKeyException(e.getMessage());
 		}
 		catch(UnsupportedEncodingException e)
 		{
-			System.err.println(e);
+			logger.error("decrypt64 error", e);
 			throw new RuntimeException(e.getMessage());
 		}
 		catch (ArrayIndexOutOfBoundsException e)
@@ -374,7 +377,7 @@ public static String encryptRijndael(String plainText, String key) {
 		try {
 			outputBytes = aesCipher(inputBytes, true, key, GX_AJAX_PRIVATE_IV);
 		} catch (DataLengthException | IllegalStateException | InvalidCipherTextException e) {
-			e.printStackTrace();
+			logger.error("encryptRijndael error", e);
 			return "";
 		}
 		return Hex.toHexString(outputBytes);

java/src/main/java/com/genexus/security/web/WebSecurityHelper.java

@@ -56,10 +56,5 @@ public static boolean verify(String pgmName, String issuer, String value, String
 		 }
 		 return ret;
      }
-    		 
-     /*public static boolean verify(String pgmName, String issuer, String value, String jwtToken, WebSecureToken token)
-     {     	 
-         boolean ok = SecureTokenHelper.Verify(jwtToken, token, GetSecretKey());            
-         return ok && !string.IsNullOrEmpty(pgmName) && token.ProgramName == pgmName && issuer == token.Issuer &&
-         */
+
 }

java/src/main/java/com/genexus/webpanels/WebUtils.java

@@ -17,6 +17,7 @@
 import com.genexus.diagnostics.core.ILogger;
 import com.genexus.diagnostics.core.LogManager;
 import com.genexus.xml.XMLReader;
+import org.apache.commons.lang.StringUtils;
 
 
 public class WebUtils
@@ -437,29 +438,32 @@ public static String decryptParm(Object parm, String encryptionKey) {
 
 		public static String parmsEncryptionKey(com.genexus.ModelContext context)
 		{
-			String GXKey = "";
             String keySourceType = com.genexus.Application.getClientPreferences().getUSE_ENCRYPTION();
-            if (!keySourceType.equals("")) {
-                GXKey = getEncryptionKey(context, keySourceType);
-            }
-            return GXKey;
+            if (keySourceType.equals(""))
+            	return "";
+            return getEncryptionKey(context, keySourceType);
 		}
 
 		public static String getEncryptionKey(com.genexus.ModelContext context, String keySourceType){
 			if (keySourceType.equals(""))
 			{
 				keySourceType = com.genexus.Application.getClientPreferences().getUSE_ENCRYPTION();
 			}
-            String GXKey = "";
+
+            String encryptionKey;
             if (keySourceType.equalsIgnoreCase("SESSION"))
 			{
-            	GXKey = com.genexus.util.Encryption.decrypt64(((HttpContext) context.getHttpContext()).getCookie("GX_SESSION_ID"), context.getServerKey());
+            	encryptionKey = com.genexus.util.Encryption.decrypt64(((HttpContext) context.getHttpContext()).getCookie("GX_SESSION_ID"), context.getServerKey());
             }
             else
 			{            	
-            	GXKey = context.getSiteKey();                
-            }                                                                                     
-            return GXKey;			
+            	encryptionKey = context.getSiteKey();
+            }
+			if (StringUtils.isEmpty(encryptionKey)) {
+				logger.error("Encryption Key cannot be empty");
+				logger.debug(keySourceType);
+			}
+            return encryptionKey;
 		}
 
 	private static final String gxApplicationClassesFileName = "GXApplicationClasses.txt";