diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-10-07 10:28:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-07 10:28:45 +0200 |
commit | 7438b33d2447f5348e25c18160a592924130ee25 (patch) | |
tree | f83b786d8d424bd611ee6f50998c27da1bd3b7bc /container-core/src/main/java/com/yahoo/jdisc | |
parent | 973c8f0aaf9d755aebd2c9a6c2226fc81dc1b183 (diff) | |
parent | 0f15123c14bc8fec27693d4122108c9e1be67df4 (diff) |
Merge pull request #24344 from vespa-engine/bratseth/return-ignored-fields
Return X-Vespa-Ignored-Fields if fields were ignored
Diffstat (limited to 'container-core/src/main/java/com/yahoo/jdisc')
-rw-r--r-- | container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java | 56 |
1 files changed, 24 insertions, 32 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java index 72057563e36..d2dbfaa3514 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java @@ -54,17 +54,14 @@ class FormPostRequestHandler extends AbstractRequestHandler implements ContentCh * @param delegateHandler the "real" request handler that this handler wraps * @param contentCharsetName name of the charset to use when interpreting the content data */ - public FormPostRequestHandler( - final RequestHandler delegateHandler, - final String contentCharsetName, - final boolean removeBody) { + public FormPostRequestHandler(RequestHandler delegateHandler, String contentCharsetName, boolean removeBody) { this.delegateHandler = Objects.requireNonNull(delegateHandler); this.contentCharsetName = Objects.requireNonNull(contentCharsetName); this.removeBody = removeBody; } @Override - public ContentChannel handleRequest(final Request request, final ResponseHandler responseHandler) { + public ContentChannel handleRequest(Request request, ResponseHandler responseHandler) { Preconditions.checkArgument(request instanceof HttpRequest, "Expected HttpRequest, got " + request); Objects.requireNonNull(responseHandler, "responseHandler"); @@ -77,24 +74,24 @@ class FormPostRequestHandler extends AbstractRequestHandler implements ContentCh } @Override - public void write(final ByteBuffer buf, final CompletionHandler completionHandler) { + public void write(ByteBuffer buf, CompletionHandler completionHandler) { assert buf.hasArray(); accumulatedRequestContent.write(buf.array(), buf.arrayOffset() + buf.position(), buf.remaining()); completionHandler.completed(); } @Override - public void close(final CompletionHandler completionHandler) { - try (final ResourceReference ref = requestReference) { - final byte[] requestContentBytes = accumulatedRequestContent.toByteArray(); - final String content = new String(requestContentBytes, contentCharset); + public void close(CompletionHandler completionHandler) { + try (ResourceReference ref = requestReference) { + byte[] requestContentBytes = accumulatedRequestContent.toByteArray(); + String content = new String(requestContentBytes, contentCharset); completionHandler.completed(); - final Map<String, List<String>> parameterMap = parseFormParameters(content); + Map<String, List<String>> parameterMap = parseFormParameters(content); mergeParameters(parameterMap, request.parameters()); - final ContentChannel contentChannel = delegateHandler.handleRequest(request, responseHandler); + ContentChannel contentChannel = delegateHandler.handleRequest(request, responseHandler); if (contentChannel != null) { if (!removeBody) { - final ByteBuffer byteBuffer = ByteBuffer.wrap(requestContentBytes); + ByteBuffer byteBuffer = ByteBuffer.wrap(requestContentBytes); contentChannel.write(byteBuffer, NOOP_COMPLETION_HANDLER); } contentChannel.close(NOOP_COMPLETION_HANDLER); @@ -109,14 +106,10 @@ class FormPostRequestHandler extends AbstractRequestHandler implements ContentCh * @return a valid Charset for the charset name (never returns null) * @throws RequestException if the charset name is invalid or unsupported */ - private static Charset getCharsetByName(final String charsetName) throws RequestException { + private static Charset getCharsetByName(String charsetName) throws RequestException { try { - final Charset charset = Charset.forName(charsetName); - if (charset == null) { - throw new RequestException(UNSUPPORTED_MEDIA_TYPE, "Unsupported charset " + charsetName); - } - return charset; - } catch (final IllegalCharsetNameException |UnsupportedCharsetException e) { + return Charset.forName(charsetName); + } catch (IllegalCharsetNameException | UnsupportedCharsetException e) { throw new RequestException(UNSUPPORTED_MEDIA_TYPE, "Unsupported charset " + charsetName, e); } } @@ -127,17 +120,17 @@ class FormPostRequestHandler extends AbstractRequestHandler implements ContentCh * @param formContent raw form content data (body) * @return map of decoded parameters */ - private static Map<String, List<String>> parseFormParameters(final String formContent) { + private static Map<String, List<String>> parseFormParameters(String formContent) { if (formContent.isEmpty()) { return Collections.emptyMap(); } - final Map<String, List<String>> parameterMap = new HashMap<>(); - final String[] params = formContent.split("&"); - for (final String param : params) { - final String[] parts = param.split("="); - final String paramName = urlDecode(parts[0]); - final String paramValue = parts.length > 1 ? urlDecode(parts[1]) : ""; + Map<String, List<String>> parameterMap = new HashMap<>(); + String[] params = formContent.split("&"); + for (String param : params) { + String[] parts = param.split("="); + String paramName = urlDecode(parts[0]); + String paramValue = parts.length > 1 ? urlDecode(parts[1]) : ""; List<String> currentValues = parameterMap.get(paramName); if (currentValues == null) { currentValues = new LinkedList<>(); @@ -159,7 +152,7 @@ class FormPostRequestHandler extends AbstractRequestHandler implements ContentCh // Regardless of the charset used to transfer the request body, // all percent-escaping of non-ascii characters should use UTF-8 code points. return URLDecoder.decode(encoded, StandardCharsets.UTF_8.name()); - } catch (final UnsupportedEncodingException e) { + } catch (UnsupportedEncodingException e) { // Unfortunately, there is no URLDecoder.decode() method that takes a Charset, so we have to deal // with this exception. throw new IllegalStateException("Whoa, JVM doesn't support UTF-8 today.", e); @@ -172,11 +165,9 @@ class FormPostRequestHandler extends AbstractRequestHandler implements ContentCh * @param source containing the parameters to copy into the destination * @param destination receiver of parameters, possibly already containing data */ - private static void mergeParameters( - final Map<String,List<String>> source, - final Map<String,List<String>> destination) { + private static void mergeParameters(Map<String,List<String>> source, Map<String,List<String>> destination) { for (Map.Entry<String, List<String>> entry : source.entrySet()) { - final List<String> destinationValues = destination.get(entry.getKey()); + List<String> destinationValues = destination.get(entry.getKey()); if (destinationValues != null) { destinationValues.addAll(entry.getValue()); } else { @@ -189,4 +180,5 @@ class FormPostRequestHandler extends AbstractRequestHandler implements ContentCh public RequestHandler getDelegate() { return delegateHandler; } + } |