fixes #117 (#118)

* fixes #117 * fixes #117 * add one more fix for audit the request validation result
networknt · Nov 19, 2019 · 9aa9a83 · 9aa9a83
1 parent 3407a3e
commit 9aa9a83
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/openapi-validator/src/main/java/com/networknt/openapi/RequestValidator.java b/openapi-validator/src/main/java/com/networknt/openapi/RequestValidator.java
@@ -27,6 +27,7 @@
 import java.util.Optional;
 import java.util.Set;
 
+import io.undertow.util.Headers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,12 +85,13 @@ public Status validateRequest(final NormalisedPath requestPath, HttpServerExchan
 
         Status status = validateRequestParameters(exchange, requestPath, openApiOperation);
         if(status != null) return status;
-
-        Object body = exchange.getAttachment(BodyHandler.REQUEST_BODY);
-        // skip the body validation if body parser is not in the request chain.
-        if(body == null && ValidatorHandler.config.skipBodyValidation) return null;
-        status = validateRequestBody(body, openApiOperation);
-
+        String contentType = exchange.getRequestHeaders().getFirst(Headers.CONTENT_TYPE);
+        if (contentType==null || contentType.startsWith("application/json")) {
+            Object body = exchange.getAttachment(BodyHandler.REQUEST_BODY);
+            // skip the body validation if body parser is not in the request chain.
+            if(body == null && ValidatorHandler.config.skipBodyValidation) return null;
+            status = validateRequestBody(body, openApiOperation);
+        }
         return status;
     }
 

diff --git a/openapi-validator/src/main/java/com/networknt/openapi/ValidatorHandler.java b/openapi-validator/src/main/java/com/networknt/openapi/ValidatorHandler.java
@@ -81,15 +81,13 @@ public void handleRequest(final HttpServerExchange exchange) throws Exception {
             setExchangeStatus(exchange, STATUS_MISSING_OPENAPI_OPERATION);
             return;
         }
-
         Status status = requestValidator.validateRequest(requestPath, exchange, openApiOperation);
         if(status != null) {
-            exchange.setStatusCode(status.getStatusCode());
-            status.setDescription(status.getDescription().replaceAll("\\\\", "\\\\\\\\"));
-            exchange.getResponseSender().send(status.toString());
+            setExchangeStatus(exchange, status.getCode());
             if(config.logError) logger.error("ValidationError:" + status.toString());
             return;
         }
+
         if(config.validateResponse) {
             validateResponse(exchange, openApiOperation);
         }