Merge pull request #39503 from ketola/39375-jaxb-exception

Improve JAXB Exception handling
quarkusio · Apr 22, 2024 · 54db277 · 54db277
2 parents a9f0f54 + 744ccfb
commit 54db277
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/...oyment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SimpleXmlTest.java b/...oyment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SimpleXmlTest.java
@@ -75,6 +75,17 @@ public void testXml() {
         assertEquals(person.getLast(), secondPerson.getLast());
     }
 
+    @Test
+    public void testInvalidXml() {
+        RestAssured
+                .with()
+                .body("<person><first>Bob</first></invalid>")
+                .contentType("application/xml")
+                .post("/simple/person")
+                .then()
+                .statusCode(400);
+    }
+
     @Test
     public void testLargeXmlPost() {
         StringBuilder sb = new StringBuilder();

diff --git a/...va/io/quarkus/resteasy/reactive/jaxb/runtime/serialisers/ServerJaxbMessageBodyReader.java b/...va/io/quarkus/resteasy/reactive/jaxb/runtime/serialisers/ServerJaxbMessageBodyReader.java
@@ -12,10 +12,12 @@
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Providers;
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBElement;
 import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.UnmarshalException;
 import jakarta.xml.bind.Unmarshaller;
 
 import org.jboss.resteasy.reactive.common.util.StreamUtil;
@@ -73,6 +75,8 @@ protected Object unmarshal(InputStream entityStream, Class<Object> type) {
             JAXBElement<Object> item = getUnmarshall(type)
                     .unmarshal(new StreamSource(entityStream), type);
             return item.getValue();
+        } catch (UnmarshalException e) {
+            throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
         } catch (JAXBException e) {
             throw new RuntimeException(e);
         }