-
Notifications
You must be signed in to change notification settings - Fork 14k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #135 from confluentinc/squah-cache-topicids-topic-…
…resolution Updates for #17285
- Loading branch information
Showing
49 changed files
with
1,164 additions
and
444 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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
106 changes: 106 additions & 0 deletions
106
clients/src/main/java/org/apache/kafka/common/internals/CompositeStrategy.java
This file contains 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,106 @@ | ||
| /* | ||
| * 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.kafka.common.internals; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.security.PrivilegedAction; | ||
| import java.util.Objects; | ||
| import java.util.concurrent.Callable; | ||
| import java.util.concurrent.CompletionException; | ||
| import java.util.concurrent.atomic.AtomicReference; | ||
| import java.util.function.Function; | ||
|
|
||
| import javax.security.auth.Subject; | ||
|
|
||
| /** | ||
| * This strategy combines the functionality of the {@link LegacyStrategy}, {@link ModernStrategy}, and | ||
| * {@link UnsupportedStrategy} strategies to provide the legacy APIs as long as they are present and not degraded. | ||
| * If the legacy APIs are missing or degraded, this falls back to the modern APIs. | ||
| */ | ||
| class CompositeStrategy implements SecurityManagerCompatibility { | ||
|
|
||
| private static final Logger log = LoggerFactory.getLogger(CompositeStrategy.class); | ||
| static final CompositeStrategy INSTANCE = new CompositeStrategy(ReflectiveStrategy.Loader.forName()); | ||
|
|
||
| private final SecurityManagerCompatibility fallbackStrategy; | ||
| private final AtomicReference<SecurityManagerCompatibility> activeStrategy; | ||
|
|
||
| // Visible for testing | ||
| CompositeStrategy(ReflectiveStrategy.Loader loader) { | ||
| SecurityManagerCompatibility initial; | ||
| SecurityManagerCompatibility fallback = null; | ||
| try { | ||
| initial = new LegacyStrategy(loader); | ||
| try { | ||
| fallback = new ModernStrategy(loader); | ||
| // This is expected for JRE 18+ | ||
| log.debug("Loaded legacy SecurityManager methods, will fall back to modern methods after UnsupportedOperationException"); | ||
| } catch (NoSuchMethodException | ClassNotFoundException ex) { | ||
| // This is expected for JRE <= 17 | ||
| log.debug("Unable to load modern Subject methods, relying only on legacy methods", ex); | ||
| } | ||
| } catch (ClassNotFoundException | NoSuchMethodException e) { | ||
| try { | ||
| initial = new ModernStrategy(loader); | ||
| // This is expected for JREs after the removal takes place. | ||
| log.debug("Unable to load legacy SecurityManager methods, relying only on modern methods", e); | ||
| } catch (NoSuchMethodException | ClassNotFoundException ex) { | ||
| initial = new UnsupportedStrategy(e, ex); | ||
| // This is not expected in normal use, only in test environments. | ||
| log.error("Unable to load legacy SecurityManager methods", e); | ||
| log.error("Unable to load modern Subject methods", ex); | ||
| } | ||
| } | ||
| Objects.requireNonNull(initial, "initial strategy must be defined"); | ||
| activeStrategy = new AtomicReference<>(initial); | ||
| fallbackStrategy = fallback; | ||
| } | ||
|
|
||
| private <T> T performAction(Function<SecurityManagerCompatibility, T> action) { | ||
| SecurityManagerCompatibility active = activeStrategy.get(); | ||
| try { | ||
| return action.apply(active); | ||
| } catch (UnsupportedOperationException e) { | ||
| // If we chose a fallback strategy during loading, switch to it and retry this operation. | ||
| if (active != fallbackStrategy && fallbackStrategy != null) { | ||
| if (activeStrategy.compareAndSet(active, fallbackStrategy)) { | ||
| log.debug("Using fallback strategy after encountering degraded legacy method", e); | ||
| } | ||
| return action.apply(fallbackStrategy); | ||
| } | ||
| // If we're already using the fallback strategy, then there's nothing to do to handle these exceptions. | ||
| throw e; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public <T> T doPrivileged(PrivilegedAction<T> action) { | ||
| return performAction(compatibility -> compatibility.doPrivileged(action)); | ||
| } | ||
|
|
||
| @Override | ||
| public Subject current() { | ||
| return performAction(SecurityManagerCompatibility::current); | ||
| } | ||
|
|
||
| @Override | ||
| public <T> T callAs(Subject subject, Callable<T> action) throws CompletionException { | ||
| return performAction(compatibility -> compatibility.callAs(subject, action)); | ||
| } | ||
| } |
96 changes: 96 additions & 0 deletions
96
clients/src/main/java/org/apache/kafka/common/internals/LegacyStrategy.java
This file contains 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,96 @@ | ||
| /* | ||
| * 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.kafka.common.internals; | ||
|
|
||
| import java.lang.reflect.Method; | ||
| import java.security.PrivilegedAction; | ||
| import java.security.PrivilegedActionException; | ||
| import java.security.PrivilegedExceptionAction; | ||
| import java.util.concurrent.Callable; | ||
| import java.util.concurrent.CompletionException; | ||
|
|
||
| import javax.security.auth.Subject; | ||
|
|
||
| /** | ||
| * This class implements reflective access to the deprecated-for-removal methods of AccessController and Subject. | ||
| * <p>Instantiating this class may fail if any of the required classes or methods are not found. | ||
| * Method invocations for this class may fail with {@link UnsupportedOperationException} if all methods are found, | ||
| * but the operation is not permitted to be invoked. | ||
| * <p>This class is expected to be instantiable in JRE >=8 until the removal finally takes place. | ||
| */ | ||
| @SuppressWarnings("unchecked") | ||
| class LegacyStrategy implements SecurityManagerCompatibility { | ||
|
|
||
| private final Method doPrivileged; | ||
| private final Method getContext; | ||
| private final Method getSubject; | ||
| private final Method doAs; | ||
|
|
||
| // Visible for testing | ||
| LegacyStrategy(ReflectiveStrategy.Loader loader) throws ClassNotFoundException, NoSuchMethodException { | ||
| Class<?> accessController = loader.loadClass("java.security.AccessController"); | ||
| doPrivileged = accessController.getDeclaredMethod("doPrivileged", PrivilegedAction.class); | ||
| getContext = accessController.getDeclaredMethod("getContext"); | ||
| Class<?> accessControlContext = loader.loadClass("java.security.AccessControlContext"); | ||
| Class<?> subject = loader.loadClass(Subject.class.getName()); | ||
| getSubject = subject.getDeclaredMethod("getSubject", accessControlContext); | ||
| // Note that the Subject class isn't deprecated or removed, so reference it as an argument type. | ||
| // This allows for mocking out the method implementation while still accepting Subject instances as arguments. | ||
| doAs = subject.getDeclaredMethod("doAs", Subject.class, PrivilegedExceptionAction.class); | ||
| } | ||
|
|
||
| @Override | ||
| public <T> T doPrivileged(PrivilegedAction<T> action) { | ||
| return (T) ReflectiveStrategy.invoke(doPrivileged, null, action); | ||
| } | ||
|
|
||
| /** | ||
| * @return the result of AccessController.getContext(), of type AccessControlContext | ||
| */ | ||
| private Object getContext() { | ||
| return ReflectiveStrategy.invoke(getContext, null); | ||
| } | ||
|
|
||
| /** | ||
| * @param context The current AccessControlContext | ||
| * @return The result of Subject.getSubject(AccessControlContext) | ||
| */ | ||
| private Subject getSubject(Object context) { | ||
| return (Subject) ReflectiveStrategy.invoke(getSubject, null, context); | ||
| } | ||
|
|
||
| @Override | ||
| public Subject current() { | ||
| return getSubject(getContext()); | ||
| } | ||
|
|
||
| /** | ||
| * @return The result of Subject.doAs(Subject, PrivilegedExceptionAction) | ||
| */ | ||
| private <T> T doAs(Subject subject, PrivilegedExceptionAction<T> action) throws PrivilegedActionException { | ||
| return (T) ReflectiveStrategy.invokeChecked(doAs, PrivilegedActionException.class, null, subject, action); | ||
| } | ||
|
|
||
| @Override | ||
| public <T> T callAs(Subject subject, Callable<T> callable) throws CompletionException { | ||
| try { | ||
| return doAs(subject, callable::call); | ||
| } catch (PrivilegedActionException e) { | ||
| throw new CompletionException(e.getCause()); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.