-
Notifications
You must be signed in to change notification settings - Fork 86
Fix GCP Service Agent Token Theft vulnerability in connection testing #1623
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
Open
akkaur
wants to merge
1
commit into
develop
Choose a base branch
from
fix-vrp-service-agent-token-theft
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+68
−1
Open
Changes from all commits
Commits
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
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
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,67 @@ | ||
| /* | ||
| * Copyright © 2026 Cask Data, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy of | ||
| * the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
|
|
||
| package io.cdap.plugin.gcp.common; | ||
|
|
||
| import com.google.auth.oauth2.GoogleCredentials; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
| import java.io.IOException; | ||
|
|
||
| public class GCPUtilsTest { | ||
|
|
||
| @Test | ||
| public void testLoadServiceAccountCredentialsNegative() { | ||
| // Negative Scenario: type is set to "external_account" (simulating the external | ||
| // payload attack) | ||
| String externalAccountJson = "{\n" + | ||
| " \"type\": \"external_account\"\n" + | ||
| "}"; | ||
|
|
||
| try { | ||
| GCPUtils.loadServiceAccountCredentials(externalAccountJson, false); | ||
| Assert.fail("Expected IOException when loading non-service-account credentials"); | ||
| } catch (IOException e) { | ||
| // Expected exception because the JSON does not represent a valid service | ||
| // account. | ||
| // ServiceAccountCredentials.fromStream throws a specific exception indicating | ||
| // the type mismatch. | ||
| Assert.assertNotNull("Exception message should indicate valid parse failure", e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testLoadServiceAccountCredentialsPositive() throws Exception { | ||
| java.security.KeyPairGenerator kpg = java.security.KeyPairGenerator.getInstance("RSA"); | ||
| kpg.initialize(1024); | ||
| java.security.KeyPair kp = kpg.generateKeyPair(); | ||
| String encodedKey = java.util.Base64.getEncoder().encodeToString(kp.getPrivate().getEncoded()); | ||
| String pemKey = "-----BEGIN PRIVATE KEY-----\\n" + encodedKey + "\\n-----END PRIVATE KEY-----\\n"; | ||
| String validServiceAccountJson = "{\n" + | ||
| " \"type\": \"service_account\",\n" + | ||
| " \"project_id\": \"test-project\",\n" + | ||
| " \"private_key_id\": \"dummy-id\",\n" + | ||
| " \"private_key\": \"" + pemKey + "\",\n" + | ||
| " \"client_email\": \"test@test-project.iam.gserviceaccount.com\",\n" + | ||
| " \"client_id\": \"12345\"\n" + | ||
| "}"; | ||
|
akkaur marked this conversation as resolved.
|
||
|
|
||
| GoogleCredentials creds = GCPUtils.loadServiceAccountCredentials(validServiceAccountJson, false); | ||
| Assert.assertNotNull(creds); | ||
|
akkaur marked this conversation as resolved.
|
||
| Assert.assertTrue("Credentials should be an instance of ServiceAccountCredentials", | ||
| creds instanceof com.google.auth.oauth2.ServiceAccountCredentials); | ||
| } | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changing from
GoogleCredentials.fromStream()toServiceAccountCredentials.fromStream()restricts your application to accepting only traditional, long-lived service account key JSON files.The primary impacts across your application include:
external_account): Workloads authenticating from AWS, Azure, GitHub Actions, or on-premises environments via keyless federation will crash with anIOExceptionorIllegalArgumentExceptionbecause anexternal_accountJSON cannot be parsed byServiceAccountCredentials.authorized_user): Developers using credential files generated bygcloud auth application-default loginor user OAuth flows will no longer be able to supply those files to your code.impersonated_service_account): Configuration files designed to dynamically impersonate a service account without possessing its private key will fail to load."type": "service_account"), increasing the risk of leaked credentials.GoogleCredentialstype may need adjustments if it relies on polymorphic credential handling, thoughServiceAccountCredentialsis assignable toGoogleCredentials..createDelegated(userEmail)for Google Workspace Domain-Wide Delegation,.getClientEmail(), and.getPrivateKey().Would it be fine?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To remediate you may consider implementing stricter input validation for Google Cloud connector configurations.
Example:
ConnectionHandler.javain CDAP and individual plugin connectors likeGCSConnector.java) for theserviceAccountJSONpayload.credential_sourceURL to point to the local metadata server (http://metadata.google.internal/computeMetadata/v1/...) or internal loopback IP addresses when testing connections with external accounts.token_urldomain to ensure it points to legitimate identity providers, rather than arbitrary attacker-controlled destinations.