Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,7 @@ project(':iceberg-gcp') {
testImplementation libs.esotericsoftware.kryo
testImplementation libs.mockserver.netty
testImplementation libs.mockserver.client.java
testImplementation libs.mockito.junit.jupiter
}
}

Expand Down
146 changes: 146 additions & 0 deletions gcp/src/main/java/org/apache/iceberg/gcp/auth/GoogleAuthManager.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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 org.apache.iceberg.gcp.auth;

import com.google.auth.oauth2.GoogleCredentials;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.List;
import java.util.Map;
import org.apache.iceberg.catalog.SessionCatalog;
import org.apache.iceberg.catalog.TableIdentifier;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
import org.apache.iceberg.relocated.com.google.common.base.Splitter;
import org.apache.iceberg.relocated.com.google.common.base.Strings;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
import org.apache.iceberg.rest.RESTClient;
import org.apache.iceberg.rest.auth.AuthManager;
import org.apache.iceberg.rest.auth.AuthSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* An authentication manager that uses Google Credentials (typically Application Default
* Credentials) to create {@link GoogleAuthSession} instances.
*
* <p>This manager can be configured with properties such as:
*
* <ul>
* <li>{@code gcp.auth.credentials-path}: Path to a service account JSON key file. If not set,
* Application Default Credentials will be used.
* <li>{@code gcp.auth.scopes}: Comma-separated list of OAuth scopes to request. Defaults to
* "https://www.googleapis.com/auth/cloud-platform".
* </ul>
*/
public class GoogleAuthManager implements AuthManager {
private static final Logger LOG = LoggerFactory.getLogger(GoogleAuthManager.class);
private static final Splitter SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings();
public static final String DEFAULT_SCOPES = "https://www.googleapis.com/auth/cloud-platform";
public static final String GCP_CREDENTIALS_PATH_PROPERTY = "gcp.auth.credentials-path";
public static final String GCP_SCOPES_PROPERTY = "gcp.auth.scopes";
private final String name;

private GoogleCredentials credentials;
private boolean initialized = false;

public GoogleAuthManager(String managerName) {
this.name = managerName;
}

public String name() {
return name;
}

private void initialize(Map<String, String> properties) {
if (initialized) {
return;
}

String credentialsPath = properties.get(GCP_CREDENTIALS_PATH_PROPERTY);
String scopesString = properties.getOrDefault(GCP_SCOPES_PROPERTY, DEFAULT_SCOPES);
List<String> scopes =
Strings.isNullOrEmpty(scopesString)
? ImmutableList.of()
: ImmutableList.copyOf(SPLITTER.splitToList(scopesString));

try {
if (credentialsPath != null && !credentialsPath.isEmpty()) {
LOG.info("Using Google credentials from path: {}", credentialsPath);
try (FileInputStream credentialsStream = new FileInputStream(credentialsPath)) {
this.credentials = GoogleCredentials.fromStream(credentialsStream).createScoped(scopes);
}
} else {
LOG.info("Using Application Default Credentials with scopes: {}", scopesString);
this.credentials = GoogleCredentials.getApplicationDefault().createScoped(scopes);
}
} catch (IOException e) {
throw new UncheckedIOException("Failed to load Google credentials", e);
}

this.initialized = true;
}

/**
* Initializes and returns a short-lived session, typically for fetching configuration. This
* implementation reuses the long-lived catalog session logic.
*/
@Override
public AuthSession initSession(RESTClient initClient, Map<String, String> properties) {
return catalogSession(initClient, properties);
}

/**
* Returns a long-lived session tied to the catalog's lifecycle. This session uses Google
* Application Default Credentials or a specified service account.
*
* @param sharedClient The long-lived RESTClient (not used by this implementation for credential
* fetching).
* @param properties Configuration properties for the auth manager.
* @return A {@link GoogleAuthSession}.
* @throws UncheckedIOException if credential loading fails.
*/
@Override
public AuthSession catalogSession(RESTClient sharedClient, Map<String, String> properties) {
initialize(properties);
Preconditions.checkState(
credentials != null, "GoogleAuthManager not initialized or failed to load credentials");
return new GoogleAuthSession(credentials);
}

/**
* Returns a session for a specific context. Defaults to the catalog session. For GCP, tokens are
* typically not context-specific in this manner.
*/
@Override
public AuthSession contextualSession(SessionCatalog.SessionContext context, AuthSession parent) {
return parent;
}

/** Returns a session for a specific table or view. Defaults to the catalog session. */
@Override
public AuthSession tableSession(
TableIdentifier table, Map<String, String> properties, AuthSession parent) {
return parent;
}

/** Closes the manager. This is a no-op for GoogleAuthManager. */
@Override
public void close() {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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 org.apache.iceberg.gcp.auth;

import com.google.auth.oauth2.AccessToken;
import com.google.auth.oauth2.GoogleCredentials;
import java.io.IOException;
import java.io.UncheckedIOException;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
import org.apache.iceberg.rest.HTTPHeaders;
import org.apache.iceberg.rest.HTTPRequest;
import org.apache.iceberg.rest.ImmutableHTTPRequest;
import org.apache.iceberg.rest.auth.AuthSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* An authentication session that uses Google Credentials (typically Application Default
* Credentials) to obtain an OAuth2 access token and add it to HTTP requests.
*/
class GoogleAuthSession implements AuthSession {
private static final Logger LOG = LoggerFactory.getLogger(GoogleAuthSession.class);
private final GoogleCredentials credentials;

/**
* Constructs a GoogleAuthSession with the provided GoogleCredentials.
*
* @param credentials The GoogleCredentials to use for authentication.
*/
GoogleAuthSession(GoogleCredentials credentials) {
Preconditions.checkArgument(credentials != null, "Invalid credentials: null");
this.credentials = credentials;
}

/**
* Authenticates the given HTTP request by adding an "Authorization: Bearer token" header. The
* access token is obtained from the GoogleCredentials.
*
* @param request The HTTPRequest to authenticate.
* @return A new HTTPRequest with the added Authorization header.
* @throws UncheckedIOException if an IOException occurs while refreshing the access token.
*/
@Override
public HTTPRequest authenticate(HTTPRequest request) {
try {
credentials.refreshIfExpired();
AccessToken token = credentials.getAccessToken();

if (token != null && token.getTokenValue() != null) {
HTTPHeaders newHeaders =
request
.headers()
.putIfAbsent(
HTTPHeaders.of(
HTTPHeaders.HTTPHeader.of(
"Authorization", "Bearer " + token.getTokenValue())));
return newHeaders.equals(request.headers())
? request
: ImmutableHTTPRequest.builder().from(request).headers(newHeaders).build();
Comment on lines +73 to +75
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would we need this? I don't think we reuse requests and if we did, the putIfAbsent would resolve it. Seems like unnecessary complexity.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to keep this because we re-use headers. https://github.com/apache/iceberg/blob/main/core/src/main/java/org/apache/iceberg/rest/HTTPClient.java#L256
If someone add Authorizationheader it can broke workflow. I dont want to allow that behaviour.

} else {
throw new IllegalStateException(
"Failed to obtain Google access token. Cannot authenticate request.");
}
} catch (IOException e) {
LOG.error("IOException while trying to refresh Google access token", e);
throw new UncheckedIOException("Failed to refresh Google access token", e);
}
}

/**
* Closes the session. This is a no-op for GoogleAuthSession as the lifecycle of GoogleCredentials
* is not managed by this session.
*/
@Override
public void close() {
// No-op
}
}
Loading