update CommunityCommons to 10.2.0

Author: KevinVlaanderen

module/PushNotifications.mpr

@@ -63,11 +63,11 @@ public abstract static class IterateCallback<T1, T2> {
 
 		public abstract void hit(T1 key, T2 value) throws Exception;
 
-		public void exit() {
+		synchronized public void exit() {
 			stop = true;
 		}
 
-		public void remove() {
+		synchronized public void remove() {
 			mapIter.remove();
 		}
 
@@ -674,18 +674,19 @@ public static boolean overlayPdf(IContext context, IMendixObject generatedDocume
 			Logging.trace(LOGNODE, "Overlay PDF start, retrieve overlay PDF");
 
 			Logging.trace(LOGNODE, "Perform overlay");
-			Overlay overlay = new Overlay();
-			overlay.setInputPDF(inputDoc);
-			overlay.setDefaultOverlayPDF(overlayDoc);
-			if (onTopOfContent == true) {
-				overlay.setOverlayPosition(Overlay.Position.FOREGROUND);
-			} else {
-				overlay.setOverlayPosition(Overlay.Position.BACKGROUND);
-			}
+			try (Overlay overlay = new Overlay()) {
+				overlay.setInputPDF(inputDoc);
+				overlay.setDefaultOverlayPDF(overlayDoc);
+				if (onTopOfContent) {
+					overlay.setOverlayPosition(Overlay.Position.FOREGROUND);
+				} else {
+					overlay.setOverlayPosition(Overlay.Position.BACKGROUND);
+				}
 
-			Logging.trace(LOGNODE, "Save result in output stream");
+				Logging.trace(LOGNODE, "Save result in output stream");
 
-			overlay.overlay(new HashMap<>()).save(baos);
+				overlay.overlay(new HashMap<>()).save(baos);
+			}
 
 			Logging.trace(LOGNODE, "Duplicate result in input stream");
 			try (InputStream overlayedContent = new ByteArrayInputStream(baos.toByteArray())) {

module/javasource/communitycommons/DateTime.java

@@ -265,6 +265,11 @@ private static boolean isFileDocument(IMendixObject object) {
 
 	public static Boolean cloneObject(IContext c, IMendixObject source,
 		IMendixObject target, Boolean withAssociations) {
+		return cloneObject(c, source, target, withAssociations, false);
+	}
+
+	public static Boolean cloneObject(IContext c, IMendixObject source,
+		IMendixObject target, Boolean withAssociations, Boolean skipIsBoth) {
 		Map<String, ? extends IMendixObjectMember<?>> members = source.getMembers(c);
 
 		for (var entry : members.entrySet()) {
@@ -279,6 +284,10 @@ public static Boolean cloneObject(IContext c, IMendixObject source,
 				continue;
             }
 			if (withAssociations || ((!(m instanceof MendixObjectReference) && !(m instanceof MendixObjectReferenceSet) && !(m instanceof MendixAutoNumber)))) {
+				if (skipIsBoth && (
+					(m instanceof MendixObjectReference && ((MendixObjectReference) m).isBoth()) ||
+					(m instanceof MendixObjectReferenceSet && ((MendixObjectReferenceSet) m).isBoth())))
+					continue;
 				target.setValue(c, entry.getKey(), m.getValue(c));
 			}
 		}

module/javasource/communitycommons/ImmutablePair.java

@@ -36,6 +36,7 @@
 import javax.swing.text.html.parser.ParserDelegator;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.input.BOMInputStream;
 import org.apache.commons.text.StringEscapeUtils;
 import org.owasp.html.PolicyFactory;
 import org.owasp.html.Sanitizers;
@@ -48,7 +49,8 @@ public class StringUtils {
 	private static final String UPPERCASE_ALPHA = stringRange('A', 'Z');
 	private static final String LOWERCASE_ALPHA = stringRange('a', 'z');
 	private static final String DIGITS = stringRange('0', '9');
-	private static final String SPECIAL = stringRange('!', '/');
+	// Used in tests as well
+	static final String SPECIAL = stringRange('!', '/');
 	private static final String ALPHANUMERIC = UPPERCASE_ALPHA + LOWERCASE_ALPHA + DIGITS;
 
 	static final Map<String, PolicyFactory> SANITIZER_POLICIES =
@@ -63,6 +65,12 @@ public class StringUtils {
 
 	public static final String HASH_ALGORITHM = "SHA-256";
 
+	public static String hash(String value) throws NoSuchAlgorithmException, DigestException {
+		int LENGTH = 32;
+		return hash(value, LENGTH);
+	}
+
+	@Deprecated
 	public static String hash(String value, int length) throws NoSuchAlgorithmException, DigestException {
 		byte[] inBytes = value.getBytes(StandardCharsets.UTF_8);
 		byte[] outBytes = new byte[length];
@@ -215,10 +223,14 @@ public static String stringFromFile(IContext context, FileDocument source, Chars
 			return null;
 		}
 		try (InputStream f = Core.getFileDocumentContent(context, source.getMendixObject())) {
-			return IOUtils.toString(f, charset);
+			return stringFromInputStream(f, charset);
 		}
 	}
 
+	public static String stringFromInputStream(InputStream inputStream, Charset charset) throws IOException {
+		return IOUtils.toString(BOMInputStream.builder().setInputStream(inputStream).get(), charset);
+	}
+
 	public static void stringToFile(IContext context, String value, FileDocument destination) throws IOException {
 		stringToFile(context, value, destination, StandardCharsets.UTF_8);
 	}
@@ -279,39 +291,63 @@ public void handleEndTag(HTML.Tag tag, int pos) {
 	}
 
 	/**
-	 * Returns a random strong password containing a specified minimum number of digits, uppercase
-	 * and special characters.
+	 * Returns a random strong password containing a specified minimum number of uppercase, digits
+	 * and the exact number of special characters.
 	 *
 	 * @param minLen        Minimum length
 	 * @param maxLen        Maximum length
-	 * @param noOfCAPSAlpha Number of capitals
-	 * @param noOfDigits    Number of digits
-	 * @param noOfSplChars  Number of special characters
-	 * @return
+	 * @param noOfCAPSAlpha Minimum number of capitals
+	 * @param noOfDigits    Minimum number of digits
+	 * @param noOfSplChars  Exact number of special characters
+	 * @deprecated          Use the overload randomStrongPassword instead
 	 */
+	@Deprecated
 	public static String randomStrongPassword(int minLen, int maxLen, int noOfCAPSAlpha, int noOfDigits, int noOfSplChars) {
 		if (minLen > maxLen) {
 			throw new IllegalArgumentException("Min. Length > Max. Length!");
 		}
 		if ((noOfCAPSAlpha + noOfDigits + noOfSplChars) > minLen) {
 			throw new IllegalArgumentException("Min. Length should be atleast sum of (CAPS, DIGITS, SPL CHARS) Length!");
 		}
-		return generateCommonLangPassword(minLen, maxLen, noOfCAPSAlpha, noOfDigits, noOfSplChars);
+		return generateCommonLangPassword(minLen, maxLen, noOfCAPSAlpha, 0, noOfDigits, noOfSplChars);
+	}
+
+	/**
+	 * Returns a random strong password containing a specified minimum number of uppercase, lowercase, digits
+	 * and the exact number of special characters.
+	 *
+	 * @param minLen             Minimum length
+	 * @param maxLen             Maximum length
+	 * @param noOfCAPSAlpha      Minimum number of capitals
+	 * @param noOfLowercaseAlpha Minimum number of lowercase letters
+	 * @param noOfDigits         Minimum number of digits
+	 * @param noOfSplChars       Exact number of special characters
+	 */
+	public static String randomStrongPassword(int minLen, int maxLen, int noOfCAPSAlpha, int noOfLowercaseAlpha, int noOfDigits, int noOfSplChars) {
+		if (minLen > maxLen) {
+			throw new IllegalArgumentException("Min. Length > Max. Length!");
+		}
+		if ((noOfCAPSAlpha + noOfLowercaseAlpha + noOfDigits + noOfSplChars) > minLen) {
+			throw new IllegalArgumentException("Min. Length should be atleast sum of (CAPS, LOWER, DIGITS, SPL CHARS) Length!");
+		}
+		return generateCommonLangPassword(minLen, maxLen, noOfCAPSAlpha, noOfLowercaseAlpha, noOfDigits, noOfSplChars);
 	}
 
 	// See https://www.baeldung.com/java-generate-secure-password
 	// Implementation inspired by https://github.com/eugenp/tutorials/tree/master/core-java-modules/core-java-string-apis (under MIT license)
-	private static String generateCommonLangPassword(int minLen, int maxLen, int noOfCapsAlpha, int noOfDigits, int noOfSplChars) {
+	private static String generateCommonLangPassword(int minLen, int maxLen, int noOfCapsAlpha, int noOfLowercaseAlpha, int noOfDigits, int noOfSplChars) {
 		String upperCaseLetters = randomStringFromCharArray(noOfCapsAlpha, UPPERCASE_ALPHA.toCharArray());
+		String lowerCaseLetters = randomStringFromCharArray(noOfLowercaseAlpha, LOWERCASE_ALPHA.toCharArray());
 		String numbers = randomStringFromCharArray(noOfDigits, DIGITS.toCharArray());
 		String specialChar = randomStringFromCharArray(noOfSplChars, SPECIAL.toCharArray());
 
-		final int fixedNumber = noOfCapsAlpha + noOfDigits + noOfSplChars;
+		final int fixedNumber = noOfCapsAlpha + noOfLowercaseAlpha + noOfDigits + noOfSplChars;
 		final int lowerBound = minLen - fixedNumber;
 		final int upperBound = maxLen - fixedNumber;
 		String totalChars = randomStringFromCharArray(lowerBound, upperBound, ALPHANUMERIC.toCharArray());
 
 		String combinedChars = upperCaseLetters
+			.concat(lowerCaseLetters)
 			.concat(numbers)
 			.concat(specialChar)
 			.concat(totalChars);
@@ -462,7 +498,12 @@ public static String sanitizeHTML(String html, List<SanitizerPolicy> policyParam
 		PolicyFactory policyFactory = null;
 
 		for (SanitizerPolicy param : policyParams) {
-			policyFactory = (policyFactory == null) ? SANITIZER_POLICIES.get(param.name()) : policyFactory.and(SANITIZER_POLICIES.get(param.name()));
+			PolicyFactory policyFactoryForParam = SANITIZER_POLICIES.get(param.name());
+			policyFactory = (policyFactory == null) ? policyFactoryForParam : policyFactory.and(policyFactoryForParam);
+		}
+
+		if (policyFactory == null) {
+			throw new IllegalArgumentException("Sanitizer policy not found.");
 		}
 
 		return sanitizeHTML(html, policyFactory);

module/javasource/communitycommons/Logging.java

@@ -528,7 +528,7 @@ public T firstOrWait(long timeoutMSecs) throws CoreException, InterruptedExcepti
 				break;
 
 			if (loopcount % 5 == 0)
-				sleepamount *= 1.5;
+				sleepamount = (int)(sleepamount * 1.5);
 
 			// not expired, wait a bit
 			if (result == null)