authenticateAsync(AuthenticationDataSource aut
* @return the "role" string for the authenticated connection, if the authentication was successful
* @throws AuthenticationException
* if the credentials are not valid
- * @deprecated use and implement {@link AuthenticationProvider#authenticateAsync(AuthenticationDataSource)} instead.
*/
- @Deprecated
default String authenticate(AuthenticationDataSource authData) throws AuthenticationException {
throw new AuthenticationException("Not supported");
}
@@ -101,38 +73,10 @@ default AuthenticationState newAuthState(AuthData authData,
return new OneStageAuthenticationState(authData, remoteAddress, sslSession, this);
}
- /**
- * Validate the authentication for the given credentials with the specified authentication data.
- *
- * Warning: the calling thread is an IO thread. Any implementations that rely on blocking behavior
- * must ensure that the execution is completed on using a separate thread pool to ensure IO threads
- * are never blocked.
- *
- * Note: this method is marked as unstable because the Pulsar code base only calls it for the
- * Pulsar Broker Auth SASL plugin. All non SASL HTTP requests are authenticated using the
- * {@link AuthenticationProvider#authenticateAsync(AuthenticationDataSource)} method. As such,
- * this method might be removed in favor of the SASL provider implementing the
- * {@link AuthenticationProvider#authenticateAsync(AuthenticationDataSource)} method.
- *
- * @return Set response, according to passed in request.
- * and return whether we should do following chain.doFilter or not.
- */
- @InterfaceStability.Unstable
- default CompletableFuture authenticateHttpRequestAsync(HttpServletRequest request,
- HttpServletResponse response) {
- try {
- return CompletableFuture.completedFuture(this.authenticateHttpRequest(request, response));
- } catch (Exception e) {
- return FutureUtil.failedFuture(e);
- }
- }
-
/**
* Set response, according to passed in request.
* and return whether we should do following chain.doFilter or not.
- * @deprecated use and implement {@link AuthenticationProvider#authenticateHttpRequestAsync} instead.
*/
- @Deprecated
default boolean authenticateHttpRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
throw new AuthenticationException("Not supported");
}
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationState.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationState.java
index 0e5dcc3121f27..c7a1ed8088e98 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationState.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationState.java
@@ -19,10 +19,8 @@
package org.apache.pulsar.broker.authentication;
-import java.util.concurrent.CompletableFuture;
import javax.naming.AuthenticationException;
import org.apache.pulsar.common.api.AuthData;
-import org.apache.pulsar.common.util.FutureUtil;
/**
* Interface for authentication state.
@@ -40,37 +38,9 @@ public interface AuthenticationState {
/**
* Challenge passed in auth data and get response data.
- * @deprecated use and implement {@link AuthenticationState#authenticateAsync(AuthData)} instead.
*/
- @Deprecated
AuthData authenticate(AuthData authData) throws AuthenticationException;
- /**
- * Challenge passed in auth data. If authentication is complete after the execution of this method, return null.
- * Otherwise, return response data to be sent to the client.
- *
- * Note: the implementation of {@link AuthenticationState#authenticate(AuthData)} converted a null result into a
- * zero length byte array when {@link AuthenticationState#isComplete()} returned false after authentication. In
- * order to simplify this interface, the determination of whether to send a challenge back to the client is only
- * based on the result of this method. In order to maintain backwards compatibility, the default implementation of
- * this method calls {@link AuthenticationState#isComplete()} and returns a result compliant with the new
- * paradigm.
- */
- default CompletableFuture authenticateAsync(AuthData authData) {
- try {
- AuthData result = this.authenticate(authData);
- if (isComplete()) {
- return CompletableFuture.completedFuture(null);
- } else {
- return result != null
- ? CompletableFuture.completedFuture(result)
- : CompletableFuture.completedFuture(AuthData.of(new byte[0]));
- }
- } catch (Exception e) {
- return FutureUtil.failedFuture(e);
- }
- }
-
/**
* Return AuthenticationDataSource.
*/
@@ -78,12 +48,7 @@ default CompletableFuture authenticateAsync(AuthData authData) {
/**
* Whether the authentication is completed or not.
- * @deprecated this method's logic is captured by the result of
- * {@link AuthenticationState#authenticateAsync(AuthData)}. When the result is a {@link CompletableFuture} with a
- * null result, authentication is complete. When the result is a {@link CompletableFuture} with a nonnull result,
- * authentication is incomplete and requires an auth challenge.
*/
- @Deprecated
boolean isComplete();
/**