Handle unchecked HTTP codec rejections

Author: BenCodez

SimpleAPI/src/main/java/com/bencodez/simpleapi/servercomm/http/HttpBackendTransportConnector.java

@@ -284,7 +284,7 @@ public boolean send(JsonEnvelope envelope) {
 			if (encoded == null) throw new IllegalArgumentException("HTTP wire codec returned no envelope");
 			HttpTransportProtocol.validateEnvelope(encoded);
 		}
-		catch (IllegalArgumentException invalid) { return false; }
+		catch (RuntimeException invalid) { return false; }
 		synchronized (state) {
 			if (!sendAdmissionOpen || !running.get()) return false;
 			if (outgoing.size() >= HttpTransportProtocol.MAX_QUEUE) return false;

SimpleAPI/src/main/java/com/bencodez/simpleapi/servercomm/http/HttpProxyTransportServer.java

@@ -322,7 +322,7 @@ private boolean send(String serverId, String deliveryId, JsonEnvelope envelope,
 			HttpTransportProtocol.validateEnvelope(envelope);
 			validateForWire(envelope);
 		}
-		catch (IllegalArgumentException invalid) { return false; }
+		catch (RuntimeException invalid) { return false; }
 		BackendState backend;
 		final String canonicalServerId = serverId;
 		try { backend = backendState(canonicalServerId); }

SimpleAPI/src/test/java/com/bencodez/simpleapi/servercomm/http/HttpEnvelopeWireCodecTest.java

@@ -182,6 +182,34 @@ void wireExpansionIsRejectedBeforeItCanBlockAQueue() throws Exception {
 		}
 	}
 
+	@Test
+	void uncheckedCodecRejectionReturnsFalseAtBothSendBoundaries() throws Exception {
+		HttpEnvelopeWireCodec rejecting = new HttpEnvelopeWireCodec() {
+			@Override public JsonEnvelope encode(JsonEnvelope envelope) {
+				throw new IllegalStateException("codec rejected envelope");
+			}
+
+			@Override public JsonEnvelope decode(JsonEnvelope envelope) { return envelope; }
+		};
+		HttpTlsIdentity identity = HttpTlsIdentity.loadOrCreate(directory.resolve("rejecting-proxy"), "localhost");
+		HttpEnrollmentAuthority authority = new HttpEnrollmentAuthority(identity, directory.resolve("rejecting-authority"));
+		try (HttpProxyTransportServer server = server(identity, authority, directory.resolve("rejecting-outgoing"),
+				rejecting, ignored -> { })) {
+			assertFalse(server.send("backend-a", UUID.randomUUID().toString(), JsonEnvelope.builder("test").build()));
+			server.start();
+			HttpConnectionCode code = authority.createConnectionCode("backend-a", server.endpoint("localhost"),
+					Duration.ofMinutes(5));
+			Path credentials = directory.resolve("rejecting-client");
+			HttpBackendTransportConnector.enroll(code, "backend-a", credentials);
+			try (HttpBackendTransportConnector connector = new HttpBackendTransportConnector(credentials,
+					ignored -> { }, rejecting)) {
+				connector.start();
+				assertTrue(connector.awaitFirstResponse(System.nanoTime() + TimeUnit.SECONDS.toNanos(8)));
+				assertFalse(connector.send(JsonEnvelope.builder("test").build()));
+			}
+		}
+	}
+
 	private static HttpProxyTransportServer server(HttpTlsIdentity identity, HttpEnrollmentAuthority authority,
 			Path outgoing, HttpEnvelopeWireCodec codec,
 			java.util.function.Consumer<HttpProxyTransportServer.ReceivedEnvelope> consumer) throws Exception {