Changes to DS_CheckForSetup:

src/EmailModuleWithTemplates/javasource/encryption/actions/DecryptString.java

@@ -16,6 +16,8 @@
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
 import com.mendix.systemwideinterfaces.MendixRuntimeException;
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.webui.CustomJavaAction;
@@ -25,38 +27,36 @@ public class DecryptString extends CustomJavaAction<java.lang.String>
 	private java.lang.String value;
 	private java.lang.String key;
 	private java.lang.String prefix;
+	private java.lang.String legacyKey;
 
-	public DecryptString(IContext context, java.lang.String value, java.lang.String key, java.lang.String prefix)
+	public DecryptString(IContext context, java.lang.String value, java.lang.String key, java.lang.String prefix, java.lang.String legacyKey)
 	{
 		super(context);
 		this.value = value;
 		this.key = key;
 		this.prefix = prefix;
+		this.legacyKey = legacyKey;
 	}
 
 	@java.lang.Override
 	public java.lang.String executeAction() throws Exception
 	{
 		// BEGIN USER CODE
-		if (this.value == null || !isStartsWithRightPrefix())
-			return null;
-		if (this.prefix == null || this.prefix.isEmpty())
-			throw new MendixRuntimeException("Prefix should not be empty");
-		if (this.key == null || this.key.isEmpty())
-			throw new MendixRuntimeException("Key should not be empty");
-		if (this.key.length() != 16)
-			throw new MendixRuntimeException("Key length should be 16");
-
-		String decryptedText = null;
+		if (this.prefix != null)
+			throw new MendixRuntimeException("Prefix should be null when passed to DecryptString, this parameter will be deprecated");
+		if (this.value == null)
+			return this.value;
 
-		if (isEncryptedWithLegacyAlgorithm(this.value))	{
-			decryptedText = decryptUsingLegacyAlgorithm();
-		}
-		else {
-			decryptedText = decryptUsingGcm();
+		String textPrefix = getPrefix(this.value);
+		if (textPrefix == null)
+			throw new MendixRuntimeException("Encrypted string does not have a valid prefix.");
+		switch (textPrefix) {
+			case "AES": return decryptUsingLegacyAlgorithm();
+			case "AES2": return decryptUsingGcm();
+			case "AES3": return decryptUsingNewAlgorithm();
+			default:
+				throw new MendixRuntimeException("Invalid prefix encountered when trying to decrypt string: {" + textPrefix + "}");
 		}
-
-		return decryptedText;
 		// END USER CODE
 	}
 
@@ -70,18 +70,54 @@ public java.lang.String toString()
 	}
 
 	// BEGIN EXTRA CODE
-	private final int GCM_TAG_LENGTH = 16; // in bytes
-	private final String LEGACY_PREFIX = "{AES}";
-	private final String WRONG_KEY_ERROR_MESSAGE = "Cannot decrypt the text because it was either NOT encrypted with a key of length 16 or they key is different";
+	private static final int GCM_TAG_LENGTH = 16; // in bytes
+	private static final String LEGACY_PREFIX = "{AES}";
+	private static final String LEGACY_PREFIX2 = "{AES2}";
+	private static final String NEW_PREFIX = "{AES3}";
+	private static final Pattern PREFIX_REGEX = Pattern.compile("^\\{([a-zA-Z0-9]*)\\}.*$");
+	private static final String WRONG_KEY_ERROR_MESSAGE = "Cannot decrypt the text because it was either NOT encrypted with a key of length 16 or the key is different";
+
+	private String decryptUsingNewAlgorithm() throws Exception {
+		if (this.key == null || this.key.isEmpty())
+			throw new MendixRuntimeException("Key should not be empty");
+		if (this.key.length() != 32)
+			throw new MendixRuntimeException("Key length should be 32");
+
+		String[] s = this.value.substring(NEW_PREFIX.length()).split(";");
+
+		if (s.length < 2)
+			throw new MendixRuntimeException("Unexpected prefix when trying to decrypt string.");
+
+		Cipher c = Cipher.getInstance("AES/GCM/NoPadding");
+		SecretKeySpec k = new SecretKeySpec(this.key.getBytes(), "AES");
+
+		byte[] iv = Base64.getDecoder().decode(s[0].getBytes());
+		byte[] encryptedData = Base64.getDecoder().decode(s[1].getBytes());
+
+		try {
+			GCMParameterSpec spec = new GCMParameterSpec(GCM_TAG_LENGTH * 8, iv);
+			c.init(Cipher.DECRYPT_MODE, k, spec);
+			return new String(c.doFinal(encryptedData));
+		} catch (InvalidAlgorithmParameterException | BadPaddingException ex) {
+			if (isEncryptedWithWrongKey(ex.getMessage()))
+				throw new MendixRuntimeException(WRONG_KEY_ERROR_MESSAGE);
+			else throw ex;
+		}
+	}
 
 	private String decryptUsingGcm() throws Exception {
-		String[] s = this.value.substring(this.prefix.length()).split(";");
+		if (this.legacyKey == null || this.legacyKey.isEmpty())
+			throw new MendixRuntimeException("Legacy key should not be empty");
+		if (this.legacyKey.length() != 16)
+			throw new MendixRuntimeException("Legacy key length should be 16");
 
-		if (s.length < 2) //Not an encrypted string, just return the original value.
-			return this.value;
+		String[] s = this.value.substring(LEGACY_PREFIX2.length()).split(";");
+
+		if (s.length < 2)
+			throw new MendixRuntimeException("Unexpected prefix when trying to decrypt string using legacy algorithm.");
 
 		Cipher c = Cipher.getInstance("AES/GCM/PKCS5PADDING");
-		SecretKeySpec k = new SecretKeySpec(this.key.getBytes(), "AES");
+		SecretKeySpec k = new SecretKeySpec(this.legacyKey.getBytes(), "AES");
 
 		byte[] iv = Base64.getDecoder().decode(s[0].getBytes());
 		byte[] encryptedData = Base64.getDecoder().decode(s[1].getBytes());
@@ -98,19 +134,23 @@ private String decryptUsingGcm() throws Exception {
 	}
 
 	private boolean isEncryptedWithWrongKey(String message) {
-		return 
-				message.equals( "Wrong IV length: must be 16 bytes long") ||
+		return message.equals("Wrong IV length: must be 16 bytes long") ||
 				message.equals("Given final block not properly padded");
 	}
 
 	private String decryptUsingLegacyAlgorithm() throws Exception {
+		if (this.legacyKey == null || this.legacyKey.isEmpty())
+			throw new MendixRuntimeException("Legacy key should not be empty");
+		if (this.legacyKey.length() != 16)
+			throw new MendixRuntimeException("Legacy key length should be 16");
+
 		String[] s = this.value.substring(LEGACY_PREFIX.length()).split(";");
 
-		if (s.length < 2) //Not an encrypted string, just return the original value.
-			return this.value;
+		if (s.length < 2)
+			throw new MendixRuntimeException("Unexpected prefix when trying to decrypt string using legacy algorithm.");
 
 		Cipher c = Cipher.getInstance("AES/CBC/PKCS5PADDING");
-		SecretKeySpec k = new SecretKeySpec(this.key.getBytes(), "AES");
+		SecretKeySpec k = new SecretKeySpec(this.legacyKey.getBytes(), "AES");
 
 		byte[] iv = Base64.getDecoder().decode(s[0].getBytes());
 		byte[] encryptedData = Base64.getDecoder().decode(s[1].getBytes());
@@ -125,12 +165,11 @@ private String decryptUsingLegacyAlgorithm() throws Exception {
 		}
 	}
 
-	private boolean isEncryptedWithLegacyAlgorithm(String text) {
-		return text.startsWith(LEGACY_PREFIX);
-	}
-
-	private boolean isStartsWithRightPrefix() {
-		return this.value.startsWith(this.value) || isEncryptedWithLegacyAlgorithm(this.value);
+	// try to extract the prefix of an encrypted string
+	// returns null if no prefix is found
+	private String getPrefix(String text) {
+		Matcher m = PREFIX_REGEX.matcher(text);
+		return m.find() ? m.group(1) : null;
 	}
 	// END EXTRA CODE
 }

src/EmailModuleWithTemplates/javasource/encryption/actions/EncryptString.java

@@ -38,20 +38,27 @@ public java.lang.String executeAction() throws Exception
 			return null;
 		if (this.prefix == null || this.prefix.isEmpty())
 			throw new MendixRuntimeException("Prefix should not be empty");
+		if(isLegacyAlgorithm(this.prefix))
+			throw new MendixRuntimeException(String.format(
+					"The used prefix is no longer supported for encryption. Please use '%s'.", NEW_PREFIX));
+		if (!hasValidPrefix(this.prefix))
+			throw new MendixRuntimeException(String.format("Invalid prefix used. Please use '%s'.", NEW_PREFIX));
 		if (this.key == null || this.key.isEmpty())
 			throw new MendixRuntimeException("Key should not be empty");
-		if (this.key.length() != 16)
-			throw new MendixRuntimeException("Key length should be 16");
-		Cipher c = Cipher.getInstance("AES/GCM/PKCS5PADDING");
+		if (this.key.length() != 32)
+			throw new MendixRuntimeException("Key length should be 32");
+		Cipher c = Cipher.getInstance("AES/GCM/NoPadding");
 		SecretKeySpec k = new SecretKeySpec(this.key.getBytes(), "AES");
 		c.init(Cipher.ENCRYPT_MODE, k);
 
 		byte[] encryptedData = c.doFinal(this.value.getBytes());
 		byte[] iv = c.getIV();
 
-		return new StringBuilder(this.prefix +
-				new String(Base64.getEncoder().encode(iv))).append(";").append(
-				new String(Base64.getEncoder().encode(encryptedData))).toString();
+		StringBuilder sb = new StringBuilder(this.prefix);
+		sb.append(new String(Base64.getEncoder().encode(iv)));
+		sb.append(';');
+		sb.append(new String(Base64.getEncoder().encode(encryptedData)));
+		return sb.toString();
 		// END USER CODE
 	}
 
@@ -65,5 +72,10 @@ public java.lang.String toString()
 	}
 
 	// BEGIN EXTRA CODE
+	private static final String NEW_PREFIX = "{AES3}";
+	private static final String LEGACY_PREFIX_REGEX = "^\\{AES2?}$";
+
+	private boolean hasValidPrefix(String text) { return text.equals(NEW_PREFIX); }
+	private boolean isLegacyAlgorithm(String text) { return text.matches(LEGACY_PREFIX_REGEX); }
 	// END EXTRA CODE
 }

src/EmailModuleWithTemplates/javasource/encryption/actions/PGPDecryptDocument.java

@@ -16,8 +16,8 @@
 import encryption.proxies.microflows.Microflows;
 
 /**
- * Encrypt the FileDocument using PGP encryption. 
- *  This is allowed to be the same FileDocument instance and the action will just store th decrypted file in the entity.
+ * Encrypt the FileDocument using PGP encryption.
+ * This is allowed to be the same FileDocument instance and the action will just store the decrypted file in the entity.
  * 
  * The certificate must be a File containing a valid PGP key ring (matching the document) and the certificate must have a passphrase entered in the attribute
  * 

src/EmailModuleWithTemplates/javasource/encryption/actions/PGPEncryptDocument.java

@@ -15,11 +15,10 @@
 import encryption.pgp.PGPFileProcessor;
 
 /**
- * Encrypt the FileDocument using PGP encryption. 
- *  This is allowed to be the same FileDocument instance and the action will just store the encrypted file in the provided entity.
+ * Encrypt the FileDocument using PGP encryption.
+ * This is allowed to be the same FileDocument instance and the action will just store the encrypted file in the provided entity.
  * 
- * The certificate must be a valid public PGP key provided by the external party. If you want to sign the document you can optionally provide the private key to used for signing. 
- * The external party would have to validate the signature against the pub key from signature key.
+ * The certificate must be a valid public PGP key provided by the external party.
  * 
  * This action will either return true or an exception
  */
@@ -31,16 +30,13 @@ public class PGPEncryptDocument extends CustomJavaAction<java.lang.Boolean>
 	private system.proxies.FileDocument DocumentToEncrypt;
 	private IMendixObject __OutputDocument;
 	private system.proxies.FileDocument OutputDocument;
-	private IMendixObject __SigningCertificate;
-	private encryption.proxies.PGPCertificate SigningCertificate;
 
-	public PGPEncryptDocument(IContext context, IMendixObject ExternalPublicKey, IMendixObject DocumentToEncrypt, IMendixObject OutputDocument, IMendixObject SigningCertificate)
+	public PGPEncryptDocument(IContext context, IMendixObject ExternalPublicKey, IMendixObject DocumentToEncrypt, IMendixObject OutputDocument)
 	{
 		super(context);
 		this.__ExternalPublicKey = ExternalPublicKey;
 		this.__DocumentToEncrypt = DocumentToEncrypt;
 		this.__OutputDocument = OutputDocument;
-		this.__SigningCertificate = SigningCertificate;
 	}
 
 	@java.lang.Override
@@ -52,8 +48,6 @@ public java.lang.Boolean executeAction() throws Exception
 
 		this.OutputDocument = __OutputDocument == null ? null : system.proxies.FileDocument.initialize(getContext(), __OutputDocument);
 
-		this.SigningCertificate = __SigningCertificate == null ? null : encryption.proxies.PGPCertificate.initialize(getContext(), __SigningCertificate);
-
 		// BEGIN USER CODE
 
 		PGPFileProcessor p = new PGPFileProcessor();
@@ -62,9 +56,6 @@ public java.lang.Boolean executeAction() throws Exception
 		p.setAsciiArmored(true);
 		p.setPublicKeyFileName(this.ExternalPublicKey.getMendixObject());
 
-		// If we are going to validate the signature we also need the private key and passphrase
-		// p.setPassphrase( Microflows.decrypt(getContext(), this.SigningCertificate.getPassPhrase_Encrypted()) );
-
 		return p.encrypt(getContext());
 		// END USER CODE
 	}