alts: Add ClientCall support to AltsContextUtil

This adds a createFrom(Attributes) to mirror the check(Attributes) added
in ba8ab79. It also adds conveniences for ClientCall for both
createFrom() and check(). This allows getting peer information from
ClientCall and CallCredentials.RequestInfo, as was already available
from ServerCall.

The tests were reworked to test the Attribute-based methods and then
only basic tests for client/server.

Fixes #11042

Author: ejona86

alts/src/main/java/io/grpc/alts/AltsContextUtil.java

@@ -17,6 +17,7 @@
 package io.grpc.alts;
 
 import io.grpc.Attributes;
+import io.grpc.ClientCall;
 import io.grpc.ExperimentalApi;
 import io.grpc.ServerCall;
 import io.grpc.alts.internal.AltsInternalContext;
@@ -29,14 +30,36 @@ public final class AltsContextUtil {
   private AltsContextUtil() {}
 
   /**
-   * Creates a {@link AltsContext} from ALTS context information in the {@link ServerCall}.
+   * Creates an {@link AltsContext} from ALTS context information in the {@link ServerCall}.
    *
    * @param call the {@link ServerCall} containing the ALTS information
    * @return the created {@link AltsContext}
    * @throws IllegalArgumentException if the {@link ServerCall} has no ALTS information.
    */
   public static AltsContext createFrom(ServerCall<?, ?> call) {
-    Object authContext = call.getAttributes().get(AltsProtocolNegotiator.AUTH_CONTEXT_KEY);
+    return createFrom(call.getAttributes());
+  }
+
+  /**
+   * Creates an {@link AltsContext} from ALTS context information in the {@link ClientCall}.
+   *
+   * @param call the {@link ClientCall} containing the ALTS information
+   * @return the created {@link AltsContext}
+   * @throws IllegalArgumentException if the {@link ClientCall} has no ALTS information.
+   */
+  public static AltsContext createFrom(ClientCall<?, ?> call) {
+    return createFrom(call.getAttributes());
+  }
+
+  /**
+   * Creates an {@link AltsContext} from ALTS context information in the {@link Attributes}.
+   *
+   * @param attributes the {@link Attributes} containing the ALTS information
+   * @return the created {@link AltsContext}
+   * @throws IllegalArgumentException if the {@link Attributes} has no ALTS information.
+   */
+  public static AltsContext createFrom(Attributes attributes) {
+    Object authContext = attributes.get(AltsProtocolNegotiator.AUTH_CONTEXT_KEY);
     if (!(authContext instanceof AltsInternalContext)) {
       throw new IllegalArgumentException("No ALTS context information found");
     }
@@ -53,6 +76,16 @@ public static boolean check(ServerCall<?, ?> call) {
     return check(call.getAttributes());
   }
 
+  /**
+   * Checks if the {@link ClientCall} contains ALTS information.
+   *
+   * @param call the {@link ClientCall} to check
+   * @return true, if the {@link ClientCall} contains ALTS information and false otherwise.
+   */
+  public static boolean check(ClientCall<?, ?> call) {
+    return check(call.getAttributes());
+  }
+
   /**
    * Checks if the {@link Attributes} contains ALTS information.
    *

alts/src/test/java/io/grpc/alts/AltsContextUtilTest.java

@@ -24,6 +24,7 @@
 import static org.mockito.Mockito.when;
 
 import io.grpc.Attributes;
+import io.grpc.ClientCall;
 import io.grpc.ServerCall;
 import io.grpc.alts.AltsContext.SecurityLevel;
 import io.grpc.alts.internal.AltsInternalContext;
@@ -37,27 +38,38 @@
 /** Unit tests for {@link AltsContextUtil}. */
 @RunWith(JUnit4.class)
 public class AltsContextUtilTest {
-
-  private final ServerCall<?,?> call = mock(ServerCall.class);
-
   @Test
   public void check_noAttributeValue() {
-    when(call.getAttributes()).thenReturn(Attributes.newBuilder().build());
+    assertFalse(AltsContextUtil.check(Attributes.newBuilder().build()));
+  }
 
-    assertFalse(AltsContextUtil.check(call));
+  @Test
+  public void check_unexpectedAttributeValueType() {
+    assertFalse(AltsContextUtil.check(Attributes.newBuilder()
+        .set(AltsProtocolNegotiator.AUTH_CONTEXT_KEY, new Object())
+        .build()));
   }
 
   @Test
-  public void contains_unexpectedAttributeValueType() {
+  public void check_altsInternalContext() {
+    assertTrue(AltsContextUtil.check(Attributes.newBuilder()
+        .set(AltsProtocolNegotiator.AUTH_CONTEXT_KEY, AltsInternalContext.getDefaultInstance())
+        .build()));
+  }
+
+  @Test
+  public void checkServer_altsInternalContext() {
+    ServerCall<?,?> call = mock(ServerCall.class);
     when(call.getAttributes()).thenReturn(Attributes.newBuilder()
-        .set(AltsProtocolNegotiator.AUTH_CONTEXT_KEY, new Object())
+        .set(AltsProtocolNegotiator.AUTH_CONTEXT_KEY, AltsInternalContext.getDefaultInstance())
         .build());
 
-    assertFalse(AltsContextUtil.check(call));
+    assertTrue(AltsContextUtil.check(call));
   }
 
   @Test
-  public void contains_altsInternalContext() {
+  public void checkClient_altsInternalContext() {
+    ClientCall<?,?> call = mock(ClientCall.class);
     when(call.getAttributes()).thenReturn(Attributes.newBuilder()
         .set(AltsProtocolNegotiator.AUTH_CONTEXT_KEY, AltsInternalContext.getDefaultInstance())
         .build());
@@ -66,26 +78,57 @@ public void contains_altsInternalContext() {
   }
 
   @Test
-  public void from_altsInternalContext() {
+  public void createFrom_altsInternalContext() {
     HandshakerResult handshakerResult =
         HandshakerResult.newBuilder()
             .setPeerIdentity(Identity.newBuilder().setServiceAccount("remote@peer"))
             .setLocalIdentity(Identity.newBuilder().setServiceAccount("local@peer"))
             .build();
-    when(call.getAttributes()).thenReturn(Attributes.newBuilder()
-        .set(AltsProtocolNegotiator.AUTH_CONTEXT_KEY,  new AltsInternalContext(handshakerResult))
-        .build());
 
-    AltsContext context = AltsContextUtil.createFrom(call);
+    AltsContext context = AltsContextUtil.createFrom(Attributes.newBuilder()
+        .set(AltsProtocolNegotiator.AUTH_CONTEXT_KEY, new AltsInternalContext(handshakerResult))
+        .build());
     assertEquals("remote@peer", context.getPeerServiceAccount());
     assertEquals("local@peer", context.getLocalServiceAccount());
     assertEquals(SecurityLevel.INTEGRITY_AND_PRIVACY, context.getSecurityLevel());
   }
 
   @Test(expected = IllegalArgumentException.class)
-  public void from_noAttributeValue() {
-    when(call.getAttributes()).thenReturn(Attributes.newBuilder().build());
+  public void createFrom_noAttributeValue() {
+    AltsContextUtil.createFrom(Attributes.newBuilder().build());
+  }
 
-    AltsContextUtil.createFrom(call);
+  @Test
+  public void createFromServer_altsInternalContext() {
+    HandshakerResult handshakerResult =
+        HandshakerResult.newBuilder()
+            .setPeerIdentity(Identity.newBuilder().setServiceAccount("remote@peer"))
+            .setLocalIdentity(Identity.newBuilder().setServiceAccount("local@peer"))
+            .build();
+
+    ServerCall<?,?> call = mock(ServerCall.class);
+    when(call.getAttributes()).thenReturn(Attributes.newBuilder()
+        .set(AltsProtocolNegotiator.AUTH_CONTEXT_KEY, new AltsInternalContext(handshakerResult))
+        .build());
+
+    AltsContext context = AltsContextUtil.createFrom(call);
+    assertEquals("remote@peer", context.getPeerServiceAccount());
+  }
+
+  @Test
+  public void createFromClient_altsInternalContext() {
+    HandshakerResult handshakerResult =
+        HandshakerResult.newBuilder()
+            .setPeerIdentity(Identity.newBuilder().setServiceAccount("remote@peer"))
+            .setLocalIdentity(Identity.newBuilder().setServiceAccount("local@peer"))
+            .build();
+
+    ClientCall<?,?> call = mock(ClientCall.class);
+    when(call.getAttributes()).thenReturn(Attributes.newBuilder()
+        .set(AltsProtocolNegotiator.AUTH_CONTEXT_KEY, new AltsInternalContext(handshakerResult))
+        .build());
+
+    AltsContext context = AltsContextUtil.createFrom(call);
+    assertEquals("remote@peer", context.getPeerServiceAccount());
   }
 }