Merge branch 'master' into jakarta-wip

Author: petergeneric

.github/workflows/maven-test.yml

@@ -7,6 +7,8 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    env:
+      TZ: "Europe/London"
 
     steps:
     - uses: actions/checkout@v2
@@ -20,7 +22,7 @@ jobs:
         java-version: 21
         distribution: zulu
  # Step that does that actual cache save and restore
-    - uses: actions/cache@v1
+    - uses: actions/cache@v4.2.2
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -30,4 +32,4 @@ jobs:
       run: mvn -T3 -B test --file pom.xml
     - name: Publish Test Report
       if: ${{ always() }}
-      uses: scacap/action-surefire-report@v1
+      uses: scacap/action-surefire-report@1a128e49c0585bc0b8e38e541ac3b6e35a5bc727

Makefile

@@ -14,19 +14,8 @@ else
 	MVN=mvn -T$(MAVEN_PARALLELISM)
 endif
 
-ifeq ($(env), azure)
-	MVN=mvn -T$(MAVEN_PARALLELISM) -P azure
-endif
-
 RSYNC=rsync --progress -vzr
 
-ifeq ($(env), azure)
-	HOST=$(host)
-	DESTINATION=/opt/tomcat/
-	WEBAPPS=$(HOST):$(DESTINATION)core-services/webapps
-	RSYNC=rsync --progress -vzr --chmod=a+wrx --perms
-endif
-
 all: install
 
 uman: clean

guice/common/pom.xml

@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>com.peterphi.std.guice</groupId>
 		<artifactId>stdlib-guice-parent</artifactId>
-		<version>14.7.13-SNAPSHOT</version>
+		<version>14.7.15-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>

guice/common/src/main/java/com/peterphi/std/guice/restclient/jaxb/webquery/WebQueryParser.java

@@ -18,8 +18,13 @@ public class WebQueryParser
 	private static final String WHERE = "WHERE";
 
 	private static final String OPEN_BRACKET = "(";
+	private static final char OPEN_BRACKET_C = '(';
 	private static final String CLOSE_BRACKET = ")";
+	private static final char CLOSE_BRACKET_C = ')';
 	private static final String COMMA = ",";
+	private static final char COMMA_C = ',';
+
+	private static final char COLON_C = ':';
 
 	private static final String AND = "AND";
 	private static final String OR = "OR";
@@ -36,6 +41,9 @@ public class WebQueryParser
 	private static final String STARTS = "STARTS";
 	private static final String CONTAINS = "CONTAINS";
 	private static final String CONTAINS2 = "~=";
+
+	// operator token is a run of any of the following:
+	private static final char[] OPERATORS = new char[]{'=', '<', '>', '~', '!'};
 
 	public static WebQuery parse(String search, WebQuery query)
 	{
@@ -241,7 +249,7 @@ else if (start.equalsIgnoreCase(SELECT))
 				}
 				while (StringUtils.equals(peek(t), COMMA));
 
-				query.fetch(selects.stream().collect(Collectors.joining(",")));
+				query.fetch(String.join(",", selects));
 
 				// Allow EOF, EXPAND, WHERE or ORDER
 				final String token = peek(t);
@@ -279,6 +287,9 @@ else if (token.equalsIgnoreCase(ORDER))
 
 				if (operator.equalsIgnoreCase(IS))
 				{ // Unary expression
+					if (notted)
+						throw new IllegalArgumentException("Unexpected symbol NOT before " + operator);
+
 					final boolean isNotNullExpr = takeIf(t, NOT);
 
 					expect(t, NULL);
@@ -349,54 +360,66 @@ else if (operator.equalsIgnoreCase(CONTAINS) || operator.equals(CONTAINS2))
 						else
 							group.notContains(start, val);
 					}
-					else if (operator.equalsIgnoreCase("eqref"))
-					{
-						if (!notted)
-							group.eqRef(start, val);
-						else
-							group.neqRef(start, val);
-					}
-					else if (operator.equalsIgnoreCase("neqref"))
-					{
-						if (!notted)
-							group.neqRef(start, val);
-						else
-							group.eqRef(start, val);
-					}
-					else if (operator.equalsIgnoreCase("leref"))
+					else if (operator.length() >= 5 && StringUtils.endsWithIgnoreCase(operator, "ref"))
 					{
-						if (notted)
-							throw new IllegalArgumentException("Unexpected symbol NOT before " + operator);
+						if (operator.equalsIgnoreCase("eqref"))
+						{
+							if (!notted)
+								group.eqRef(start, val);
+							else
+								group.neqRef(start, val);
+						}
+						else if (operator.equalsIgnoreCase("neqref"))
+						{
+							if (!notted)
+								group.neqRef(start, val);
+							else
+								group.eqRef(start, val);
+						}
+						else if (operator.equalsIgnoreCase("leref"))
+						{
+							if (notted)
+								throw new IllegalArgumentException("Unexpected symbol NOT before " + operator);
 
-						group.leRef(start, val);
-					}
-					else if (operator.equalsIgnoreCase("geref"))
-					{
-						if (notted)
-							throw new IllegalArgumentException("Unexpected symbol NOT before " + operator);
+							group.leRef(start, val);
+						}
+						else if (operator.equalsIgnoreCase("geref"))
+						{
+							if (notted)
+								throw new IllegalArgumentException("Unexpected symbol NOT before " + operator);
 
-						group.geRef(start, val);
-					}
-					else if (operator.equalsIgnoreCase("ltref"))
-					{
-						if (notted)
-							throw new IllegalArgumentException("Unexpected symbol NOT before " + operator);
+							group.geRef(start, val);
+						}
+						else if (operator.equalsIgnoreCase("ltref"))
+						{
+							if (notted)
+								throw new IllegalArgumentException("Unexpected symbol NOT before " + operator);
 
-						group.ltRef(start, val);
-					}
-					else if (operator.equalsIgnoreCase("gtref"))
-					{
-						if (notted)
-							throw new IllegalArgumentException("Unexpected symbol NOT before " + operator);
+							group.ltRef(start, val);
+						}
+						else if (operator.equalsIgnoreCase("gtref"))
+						{
+							if (notted)
+								throw new IllegalArgumentException("Unexpected symbol NOT before " + operator);
 
-						group.gtRef(start, val);
+							group.gtRef(start, val);
+						}
+						else
+						{
+							throw new IllegalArgumentException("Unknown operator: " + operator);
+						}
 					}
 					else
 					{
 						if (notted)
 							throw new IllegalArgumentException("Unexpected symbol NOT before " + operator);
 
-						switch (operator.toLowerCase(Locale.ROOT))
+						// Allow case-insensitive matching for "eq", but leave "=" alone
+						final String lcop = operator.length() == 1 || !Character.isAlphabetic(operator.charAt(0)) ?
+						                    operator :
+						                    operator.toLowerCase(Locale.ROOT);
+
+						switch (lcop)
 						{
 							case "=":
 							case "eq":
@@ -515,8 +538,6 @@ private static List<String> tokenise(final String search)
 	{
 		List<String> tokens = new ArrayList<>();
 
-		char[] operators = new char[]{'=', '<', '>', '~', '!'};
-
 		for (int i = 0; i < search.length(); i++)
 		{
 			try
@@ -538,11 +559,11 @@ private static List<String> tokenise(final String search)
 
 						tokens.add(str);
 					}
-					else if (c == OPEN_BRACKET.charAt(0) || c == CLOSE_BRACKET.charAt(0) || c == COMMA.charAt(0))
+					else if (c == OPEN_BRACKET_C || c == CLOSE_BRACKET_C || c == COMMA_C)
 					{
 						tokens.add(Character.toString(c));
 					}
-					else if (Character.isJavaIdentifierPart(c))
+					else if (Character.isJavaIdentifierPart(c) || c == COLON_C)
 					{
 						final int start = i;
 						// Search for: EOF, next char that is not isJavaIdentifierPart, a dot colon or square brackets
@@ -563,7 +584,7 @@ else if (Character.isJavaIdentifierPart(c))
 							tokens.add(search.substring(start, i + 1));
 						}
 					}
-					else if ((c == '-' && tokenPeekIs(search, i, '-')) || (c == '/' && tokenPeekIs(search, i, '/')))
+					else if (tokenTupleMatch(search,i, c, '-','-') || tokenTupleMatch(search,i, c, '/','/'))
 					{
 						i++;
 
@@ -576,7 +597,7 @@ else if ((c == '-' && tokenPeekIs(search, i, '-')) || (c == '/' && tokenPeekIs(s
 						// Skip over all data
 						i = endPos;
 					}
-					else if (c == '/' && tokenPeekIs(search, i, '*'))
+					else if (tokenTupleMatch(search,i, c, '/','*'))
 					{
 						i++;
 
@@ -591,11 +612,11 @@ else if (c == '/' && tokenPeekIs(search, i, '*'))
 
 						i = endPos +1;
 					}
-					else if (ArrayUtils.indexOf(operators, c) != -1)
+					else if (ArrayUtils.indexOf(OPERATORS, c) != -1)
 					{
 						final int start = i;
-						// Search for: EOF, next char that is not isJavaIdentifierPart / ":"
-						while (i < search.length() && ArrayUtils.indexOf(operators, search.charAt(i)) != -1)
+						// Consume a run of operators, stopping if we hit EOF
+						while (i < search.length() && ArrayUtils.indexOf(OPERATORS, search.charAt(i)) != -1)
 						{
 							i++;
 						}
@@ -628,12 +649,25 @@ else if (ArrayUtils.indexOf(operators, c) != -1)
 	}
 
 
-	public static boolean tokenPeekIs(final String s, final int i, final char c)
+	/**
+	 * Tests if the current+next token matches (a,b)
+	 *
+	 * @param s    source string
+	 * @param i    current token position
+	 * @param curr the current token
+	 * @param a    desired first token
+	 * @param b    desired second token
+	 * @return
+	 */
+	private static boolean tokenTupleMatch(final String s, final int i, final char curr, final char a, final char b)
 	{
-		if (s.length() > i)
-			return c == s.charAt(i + 1);
-		else
-			return false;
+		return
+				// current token matches
+				curr == a &&
+				// we are not at EOF
+				s.length() > i &&
+				// the next token matches
+				b == s.charAt(i + 1);
 	}
 
 	public static boolean isBareWordPart(final char c)

guice/common/src/main/java/com/peterphi/std/guice/restclient/resteasy/impl/PausableProxy.java

@@ -3,15 +3,19 @@
 import com.peterphi.std.guice.apploader.impl.GuiceBuilder;
 import com.peterphi.std.guice.common.breaker.Breaker;
 import com.peterphi.std.guice.restclient.exception.ServiceBreakerTripPreventsCallException;
+import com.peterphi.std.io.FileHelper;
 import com.peterphi.std.threading.Deadline;
 import com.peterphi.std.threading.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import jakarta.ws.rs.BadRequestException;
+import java.io.InputStream;
+import java.io.Reader;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Base64;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -86,10 +90,45 @@ public Object invoke(final Object proxy, final Method method, final Object[] arg
 			final Throwable cause = e.getCause();
 
 			// Make sure we never throw a BadRequestException, because this bubbles all the way up and throws a 400 Bad Request error against our own service if uncaught
-			if (cause instanceof BadRequestException)
-				throw new RuntimeException("Remote service returned 400 Bad Request!", e);
+			if (cause instanceof BadRequestException br)
+			{
+				final String methodName = method.getDeclaringClass().getSimpleName() + "::" + method.getName();
+
+				if (log.isWarnEnabled())
+				{
+					try
+					{
+						if (br.getResponse() != null && br.getResponse().hasEntity())
+						{
+							final Object entity = br.getResponse().getEntity();
+
+							final String body = switch (entity)
+							{
+								case InputStream is ->
+									// TODO should read binary data and use heuristic to determine if text, otherwise base64 encode
+										FileHelper.cat(is);
+								case Reader r -> FileHelper.cat(r);
+								case CharSequence cs -> cs.toString();
+								case byte[] arr -> "byte[]: " + Base64.getEncoder().encodeToString(arr);
+								case null -> "(null body)";
+								default -> "Entity class=" + entity.getClass().getSimpleName() + ": " + entity;
+							};
+
+							log.warn("HTTP Call {} Encountered 400 Bad Request error, response body: {}", methodName, body, br);
+						}
+					}
+					catch (Throwable tt)
+					{
+						// ignore
+					}
+				}
+
+				throw new RuntimeException("Remote service call " + methodName + " returned 400 Bad Request!", br);
+			}
 			else
+			{
 				throw cause;
+			}
 		}
 	}
 
@@ -109,14 +148,7 @@ private void pause(final boolean fastFail)
 			{
 				while (isPaused() && deadline.isValid())
 				{
-					try
-					{
-						Thread.sleep(500);
-					}
-					catch (InterruptedException e)
-					{
-						return;
-					}
+					Timeout.ONE_SECOND.sleep(deadline);
 				}
 			}
 			finally