fix

apache · Dec 8, 2023 · a6ca305 · a6ca305
1 parent e09d0c2
commit a6ca305
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
@@ -658,6 +658,10 @@ private void doAuthentication(AuthData clientData,
             if (state != State.Connected) {
                 // First time authentication is done
                 if (service.isAuthenticationEnabled()) {
+                    if (!useOriginalAuthState) {
+                        this.authRole = newAuthRole;
+                        this.authenticationData = newAuthDataSource;
+                    }
                     if (service.isAuthorizationEnabled()) {
                         if (!service.getAuthorizationService()
                                 .isValidOriginalPrincipal(this.authRole, originalPrincipal, remoteAddress, false)) {
@@ -669,10 +673,6 @@ private void doAuthentication(AuthData clientData,
                             return;
                         }
                     }
-                    if (!useOriginalAuthState) {
-                        this.authRole = newAuthRole;
-                        this.authenticationData = newAuthDataSource;
-                    }
                     maybeScheduleAuthenticationCredentialsRefresh();
                 }
                 completeConnect(clientProtocolVersion, clientVersion);