Nonce inline events

archetypes/domui-hello/src/main/resources/archetype-resources/pom.xml

@@ -14,7 +14,7 @@
         <ecj.version>3.12.3</ecj.version>
         <source.jdk.version>1.8</source.jdk.version>
         <target.jdk.version>1.8</target.jdk.version>
-        <kotlin.version>1.5.20</kotlin.version>
+        <kotlin.version>1.7.20</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <jetty.version>9.4.6.v20170531</jetty.version>

common/property-annotation-processor/src/main/java/db/annotationprocessing/PropertyAnnotationProcessor.java

@@ -31,8 +31,6 @@
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
-@SupportedAnnotationTypes({"javax.persistence.Entity", "to.etc.annotations.GenerateProperties"})
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
 /**
  * Generates QField classes for every Entity annotated class in the project where this processor is selected.
  * Leave the default .apt_generated folder as is.
@@ -46,6 +44,8 @@
  * @author <a href="mailto:jal@etc.to">Frits Jalvingh</a>
  * Created on Feb 3, 2013
  */
+@SupportedAnnotationTypes({"javax.persistence.Entity", "to.etc.annotations.GenerateProperties"})
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
 public class PropertyAnnotationProcessor extends AbstractProcessor {
 	static public final String PERSISTENCE_ANNOTATION = "javax.persistence.Entity";
 
@@ -61,6 +61,8 @@ public class PropertyAnnotationProcessor extends AbstractProcessor {
 
 	private SourceVersion m_sourceVersion;
 
+	private boolean m_debug = System.getenv().get("DOMUI_ANNDEBUG") != null;
+
 	static public final class Property {
 		private final TypeMirror m_type;
 
@@ -128,8 +130,9 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
 				String pkgName = processingEnv.getElementUtils().getPackageOf(classElement).getQualifiedName().toString();
 				String entityName = classElement.getSimpleName().toString();
+				if(m_debug)
+					System.out.println("ANN> Processing entity " + entityName);
 
-				//String entityName = classElement.asType().toString();
 				try {
 					List<Property> properties = getProperties(classElement);
 
@@ -161,6 +164,8 @@ String getLinkClass(String entityName) {
 	}
 
 	private JavaFileObject createFile(String name, TypeElement ann) throws IOException {
+		if((m_debug))
+			System.out.println("ANN> createFile " + name + " source " + ann);
 		return processingEnv.getFiler().createSourceFile(name, ann);
 	}
 

common/to.etc.alg/src/main/java/to/etc/util/FileTool.java

@@ -1967,7 +1967,7 @@ public static void delete(File file) {
 		try {
 			Files.delete(file.toPath());
 		} catch(Exception x) {
-			LOG.error("Failed to delete " + file + ": " + x, x);
+			LOG.debug("Failed to delete " + file + ": " + x, x);
 		}
 	}
 }

common/to.etc.alg/src/main/java/to/etc/util/SecurityUtils.java

@@ -266,6 +266,17 @@ static public String getSha256Hex(@NonNull String in, @NonNull Charset encoding)
 		}
 	}
 
+	@NonNull
+	static public String getSha256Base64(@NonNull String in, @NonNull Charset encoding) {
+		try {
+			MessageDigest sha = MessageDigest.getInstance("SHA-256");
+			byte[] hash = sha.digest(in.getBytes(encoding));
+			return StringTool.encodeBase64ToString(hash);
+		} catch(Exception ex) {
+			throw WrappedException.wrap(ex);
+		}
+	}
+
 	static public byte[] createSalt(int bytes) {
 		byte[] salt = new byte[bytes];
 		RANDOM.nextBytes(salt);

common/to.etc.alg/src/main/java/to/etc/util/StringTool.java

@@ -45,6 +45,8 @@
 import java.util.StringTokenizer;
 import java.util.regex.Pattern;
 
+import static java.lang.Character.isJavaIdentifierPart;
+
 /**
  * This static utility class contains a load of string functions. And some other
  * stuff I could not quickly find a place for ;-)
@@ -112,7 +114,7 @@ static public boolean isValidJavaIdentifier(@NonNull final String s) {
 		if(!Character.isJavaIdentifierStart(s.charAt(0)))
 			return false;
 		for(int i = 1; i < len; i++) {
-			if(!Character.isJavaIdentifierPart(s.charAt(i)))
+			if(!isJavaIdentifierPart(s.charAt(i)))
 				return false;
 		}
 		return true;
@@ -3099,6 +3101,71 @@ public static String stripAccents(String s) {
 		return s;
 	}
 
+	/**
+	 * Util that locates given qualified name in expression (with ignored casing), and replaces it with new qualified name.
+	 * It ignores other cases when old name is part of naming of other variables in expression.
+	 * It requires that old qualified name prefix and name are named by java identifier convention.
+	 *
+	 * @param expression expression where we replace variables with qualified names
+	 * @param prefixQName prefix in qualified name to replace.
+	 * @param oldName name in qualified name to replace.
+	 * @param newQName new qualified name that replaced old one.
+	 * @return replaced expression.
+	 */
+	@Nullable
+	public static String replaceQualifiedNameInExpression(@Nullable String expression, String prefixQName, String oldName, String newQName) {
+		if(null == expression) {
+			return null;
+		}
+		String lEntityName = prefixQName.toLowerCase();
+		String lOldName = oldName.toLowerCase();
+		String literalToFind = lEntityName + "." + lOldName;
+		return replaceVariableNameInExpression(expression, literalToFind, newQName);
+	}
+
+	/**
+	 * Util that locates given variable name in expression (with ignored casing), and replaces it with new name.
+	 * It ignores other cases when old name is part of naming of other variables in expression.
+	 * It requires that old and new name are named by java identifier convention.
+	 *
+	 * @param expression expression where we replace variable name
+	 * @param oldName name to replace.
+	 * @return replaced expression.
+	 */
+	@Nullable
+	public static String replaceVariableNameInExpression(@Nullable String expression, String oldName, String newName) {
+		if(null == expression) {
+			return null;
+		}
+		String lowerCaseExpression = expression.toLowerCase();
+		String literalToFind = oldName.toLowerCase();
+		int lastReplacedIndex = 0;
+		int pos = -1;
+		StringBuilder replaceSb = new StringBuilder();
+		do {
+			pos = lowerCaseExpression.indexOf(literalToFind, pos + 1);
+			if(pos > -1) {
+				Character nextChar = null;
+				if(lowerCaseExpression.length() > pos + literalToFind.length()) {
+					nextChar = lowerCaseExpression.charAt(pos + literalToFind.length());
+				}
+				Character prevChar = null;
+				if(pos > 0) {
+					prevChar = expression.charAt(pos - 1);
+				}
+				if((nextChar == null || !isJavaIdentifierPart(nextChar)) && (prevChar == null || !isJavaIdentifierPart(prevChar))) {
+					replaceSb
+						.append(expression.substring(lastReplacedIndex, pos))
+						.append(newName);
+					lastReplacedIndex = pos + literalToFind.length();
+				}
+			} else if(lastReplacedIndex < expression.length()) {
+				replaceSb.append(expression.substring(lastReplacedIndex));
+			}
+		} while(pos >= 0);
+		return replaceSb.toString();
+	}
+
 	/**
 	 * This method checks that the name passed only contains a name,
 	 * and nothing that looks like a SQL injection.
@@ -3121,6 +3188,67 @@ static public void sqlCheckNoQuotes(@Nullable String password) {
 		if(null != password && password.contains("'"))
 			throw new IllegalArgumentException("Invalid characters in SQL");
 	}
+
+	static private final char[] PUNCT = "!#_^&*.;".toCharArray();
+
+	static private final char[] DIGITS = "023456789".toCharArray();
+
+	static private final char[] LETTERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray();
+
+	/**
+	 * Generate a reasonably secure password.
+	 */
+	static public String generatePassword(int nchar) {
+		return generatePassword(nchar, 2, 2);
+	}
+
+	/*
+	 * Postgres' passwords should not include dollar signs nor percentage signs.
+	 * jal 20200608 actually postgres is OK with it, it's Azure Tabular that dies with it.
+	 */
+	static public String generatePassword(int nchar, int punctuation, int digits) {
+		if(nchar < 6)
+			throw new IllegalStateException("Don't be silly.");
+
+		char[] buf = new char[nchar];                            // Password buffer
+
+		//-- Randomly assign the #of punctuation chars
+		while(punctuation > 0) {
+			char c = PUNCT[m_random.nextInt(PUNCT.length)];        // Random punctuation
+
+			for(; ; ) {
+				int pos = m_random.nextInt(nchar);                // Get a position
+				if(buf[pos] == 0) {
+					buf[pos] = c;
+					break;
+				}
+			}
+			punctuation--;
+		}
+
+		//-- Randomly assign digits
+		while(digits > 0) {
+			char c = DIGITS[m_random.nextInt(DIGITS.length)];        // Random punctuation
+
+			for(; ; ) {
+				int pos = m_random.nextInt(nchar);                    // Get a position
+				if(buf[pos] == 0) {
+					buf[pos] = c;
+					break;
+				}
+			}
+			digits--;
+		}
+
+		//-- And finally: fill the rest with random letters.
+		for(int i = 0; i < nchar; i++) {
+			if(buf[i] == 0) {
+				buf[i] = LETTERS[m_random.nextInt(LETTERS.length)];
+			}
+		}
+		return new String(buf);
+	}
+
 }
 
 

common/to.etc.alg/src/test/java/to/etc/util/TestStringTool.java

@@ -8,7 +8,10 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static junit.framework.TestCase.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -456,4 +459,27 @@ public void testRemoveRepeatingCharacters_whenHasRepeatingDigits_dontShortenStri
 		res = StringTool.removeRepeatingCharacters(s);
 		Assert.assertEquals("abc1111111abc 123456789123456789", res);
 	}
+
+	@Test
+	public void testStripAccents() {
+		var examples = List.of(
+			new Pair<>("filë_name.xls", "file_name.xls"),
+			new Pair<>("ćčćč", "cccc")		);
+		for(var example : examples) {
+			var rename = StringTool.stripAccents(example.get1());
+			assertEquals(example.get2(), rename);
+		}
+	}
+
+	@Test
+	public void testReplaceQualifiedNameInExpression() {
+		assertEquals(StringTool.replaceQualifiedNameInExpression("a.aaaa + a.aaab-a.aAa", "A", "aaa", "Aa.ccc"), "a.aaaa + a.aaab-Aa.ccc");
+		assertEquals(StringTool.replaceQualifiedNameInExpression("aa.aaa-A.aaa*1-a.AAa ", "A", "aaa", "Aa.ccc"), "aa.aaa-Aa.ccc*1-Aa.ccc ");
+	}
+
+	@Test
+	public void testReplaceVariableNameInExpression() {
+		assertEquals(StringTool.replaceVariableNameInExpression("aaaa + aaab-aAa", "aaa", "ccc"), "aaaa + aaab-ccc");
+		assertEquals(StringTool.replaceVariableNameInExpression("baaa-aaa*1-AAa ", "aaa", "ccc"), "baaa-ccc*1-ccc ");
+	}
 }

examples/skeleton/pom.xml

@@ -37,7 +37,7 @@
 		<source.jdk.version>1.8</source.jdk.version>
 		<target.jdk.version>1.8</target.jdk.version>
 		<ecj.version>3.12.3</ecj.version>
-		<kotlin.version>1.5.20</kotlin.version>
+		<kotlin.version>1.7.20</kotlin.version>
 
 		<!-- Plugin versions -->
 		<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
@@ -249,7 +249,7 @@
 			<dependency>
 				<groupId>org.postgresql</groupId>
 				<artifactId>postgresql</artifactId>
-				<version>42.4.1</version>
+				<version>42.5.1</version>
 			</dependency>
 
 <!--			&lt;!&ndash; https://mvnrepository.com/artifact/mysql/mysql-connector-java &ndash;&gt;-->

integrations/to.etc.domui.hibutil/src/main/java/to/etc/domui/hibernate/idgen/UUIDGenerator23.java

@@ -29,16 +29,10 @@
  * Created on 12-2-18.
  */
 final public class UUIDGenerator23 implements IdentifierGenerator {
+
 	@Override
 	public Serializable generate(SharedSessionContractImplementor sharedSessionContractImplementor, Object o) throws HibernateException {
-		UUID uuid = UUID.randomUUID();
-		byte[] data = new byte[16];
-
-		moveBytes(data, 0, uuid.getMostSignificantBits());
-		moveBytes(data, 8, uuid.getLeastSignificantBits());
-		String str = StringTool.encodeBase64ToString(data);
-
-		return str.substring(0, 23);                // Strip the ==
+		return createUUID();
 	}
 
 	static private void moveBytes(byte[] bytes, int offset, long bits) {

integrations/to.etc.domui.selenium/pom.xml

@@ -104,19 +104,10 @@
 
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>htmlunit-driver</artifactId>
-        </dependency>
-
-
-        <!--&lt;!&ndash; https://mvnrepository.com/artifact/com.github.detro.ghostdriver/phantomjsdriver &ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>com.github.detro.ghostdriver</groupId>-->
-            <!--<artifactId>phantomjsdriver</artifactId>-->
-            <!--<version>1.1.0</version>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.seleniumhq.selenium</groupId>-->
+<!--            <artifactId>htmlunit-driver</artifactId>-->
+<!--        </dependency>-->
 
         <!-- Test dependencies  -->
         <dependency>

integrations/to.etc.domui.selenium/src/main/java/to/etc/domui/webdriver/core/WebDriverConnector.java

@@ -223,12 +223,14 @@ static public WebDriverConnector get() throws Exception {
 
 	@NonNull
 	private static WebDriverType getDriverType(@Nullable String hubUrl) {
-		if(null == hubUrl || hubUrl.trim().isEmpty())
-			return WebDriverType.HTMLUNIT;                    // Used as a target because it can emulate multiple browser types
-		if("local".equals(hubUrl.trim()))
-			return WebDriverType.LOCAL;
-		if(hubUrl.startsWith(BROWSERSTACK)) {
-			return WebDriverType.BROWSERSTACK;
+		if(null != hubUrl) {
+			//if(null == hubUrl || hubUrl.trim().isEmpty())
+			//	return WebDriverType.HTMLUNIT;                    // Used as a target because it can emulate multiple browser types
+			if("local".equals(hubUrl.trim()))
+				return WebDriverType.LOCAL;
+			if(hubUrl.startsWith(BROWSERSTACK)) {
+				return WebDriverType.BROWSERSTACK;
+			}
 		}
 		return WebDriverType.REMOTE;
 	}