diff --git a/xds/src/main/java/io/grpc/xds/RbacFilter.java b/xds/src/main/java/io/grpc/xds/RbacFilter.java index 38b2db7ebca..c63ee26d74b 100644 --- a/xds/src/main/java/io/grpc/xds/RbacFilter.java +++ b/xds/src/main/java/io/grpc/xds/RbacFilter.java @@ -334,6 +334,10 @@ private static AuthHeaderMatcher parseHeaderMatcher( private static AuthenticatedMatcher parseAuthenticatedMatcher( Principal.Authenticated proto) { + // An unset principal_name matches any authenticated (TLS) connection. + if (!proto.hasPrincipalName()) { + return AuthenticatedMatcher.create(null); + } Matchers.StringMatcher matcher = MatcherParser.parseStringMatcher(proto.getPrincipalName()); return AuthenticatedMatcher.create(matcher); } diff --git a/xds/src/test/java/io/grpc/xds/RbacFilterTest.java b/xds/src/test/java/io/grpc/xds/RbacFilterTest.java index 4680f570327..84d966b6e20 100644 --- a/xds/src/test/java/io/grpc/xds/RbacFilterTest.java +++ b/xds/src/test/java/io/grpc/xds/RbacFilterTest.java @@ -194,6 +194,32 @@ public void authenticatedParser() throws Exception { assertThat(decision.decision()).isEqualTo(GrpcAuthorizationEngine.Action.DENY); } + @Test + @SuppressWarnings("unchecked") + public void authenticatedParser_noPrincipalName_matchesAnyTlsConnection() { + List permissionList = Arrays.asList( + Permission.newBuilder().setAny(true).build()); + List principalList = Arrays.asList( + Principal.newBuilder().setAuthenticated(Authenticated.getDefaultInstance()).build()); + ConfigOrError result = parse(permissionList, principalList); + assertThat(result.errorDetail).isNull(); + GrpcAuthorizationEngine engine = new GrpcAuthorizationEngine(result.config.authConfig()); + + // TLS connection without a client certificate. + Attributes tlsAttributes = Attributes.newBuilder() + .set(Grpc.TRANSPORT_ATTR_SSL_SESSION, mock(SSLSession.class)) + .build(); + ServerCall tlsCall = mock(ServerCall.class); + when(tlsCall.getAttributes()).thenReturn(tlsAttributes); + assertThat(engine.evaluate(new Metadata(), tlsCall).decision()) + .isEqualTo(GrpcAuthorizationEngine.Action.DENY); + + ServerCall plaintextCall = mock(ServerCall.class); + when(plaintextCall.getAttributes()).thenReturn(Attributes.EMPTY); + assertThat(engine.evaluate(new Metadata(), plaintextCall).decision()) + .isEqualTo(GrpcAuthorizationEngine.Action.ALLOW); + } + @Test @SuppressWarnings({"unchecked", "deprecation"}) public void headerParser() {