adutra commented on code in PR #18754: URL: https://github.com/apache/iceberg/pull/18754#discussion_r4468188115
########## core/src/main/java/org/apache/iceberg/rest/auth/BearerAuthConfig.java: ########## @@ -0,0 +1,109 @@ +/* + * 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.rest.auth; + +import java.nio.file.Path; +import java.nio.file.Paths; +import java.time.Duration; +import java.time.format.DateTimeParseException; +import java.util.Map; +import javax.annotation.Nullable; +import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; + +/** Configuration for the {@link BearerAuthManager}. */ +record BearerAuthConfig( + @Nullable Path tokenFile, @Nullable Duration reloadInterval, @Nullable String token) { + + static final String BEARER_TOKEN = "rest.auth.bearer.token"; + static final String BEARER_TOKEN_FILE = "rest.auth.bearer.token-file"; + static final String BEARER_TOKEN_FILE_RELOAD_INTERVAL = + "rest.auth.bearer.token-file.reload-interval"; + + static final Duration DEFAULT_RELOAD_INTERVAL = Duration.ofMinutes(1); + static final Duration MIN_RELOAD_INTERVAL = Duration.ofSeconds(1); + + BearerAuthConfig { + Preconditions.checkArgument( + tokenFile == null || token == null, + "Invalid bearer configuration: token file and static token are mutually exclusive"); + Preconditions.checkArgument( + tokenFile != null || token != null, + "Invalid bearer configuration: one of token file or static token is required"); + Preconditions.checkArgument( + tokenFile == null || reloadInterval != null, + "Invalid bearer configuration: reload interval is required when using a token file"); + Preconditions.checkArgument( + tokenFile != null || reloadInterval == null, + "Invalid bearer configuration: reload interval is not allowed when using a static token"); + Preconditions.checkArgument( + reloadInterval == null || reloadInterval.compareTo(MIN_RELOAD_INTERVAL) >= 0, + "Invalid reload interval: %s, must be >= %s", + reloadInterval, + MIN_RELOAD_INTERVAL); + // normalize so that equal configurations designate the same file, e.g. when caching sessions + tokenFile = tokenFile != null ? tokenFile.toAbsolutePath().normalize() : null; + } + + static BearerAuthConfig fromProperties(Map<String, String> properties) { + String tokenFile = properties.get(BEARER_TOKEN_FILE); + // Use the legacy "token" property if the new one is not set, for backward compatibility + String token = properties.getOrDefault(BEARER_TOKEN, properties.get(OAuth2Properties.TOKEN)); + return tokenFile == null + ? new BearerAuthConfig(null, null, token) + : new BearerAuthConfig(parseTokenFile(tokenFile), parseReloadInterval(properties), token); + } + + BearerTokenSource newSource() { + return tokenFile != null + ? new FileTokenSource(tokenFile, reloadInterval) + : new StaticTokenSource(token); + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .omitNullValues() + .add("tokenFile", tokenFile) + .add("reloadInterval", reloadInterval) + .add("token", token != null ? "****" : null) + .toString(); + } + + private static Path parseTokenFile(String tokenFile) { Review Comment: It's making sure the path is a valid `Path`. I will rename. ########## core/src/main/java/org/apache/iceberg/rest/auth/BearerAuthManager.java: ########## @@ -0,0 +1,70 @@ +/* + * 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.rest.auth; + +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import java.time.Duration; +import java.util.Map; +import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting; +import org.apache.iceberg.rest.RESTClient; + +/** + * An auth manager that sets an {@code Authorization: Bearer} header on outgoing HTTP requests, as + * defined in RFC 6750. + * + * <p>The token is either read from a local file, which is re-read periodically, or provided + * statically in the configuration. Obtaining and renewing the token is the responsibility of an + * external process: this manager never contacts an authorization server. + */ +public final class BearerAuthManager implements AuthManager { + + /** + * Cache for standalone sessions created by {@link #tableSession(RESTClient, Map)}. Sessions hold + * no resources: entries only expire to prevent excessive memory usage, and cache maintenance runs + * on the calling thread rather than in a dedicated thread pool. + */ + private final Cache<BearerAuthConfig, BearerAuthSession> sessionCache = + Caffeine.newBuilder().expireAfterAccess(Duration.ofHours(1)).executor(Runnable::run).build(); + + public BearerAuthManager(String ignored) {} Review Comment: Required by `AuthManagers`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
