-
Notifications
You must be signed in to change notification settings - Fork 349
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug fix: move H2 illegal message header check from message converters…
… to protocol interceptors
- Loading branch information
Showing
8 changed files
with
302 additions
and
168 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
httpcore5-h2/src/main/java/org/apache/hc/core5/http2/protocol/H2RequestConformance.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * ==================================================================== | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| * ==================================================================== | ||
| * | ||
| * This software consists of voluntary contributions made by many | ||
| * individuals on behalf of the Apache Software Foundation. For more | ||
| * information on the Apache Software Foundation, please see | ||
| * <http://www.apache.org/>. | ||
| * | ||
| */ | ||
|
|
||
| package org.apache.hc.core5.http2.protocol; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import org.apache.hc.core5.annotation.Contract; | ||
| import org.apache.hc.core5.annotation.Internal; | ||
| import org.apache.hc.core5.annotation.ThreadingBehavior; | ||
| import org.apache.hc.core5.http.EntityDetails; | ||
| import org.apache.hc.core5.http.Header; | ||
| import org.apache.hc.core5.http.HttpException; | ||
| import org.apache.hc.core5.http.HttpHeaders; | ||
| import org.apache.hc.core5.http.HttpRequest; | ||
| import org.apache.hc.core5.http.HttpRequestInterceptor; | ||
| import org.apache.hc.core5.http.ProtocolException; | ||
| import org.apache.hc.core5.http.protocol.HttpContext; | ||
| import org.apache.hc.core5.util.Args; | ||
|
|
||
| /** | ||
| * This request interceptor is responsible for execution of the protocol conformance | ||
| * checks on incoming or outgoing HTTP/2 request messages. | ||
| */ | ||
| @Internal | ||
| @Contract(threading = ThreadingBehavior.IMMUTABLE) | ||
| public class H2RequestConformance implements HttpRequestInterceptor { | ||
|
|
||
| public static final H2RequestConformance INSTANCE = new H2RequestConformance(); | ||
|
|
||
| private final String[] illegalHeaderNames; | ||
|
|
||
| @Internal | ||
| public H2RequestConformance(final String... illegalHeaderNames) { | ||
| super(); | ||
| this.illegalHeaderNames = illegalHeaderNames; | ||
| } | ||
|
|
||
| public H2RequestConformance() { | ||
| this( | ||
| HttpHeaders.CONNECTION, | ||
| HttpHeaders.KEEP_ALIVE, | ||
| HttpHeaders.PROXY_CONNECTION, | ||
| HttpHeaders.TRANSFER_ENCODING, | ||
| HttpHeaders.HOST, | ||
| HttpHeaders.UPGRADE, | ||
| HttpHeaders.TE); | ||
| } | ||
|
|
||
| @Override | ||
| public void process(final HttpRequest request, final EntityDetails entity, final HttpContext localContext) | ||
| throws HttpException, IOException { | ||
| Args.notNull(request, "HTTP request"); | ||
| for (int i = 0; i < illegalHeaderNames.length; i++) { | ||
| final String headerName = illegalHeaderNames[i]; | ||
| final Header header = request.getFirstHeader(headerName); | ||
| if (header != null) { | ||
| if (headerName.equalsIgnoreCase(HttpHeaders.TE)) { | ||
| final String value = header.getValue(); | ||
| if (!"trailers".equalsIgnoreCase(value)) { | ||
| throw new ProtocolException("Header '%s: %s' is illegal for HTTP/2 messages", HttpHeaders.TE, value); | ||
| } | ||
| } else { | ||
| throw new ProtocolException("Header '%s' is illegal for HTTP/2 messages", headerName); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
84 changes: 84 additions & 0 deletions
84
httpcore5-h2/src/main/java/org/apache/hc/core5/http2/protocol/H2ResponseConformance.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * ==================================================================== | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| * ==================================================================== | ||
| * | ||
| * This software consists of voluntary contributions made by many | ||
| * individuals on behalf of the Apache Software Foundation. For more | ||
| * information on the Apache Software Foundation, please see | ||
| * <http://www.apache.org/>. | ||
| * | ||
| */ | ||
|
|
||
| package org.apache.hc.core5.http2.protocol; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import org.apache.hc.core5.annotation.Contract; | ||
| import org.apache.hc.core5.annotation.Internal; | ||
| import org.apache.hc.core5.annotation.ThreadingBehavior; | ||
| import org.apache.hc.core5.http.EntityDetails; | ||
| import org.apache.hc.core5.http.Header; | ||
| import org.apache.hc.core5.http.HttpException; | ||
| import org.apache.hc.core5.http.HttpHeaders; | ||
| import org.apache.hc.core5.http.HttpResponse; | ||
| import org.apache.hc.core5.http.HttpResponseInterceptor; | ||
| import org.apache.hc.core5.http.ProtocolException; | ||
| import org.apache.hc.core5.http.protocol.HttpContext; | ||
| import org.apache.hc.core5.util.Args; | ||
|
|
||
| /** | ||
| * This response interceptor is responsible for making the protocol conformance checks | ||
| * of incoming or outgoing HTTP/2 response messages. | ||
| */ | ||
| @Internal | ||
| @Contract(threading = ThreadingBehavior.IMMUTABLE) | ||
| public class H2ResponseConformance implements HttpResponseInterceptor { | ||
|
|
||
| public static final H2ResponseConformance INSTANCE = new H2ResponseConformance(); | ||
|
|
||
| private final String[] illegalHeaderNames; | ||
|
|
||
| @Internal | ||
| public H2ResponseConformance(final String... illegalHeaderNames) { | ||
| super(); | ||
| this.illegalHeaderNames = illegalHeaderNames; | ||
| } | ||
|
|
||
| public H2ResponseConformance() { | ||
| this( | ||
| HttpHeaders.CONNECTION, | ||
| HttpHeaders.KEEP_ALIVE, | ||
| HttpHeaders.TRANSFER_ENCODING, | ||
| HttpHeaders.UPGRADE); | ||
| } | ||
|
|
||
| @Override | ||
| public void process(final HttpResponse response, final EntityDetails entity, final HttpContext context) | ||
| throws HttpException, IOException { | ||
| Args.notNull(response, "HTTP response"); | ||
| for (int i = 0; i < illegalHeaderNames.length; i++) { | ||
| final String headerName = illegalHeaderNames[i]; | ||
| final Header header = response.getFirstHeader(headerName); | ||
| if (header != null) { | ||
| throw new ProtocolException("Header '%s' is illegal for HTTP/2 messages", headerName); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.