fix: create and reuse self signed jwt creds for better performance (#1154)

arithmetic1728 · web-flow · commit eaaa8e89cf69 · 2023-02-14T10:28:18.000-08:00
* fix: create and reuse self signed jwt creds for better performance

* only create jwt cred when needed
diff --git a/oauth2_http/java/com/google/auth/oauth2/ServiceAccountCredentials.java b/oauth2_http/java/com/google/auth/oauth2/ServiceAccountCredentials.java
@@ -110,6 +110,8 @@ public class ServiceAccountCredentials extends GoogleCredentials
 
   private transient HttpTransportFactory transportFactory;
 
+  private transient JwtCredentials selfSignedJwtCredentialsWithScope = null;
+
   /**
    * Internal constructor
    *
@@ -704,6 +706,11 @@ public boolean getUseJwtAccessWithScope() {
     return useJwtAccessWithScope;
   }
 
+  @VisibleForTesting
+  JwtCredentials getSelfSignedJwtCredentialsWithScope() {
+    return selfSignedJwtCredentialsWithScope;
+  }
+
   @Override
   public String getAccount() {
     return getClientEmail();
@@ -935,8 +942,11 @@ public Map<String, List<String>> getRequestMetadata(URI uri) throws IOException
     // Otherwise, use self signed JWT with uri as the audience.
     JwtCredentials jwtCredentials;
     if (!createScopedRequired() && useJwtAccessWithScope) {
-      // Create JWT credentials with the scopes.
-      jwtCredentials = createSelfSignedJwtCredentials(null);
+      // Create selfSignedJwtCredentialsWithScope when needed and reuse it for better performance.
+      if (selfSignedJwtCredentialsWithScope == null) {
+        selfSignedJwtCredentialsWithScope = createSelfSignedJwtCredentials(null);
+      }
+      jwtCredentials = selfSignedJwtCredentialsWithScope;
     } else {
       // Create JWT credentials with the uri as audience.
       jwtCredentials = createSelfSignedJwtCredentials(uri);
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountCredentialsTest.java
@@ -1465,6 +1465,7 @@ public void getRequestMetadata_selfSignedJWT_withScopes() throws IOException {
             .build();
 
     Map<String, List<String>> metadata = credentials.getRequestMetadata(CALL_URI);
+    assertNotNull(((ServiceAccountCredentials) credentials).getSelfSignedJwtCredentialsWithScope());
     verifyJwtAccess(metadata, "dummy.scope");
   }
 
@@ -1518,6 +1519,7 @@ public void getRequestMetadata_selfSignedJWT_withAudience() throws IOException {
             .build();
 
     Map<String, List<String>> metadata = credentials.getRequestMetadata(CALL_URI);
+    assertNull(((ServiceAccountCredentials) credentials).getSelfSignedJwtCredentialsWithScope());
     verifyJwtAccess(metadata, null);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1465,6 +1465,7 @@ public void getRequestMetadata_selfSignedJWT_withScopes() throws IOException {`
`1465`	`1465`	`.build();`
`1466`	`1466`
`1467`	`1467`	`Map<String, List<String>> metadata = credentials.getRequestMetadata(CALL_URI);`
	`1468`	`+ assertNotNull(((ServiceAccountCredentials) credentials).getSelfSignedJwtCredentialsWithScope());`
`1468`	`1469`	`verifyJwtAccess(metadata, "dummy.scope");`
`1469`	`1470`	`}`
`1470`	`1471`
`@@ -1518,6 +1519,7 @@ public void getRequestMetadata_selfSignedJWT_withAudience() throws IOException {`
`1518`	`1519`	`.build();`
`1519`	`1520`
`1520`	`1521`	`Map<String, List<String>> metadata = credentials.getRequestMetadata(CALL_URI);`
	`1522`	`+ assertNull(((ServiceAccountCredentials) credentials).getSelfSignedJwtCredentialsWithScope());`
`1521`	`1523`	`verifyJwtAccess(metadata, null);`
`1522`	`1524`	`}`
`1523`	`1525`