100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Improved catch for verifying access token in prepare headers. No real need checking for TokenNotActiveException.
Michael Rademakerdebb12dcdd6c
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.javaindex 5ff81665a..0b42852bf 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java@@ -23,7 +23,6 @@ import io.moquette.interception.AbstractInterceptHandler;import io.moquette.interception.messages.*;import org.keycloak.adapters.rotation.AdapterTokenVerifier;import org.keycloak.common.VerificationException;-import org.keycloak.exceptions.TokenNotActiveException;import org.keycloak.representations.AccessToken;import org.openremote.container.message.MessageBrokerService;import org.openremote.container.security.ClientCredentialsAuthForm;@@ -241,17 +240,14 @@ public class EventInterceptHandler extends AbstractInterceptHandler {AccessToken accessToken = AdapterTokenVerifier.verifyToken(connection.accessToken, identityProvider.getKeycloakDeployment(connection.realm, KEYCLOAK_CLIENT_ID));headers.put(Constants.AUTH_CONTEXT, new AccessTokenAuthContext(connection.realm, accessToken));} catch (VerificationException e) {- if (e instanceof TokenNotActiveException) {- String suppliedClientSecret = new String(connection.password, StandardCharsets.UTF_8);- connection.accessToken = identityProvider.getExternalKeycloak().getAccessToken(connection.realm, new ClientCredentialsAuthForm(connection.username, suppliedClientSecret)).getToken();- try {- AccessToken accessToken = AdapterTokenVerifier.verifyToken(connection.accessToken, identityProvider.getKeycloakDeployment(connection.realm, KEYCLOAK_CLIENT_ID));- headers.put(Constants.AUTH_CONTEXT, new AccessTokenAuthContext(connection.realm, accessToken));- } catch (VerificationException verificationException) {- LOG.log(Level.WARNING, "Couldn't verify token", verificationException);- }+ String suppliedClientSecret = new String(connection.password, StandardCharsets.UTF_8);+ connection.accessToken = identityProvider.getExternalKeycloak().getAccessToken(connection.realm, new ClientCredentialsAuthForm(connection.username, suppliedClientSecret)).getToken();+ try {+ AccessToken accessToken = AdapterTokenVerifier.verifyToken(connection.accessToken, identityProvider.getKeycloakDeployment(connection.realm, KEYCLOAK_CLIENT_ID));+ headers.put(Constants.AUTH_CONTEXT, new AccessTokenAuthContext(connection.realm, accessToken));+ } catch (VerificationException verificationException) {+ LOG.log(Level.WARNING, "Couldn't verify token", verificationException);}- LOG.log(Level.WARNING, e.getMessage(), e);}return headers;}