-
Notifications
You must be signed in to change notification settings - Fork 264
feat(mtls): Introduce DefaultMtlsProviderFactory and SecureConnectProvider #1730
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
3a4bae6
feat(mtls): Introduce DefaultMtlsProviderFactory and SecureConnectPro…
andyrzhao 67a93b3
feat(mtls): fix lint
andyrzhao 7a2b2ce
feat(mtls): Update code comments
andyrzhao d09ec5a
Address PR comments
andyrzhao 047f391
Merge branch 'main' into main
andyrzhao f499899
feat(mtls): Fix import and test
andyrzhao 47c4978
Merge branch 'main' into main
andyrzhao 8671818
feat(mtls): Fix lint.
andyrzhao 47a9719
feat(mtls): Add link to github issue on MtlsProvider interface.
andyrzhao 54108ff
feat(mtls): Fix lint.
andyrzhao dcab27f
feat(mtls): Update Java docs.
andyrzhao c895cb9
feat(mtls): Rename to isAvailable() and minor comment tweaks.
andyrzhao da7cb32
Merge branch 'main' into main
andyrzhao File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
9 changes: 4 additions & 5 deletions
9
oauth2_http/java/com/google/auth/mtls/CertificateSourceUnavailableException.java
This file contains hidden or 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
55 changes: 55 additions & 0 deletions
55
oauth2_http/java/com/google/auth/mtls/ContextAwareMetadataJson.java
This file contains hidden or 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,55 @@ | ||
| /* | ||
| * Copyright 2025 Google LLC | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above | ||
| * copyright notice, this list of conditions and the following disclaimer | ||
| * in the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * * Neither the name of Google LLC nor the names of its | ||
| * contributors may be used to endorse or promote products derived from | ||
| * this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| package com.google.auth.mtls; | ||
|
|
||
| import com.google.api.client.json.GenericJson; | ||
| import com.google.api.client.util.Key; | ||
| import com.google.common.collect.ImmutableList; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Data class representing context_aware_metadata.json file. This is meant for internal Google Cloud | ||
| * usage and behavior may be changed without warning. | ||
| * | ||
| * <p>Note: This implementation is duplicated from the existing ContextAwareMetadataJson found in | ||
| * the Gax library. The Gax library version of ContextAwareMetadataJson will be marked as deprecated | ||
| * in the future. | ||
| */ | ||
| public class ContextAwareMetadataJson extends GenericJson { | ||
lqiu96 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /** Cert provider command */ | ||
| @Key("cert_provider_command") | ||
| private List<String> commands; | ||
|
|
||
| /** Returns the cert provider command. */ | ||
| public final ImmutableList<String> getCommands() { | ||
| return ImmutableList.copyOf(commands); | ||
| } | ||
| } | ||
66 changes: 66 additions & 0 deletions
66
oauth2_http/java/com/google/auth/mtls/DefaultMtlsProviderFactory.java
This file contains hidden or 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,66 @@ | ||
| /* | ||
| * Copyright 2025 Google LLC | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above | ||
| * copyright notice, this list of conditions and the following disclaimer | ||
| * in the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * * Neither the name of Google LLC nor the names of its | ||
| * contributors may be used to endorse or promote products derived from | ||
| * this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| package com.google.auth.mtls; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class DefaultMtlsProviderFactory { | ||
lqiu96 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| /** | ||
| * Creates an instance of {@link MtlsProvider}. It first attempts to create an {@link | ||
| * com.google.auth.mtls.X509Provider}. If the certificate source is unavailable, it falls back to | ||
| * creating a {@link SecureConnectProvider}. If the secure connect provider also fails, it throws | ||
| * a {@link com.google.auth.mtls.CertificateSourceUnavailableException}. | ||
| * | ||
| * <p>This is only meant to be used internally by Google Cloud libraries, and the public facing | ||
| * methods may be changed without notice, and have no guarantee of backwards compatibility. | ||
| * | ||
| * @return an instance of {@link MtlsProvider}. | ||
| * @throws com.google.auth.mtls.CertificateSourceUnavailableException if neither provider can be | ||
| * created. | ||
| * @throws IOException if an I/O error occurs during provider creation. | ||
| */ | ||
| public static MtlsProvider create() throws IOException { | ||
| // Note: The caller should handle CertificateSourceUnavailableException gracefully, since | ||
| // it is an expected error case. All other IOExceptions are unexpected and should be surfaced | ||
| // up the call stack. | ||
| MtlsProvider mtlsProvider = new X509Provider(); | ||
| if (mtlsProvider.isAvailable()) { | ||
| return mtlsProvider; | ||
| } | ||
| mtlsProvider = new SecureConnectProvider(); | ||
| if (mtlsProvider.isAvailable()) { | ||
| return mtlsProvider; | ||
| } | ||
| throw new CertificateSourceUnavailableException( | ||
| "No Certificate Source is available on this device."); | ||
| } | ||
| } | ||
This file contains hidden or 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,61 @@ | ||
| /* | ||
| * Copyright 2025 Google LLC | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above | ||
| * copyright notice, this list of conditions and the following disclaimer | ||
| * in the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * * Neither the name of Google LLC nor the names of its | ||
| * contributors may be used to endorse or promote products derived from | ||
| * this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| package com.google.auth.mtls; | ||
|
|
||
| import java.io.IOException; | ||
| import java.security.KeyStore; | ||
|
|
||
| /** | ||
| * MtlsProvider is used by the Gax library for configuring mutual TLS in the HTTP and GRPC transport | ||
| * layer. The source of the client certificate is up to the implementation. | ||
| * | ||
| * <p>Note: This interface will replace the identically named "MtlsProvider" implementation in the | ||
| * Gax library. The Gax library version of MtlsProvider will be marked as deprecated. See | ||
| * https://github.com/googleapis/google-auth-library-java/issues/1758 | ||
| */ | ||
| public interface MtlsProvider { | ||
lqiu96 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /** | ||
| * Returns a mutual TLS key store. | ||
| * | ||
| * @return KeyStore for configuring mTLS. | ||
| * @throws CertificateSourceUnavailableException if the certificate source is unavailable (ex. | ||
| * missing configuration file). | ||
| * @throws IOException if a general I/O error occurs while creating the KeyStore | ||
| */ | ||
| KeyStore getKeyStore() throws CertificateSourceUnavailableException, IOException; | ||
|
|
||
| /** | ||
| * Returns true if the underlying mTLS provider is available. | ||
| * | ||
| * @throws IOException if a general I/O error occurs while determining availability. | ||
| */ | ||
| boolean isAvailable() throws IOException; | ||
| } | ||
170 changes: 170 additions & 0 deletions
170
oauth2_http/java/com/google/auth/mtls/SecureConnectProvider.java
This file contains hidden or 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,170 @@ | ||
| /* | ||
| * Copyright 2025 Google LLC | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above | ||
| * copyright notice, this list of conditions and the following disclaimer | ||
| * in the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * * Neither the name of Google LLC nor the names of its | ||
| * contributors may be used to endorse or promote products derived from | ||
| * this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| package com.google.auth.mtls; | ||
|
|
||
| import com.google.api.client.json.JsonParser; | ||
| import com.google.api.client.json.gson.GsonFactory; | ||
| import com.google.api.client.util.SecurityUtils; | ||
| import com.google.common.annotations.VisibleForTesting; | ||
| import com.google.common.collect.ImmutableList; | ||
| import java.io.FileInputStream; | ||
| import java.io.FileNotFoundException; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.security.GeneralSecurityException; | ||
| import java.security.KeyStore; | ||
| import java.util.List; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| /** | ||
| * This class implements {@link MtlsProvider} for the Google Auth library transport layer via {@link | ||
| * ContextAwareMetadataJson}. This is only meant to be used internally by Google Cloud libraries, | ||
| * and the public facing methods may be changed without notice, and have no guarantee of backwards | ||
| * compatibility. | ||
| * | ||
| * <p>Note: This implementation is derived from the existing "MtlsProvider" found in the Gax | ||
| * library, with two notable differences: 1) All logic associated with parsing environment variables | ||
| * related to "mTLS usage" are omitted - a separate helper class will be introduced in the Gax | ||
| * library to serve this purpose. 2) getKeyStore throws {@link | ||
| * com.google.auth.mtls.CertificateSourceUnavailableException} instead of returning "null" if this | ||
| * cert source is not available on the device. | ||
| * | ||
| * <p>Additionally, this implementation will replace the existing "MtlsProvider" in the Gax library. | ||
| * The Gax library version of MtlsProvider will be marked as deprecated. | ||
| */ | ||
| public class SecureConnectProvider implements MtlsProvider { | ||
| interface ProcessProvider { | ||
| public Process createProcess(InputStream metadata) throws IOException; | ||
| } | ||
|
|
||
| static class DefaultProcessProvider implements ProcessProvider { | ||
| @Override | ||
| public Process createProcess(InputStream metadata) throws IOException { | ||
| if (metadata == null) { | ||
| throw new IOException("Error creating Process: metadata is null"); | ||
| } | ||
| List<String> command = extractCertificateProviderCommand(metadata); | ||
| return new ProcessBuilder(command).start(); | ||
| } | ||
| } | ||
|
|
||
| private static final String DEFAULT_CONTEXT_AWARE_METADATA_PATH = | ||
| System.getProperty("user.home") + "/.secureConnect/context_aware_metadata.json"; | ||
|
|
||
| private String metadataPath; | ||
| private ProcessProvider processProvider; | ||
|
|
||
| @VisibleForTesting | ||
| SecureConnectProvider(ProcessProvider processProvider, String metadataPath) { | ||
| this.processProvider = processProvider; | ||
| this.metadataPath = metadataPath; | ||
| } | ||
|
|
||
| public SecureConnectProvider() { | ||
| this(new DefaultProcessProvider(), DEFAULT_CONTEXT_AWARE_METADATA_PATH); | ||
| } | ||
|
|
||
| /** | ||
| * Returns a mutual TLS key store backed by the certificate provided by the SecureConnect tool. | ||
| * | ||
| * @return a KeyStore containing the certificate provided by the SecureConnect tool. | ||
| * @throws CertificateSourceUnavailableException if the certificate source is unavailable (ex. | ||
| * missing configuration file). | ||
| * @throws IOException if a general I/O error occurs while creating the KeyStore. | ||
| */ | ||
| @Override | ||
| public KeyStore getKeyStore() throws CertificateSourceUnavailableException, IOException { | ||
| try (InputStream stream = new FileInputStream(metadataPath)) { | ||
| return getKeyStore(stream, processProvider); | ||
| } catch (InterruptedException e) { | ||
| throw new IOException("SecureConnect: Interrupted executing certificate provider command", e); | ||
| } catch (GeneralSecurityException e) { | ||
| throw new CertificateSourceUnavailableException( | ||
| "SecureConnect encountered GeneralSecurityException:", e); | ||
| } catch (FileNotFoundException exception) { | ||
| // If the metadata file doesn't exist, then there is no key store, so we will throw sentinel | ||
| // error | ||
| throw new CertificateSourceUnavailableException("SecureConnect metadata does not exist."); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if the SecureConnect mTLS provider is available. | ||
| * | ||
| * @throws IOException if a general I/O error occurs while determining availability. | ||
| */ | ||
| @Override | ||
| public boolean isAvailable() throws IOException { | ||
| try { | ||
| this.getKeyStore(); | ||
| } catch (CertificateSourceUnavailableException e) { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| static KeyStore getKeyStore(InputStream metadata, ProcessProvider processProvider) | ||
| throws IOException, InterruptedException, GeneralSecurityException { | ||
| Process process = processProvider.createProcess(metadata); | ||
|
|
||
| // Run the command and timeout after 1000 milliseconds. | ||
| // The cert provider command usually finishes instantly (if it doesn't hang), | ||
| // so 1000 milliseconds is plenty of time. | ||
| int exitCode = runCertificateProviderCommand(process, 1000); | ||
lqiu96 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (exitCode != 0) { | ||
| throw new IOException( | ||
| "SecureConnect: Cert provider command failed with exit code: " + exitCode); | ||
| } | ||
|
|
||
| // Create mTLS key store with the input certificates from shell command. | ||
| return SecurityUtils.createMtlsKeyStore(process.getInputStream()); | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| static ImmutableList<String> extractCertificateProviderCommand(InputStream contextAwareMetadata) | ||
| throws IOException { | ||
| JsonParser parser = new GsonFactory().createJsonParser(contextAwareMetadata); | ||
| ContextAwareMetadataJson json = parser.parse(ContextAwareMetadataJson.class); | ||
| return json.getCommands(); | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| static int runCertificateProviderCommand(Process commandProcess, long timeoutMilliseconds) | ||
| throws IOException, InterruptedException { | ||
| boolean terminated = commandProcess.waitFor(timeoutMilliseconds, TimeUnit.MILLISECONDS); | ||
zhumin8 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (!terminated) { | ||
| commandProcess.destroy(); | ||
| throw new IOException("SecureConnect: Cert provider command timed out"); | ||
| } | ||
| return commandProcess.exitValue(); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.