grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: add header matching special cases for hiding/exposing some gRPC headers (#7224) 

Expose "content-type" header (hard-coded) at header matching, pretend it's already there.
This commit is contained in:
Chengyuan Zhang 2020-07-22 01:02:29 +00:00 committed by GitHub
parent 24731102c6
commit 1e238ee2a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xds/src/main/java/io/grpc/xds/RouteMatch.java
View File

@ -65,7 +65,16 @@ final class RouteMatch {
return false; return false;
} }
for (HeaderMatcher headerMatcher : headerMatchers) { for (HeaderMatcher headerMatcher : headerMatchers) {
if (!headerMatcher.matchesValue(headers.get(headerMatcher.getName()))) { Iterable<String> headerValues = headers.get(headerMatcher.getName());
// Special cases for hiding headers: "grpc-previous-rpc-attempts".
if (headerMatcher.getName().equals("grpc-previous-rpc-attempts")) {
headerValues = null;
}
// Special case for exposing headers: "content-type".
if (headerMatcher.getName().equals("content-type")) {
headerValues = Collections.singletonList("application/grpc");
}
if (!headerMatcher.matchesValue(headerValues)) {
return false; return false;
} }
} }

30
xds/src/test/java/io/grpc/xds/RouteMatchTest.java
View File

@ -40,7 +40,7 @@ public class RouteMatchTest {
@Before @Before
public void setUp() { public void setUp() {
headers.put("content-type", Collections.singletonList("application/grpc")); headers.put("authority", Collections.singletonList("foo.googleapis.com"));
headers.put("grpc-encoding", Collections.singletonList("gzip")); headers.put("grpc-encoding", Collections.singletonList("gzip"));
headers.put("user-agent", Collections.singletonList("gRPC-Java")); headers.put("user-agent", Collections.singletonList("gRPC-Java"));
headers.put("content-length", Collections.singletonList("1000")); headers.put("content-length", Collections.singletonList("1000"));
@ -79,7 +79,7 @@ public class RouteMatchTest {
new HeaderMatcher( new HeaderMatcher(
"grpc-encoding", "gzip", null, null, null, null, null, false), "grpc-encoding", "gzip", null, null, null, null, null, false),
new HeaderMatcher( new HeaderMatcher(
"content-type", null, Pattern.compile(".*grpc.*"), null, null, null, "authority", null, Pattern.compile(".*googleapis.*"), null, null, null,
null, false), null, false),
new HeaderMatcher( new HeaderMatcher(
"content-length", null, null, new Range(100, 10000), null, null, null, false), "content-length", null, null, new Range(100, 10000), null, null, null, false),
@ -93,7 +93,7 @@ public class RouteMatchTest {
new PathMatcher("/FooService/barMethod", null, null), new PathMatcher("/FooService/barMethod", null, null),
Collections.singletonList( Collections.singletonList(
new HeaderMatcher( new HeaderMatcher(
"content-type", null, Pattern.compile(".*grpc.*"), null, null, null, "authority", null, Pattern.compile(".*googleapis.*"), null, null, null,
null, true)), null, true)),
null); null);
assertThat(routeMatch2.matches("/FooService/barMethod", headers)).isFalse(); assertThat(routeMatch2.matches("/FooService/barMethod", headers)).isFalse();
@ -161,6 +161,30 @@ public class RouteMatchTest {
assertThat(routeMatch2.matches("/FooService/barMethod", headers)).isFalse(); assertThat(routeMatch2.matches("/FooService/barMethod", headers)).isFalse();
} }
@Test
public void headerMatching_specialCaseGrpcHeaders() {
Map<String, Iterable<String>> headers = new HashMap<>();
headers.put("grpc-previous-rpc-attempts", Collections.singletonList("0"));
RouteMatch routeMatch1 =
new RouteMatch(new PathMatcher("/FooService/barMethod", null, null),
Arrays.asList(
new HeaderMatcher(
"grpc-previous-rpc-attempts", "0", null, null, null, null,
null, false)),
null);
assertThat(routeMatch1.matches("/FooService/barMethod", headers)).isFalse();
RouteMatch routeMatch2 =
new RouteMatch(new PathMatcher("/FooService/barMethod", null, null),
Arrays.asList(
new HeaderMatcher(
"content-type", "application/grpc", null, null, null, null,
null, false)),
null);
assertThat(routeMatch2.matches("/FooService/barMethod", headers)).isTrue();
}
private static final class FakeRandom implements ThreadSafeRandom { private static final class FakeRandom implements ThreadSafeRandom {
private final int value; private final int value;