feat: lock should subscribe to messages from event system to get noti…

…fications about token IDs #6539 (#7143)

Signed-off-by: Yuriy Movchan <Yuriy.Movchan@gmail.com>
Signed-off-by: Mustafa Baser <mbaser@mail.com>

jans-auth-server/model/src/main/java/io/jans/as/model/error/ErrorMessageList.java

@@ -10,6 +10,8 @@
 import jakarta.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 
+import io.jans.model.error.ErrorMessage;
+
 
 /**
  * Represents an error message list in a configuration XML file.

jans-auth-server/model/src/main/java/io/jans/as/model/error/ErrorMessages.java

@@ -8,6 +8,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+import io.jans.model.error.ErrorMessage;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlElement;

jans-auth-server/model/src/main/java/io/jans/as/model/error/ErrorResponseFactory.java

@@ -24,6 +24,7 @@
 import io.jans.as.model.uma.UmaErrorResponseType;
 import io.jans.as.model.userinfo.UserInfoErrorResponseType;
 import io.jans.as.model.util.Util;
+import io.jans.model.error.ErrorMessage;
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.CacheControl;
 import jakarta.ws.rs.core.MediaType;

jans-auth-server/server/pom.xml

@@ -391,6 +391,13 @@
             <version>${project.version}</version>
         </dependency>
 
+		<!-- lock -->
+        <dependency>
+            <groupId>io.jans</groupId>
+            <artifactId>jans-lock-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
 		<!-- Weld -->
 		<dependency>
             <groupId>jakarta.validation</groupId>

jans-auth-server/server/src/main/java/io/jans/as/server/service/AppInitializer.java

@@ -205,8 +205,8 @@ public void createApplicationComponents() {
     public void applicationInitialized(@Observes @Initialized(ApplicationScoped.class) Object init) {
         log.debug("Initializing application services");
 
-        // Start timer
-        initSchedulerService();
+        // Load main app configuration first
+        configurationFactory.create();
 
 		// Initialize plugins configurations
 		for (ApplicationConfigurationFactory configurationFactory : applicationConfigurationFactory) {
@@ -235,6 +235,9 @@ public void applicationInitialized(@Observes @Initialized(ApplicationScoped.clas
 
         statService.init();
 
+        // Start timer
+        initSchedulerService();
+
         // Schedule timer tasks
         metricService.initTimer();
         loggerService.initTimer(true);

jans-auth-server/server/src/test/java/io/jans/as/server/dev/ConfSerialization.java

@@ -8,10 +8,11 @@
 
 import io.jans.as.model.config.BaseDnConfiguration;
 import io.jans.as.model.config.StaticConfiguration;
-import io.jans.as.model.error.ErrorMessage;
 import io.jans.as.model.error.ErrorMessages;
 import io.jans.as.model.jwk.JSONWebKeySet;
 import io.jans.as.server.util.ServerUtil;
+import io.jans.model.error.ErrorMessage;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ConfigurationService.java

@@ -31,7 +31,7 @@ public class ConfigurationService {
 
     @Inject
     ConfigurationFactory configurationFactory;
-    
+
     private StatsData statsData;
 
     public Conf findConf() {

jans-core/message/src/main/java/io/jans/service/BaseMessageService.java

@@ -8,8 +8,8 @@
 
 import org.slf4j.Logger;
 
-import io.jans.service.message.MessageInterface;
-import io.jans.service.message.MessageProvider;
+import io.jans.service.message.provider.MessageInterface;
+import io.jans.service.message.provider.MessageProvider;
 import io.jans.service.message.pubsub.PubSubInterface;
 import jakarta.inject.Inject;
 

jans-core/message/src/main/java/io/jans/service/MessageService.java

@@ -6,7 +6,7 @@
 
 package io.jans.service;
 
-import io.jans.service.message.MessageProvider;
+import io.jans.service.message.provider.MessageProvider;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 

jans-core/message/src/main/java/io/jans/service/message/consumer/MessageConsumer.java

@@ -0,0 +1,18 @@
+/*
+ * Janssen Project software is available under the Apache License (2004). See http://www.apache.org/licenses/ for full text.
+ *
+ * Copyright (c) 2023, Janssen Project
+ */
+
+package io.jans.service.message.consumer;
+
+/**
+ * Base message consumer
+ * 
+ * @author Yuriy Movchan Date: 12/18/2023
+ */
+public abstract class MessageConsumer implements MessageConsumerInterface {
+
+	public abstract String getMessageConsumerType();
+
+}

jans-core/message/src/main/java/io/jans/service/message/consumer/MessageConsumerInterface.java

@@ -0,0 +1,18 @@
+/*
+ * Janssen Project software is available under the Apache License (2004). See http://www.apache.org/licenses/ for full text.
+ *
+ * Copyright (c) 2023, Janssen Project
+ */
+
+package io.jans.service.message.consumer;
+
+import io.jans.service.message.pubsub.PubSubInterface;
+
+/**
+ * Interface for each message consumer
+ * 
+ * @author Yuriy Movchan Date: 12/18/2023
+ */
+public interface MessageConsumerInterface extends PubSubInterface {
+
+}

jans-core/message/src/main/java/io/jans/service/message/model/config/PostgresMessageConfiguration.java

@@ -9,42 +9,52 @@
 import java.io.Serializable;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import jakarta.xml.bind.annotation.XmlElement;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * @author Yuriy Movchan Date: 30/11/2023
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class PostgresMessageConfiguration implements Serializable {
 
-	@XmlElement(name = "db-schema-name")
+	@JsonProperty("jdbc.driver.class-name")
+	private String driverClassName;
+
+	@JsonProperty("db-schema-name")
 	private String dbSchemaName;
 
-	@XmlElement(name = "connection-uri")
+	@JsonProperty( "connection-uri")
 	private String connectionUri;
 
-	@XmlElement(name = "auth-userName")
+	@JsonProperty("auth-user-name")
 	private String authUserName;
 
-	@XmlElement(name = "auth-userPassword")
+	@JsonProperty("auth-user-password")
 	private String authUserPassword;
 
-	@XmlElement(name = "connection-pool-max-total")
+	@JsonProperty("connection-pool-max-total")
 	private Integer connectionPoolMaxTotal;
 
-	@XmlElement(name = "connection-pool-max-idle")
+	@JsonProperty("connection-pool-max-idle")
 	private Integer connectionPoolMaxIdle;
 
-	@XmlElement(name = "connection-pool-min-idle")
+	@JsonProperty("connection-pool-min-idle")
 	private Integer connectionPoolMinIdle;
 
-	@XmlElement(name = "message-wait-millis")
+	@JsonProperty("message-wait-millis")
 	private Integer messageWaitMillis;
 
-	@XmlElement(name = "message-sleep-thread-millis")
+	@JsonProperty("message-sleep-thread-millis")
 	private Integer messageSleepThreadTime;
 
+	public String getDriverClassName() {
+		return driverClassName;
+	}
+
+	public void setDriverClassName(String driverClassName) {
+		this.driverClassName = driverClassName;
+	}
+
 	public String getDbSchemaName() {
 		return dbSchemaName;
 	}
@@ -119,9 +129,9 @@ public void setMessageSleepThreadTime(Integer messageSleepThreadTime) {
 
 	@Override
 	public String toString() {
-		return "PostgresMessageConfiguration [dbSchemaName=" + dbSchemaName + ", connectionUri=" + connectionUri
-				+ ", authUserName=" + authUserName + ", authUserPassword=" + authUserPassword
-				+ ", connectionPoolMaxTotal=" + connectionPoolMaxTotal + ", connectionPoolMaxIdle="
+		return "PostgresMessageConfiguration [driverClassName=" + driverClassName + ", dbSchemaName=" + dbSchemaName
+				+ ", connectionUri=" + connectionUri + ", authUserName=" + authUserName + ", authUserPassword="
+				+ authUserPassword + ", connectionPoolMaxTotal=" + connectionPoolMaxTotal + ", connectionPoolMaxIdle="
 				+ connectionPoolMaxIdle + ", connectionPoolMinIdle=" + connectionPoolMinIdle + ", messageWaitMillis="
 				+ messageWaitMillis + ", messageSleepThreadTime=" + messageSleepThreadTime + "]";
 	}

jans-core/message/src/main/java/io/jans/service/message/AbstractMessageProvider.java → jans-core/message/src/main/java/io/jans/service/message/provider/AbstractMessageProvider.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2023, Janssen Project
  */
 
-package io.jans.service.message;
+package io.jans.service.message.provider;
 
 import java.util.concurrent.ExecutorService;
 

jans-core/message/src/main/java/io/jans/service/message/MessageInterface.java → jans-core/message/src/main/java/io/jans/service/message/provider/MessageInterface.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2023, Janssen Project
  */
 
-package io.jans.service.message;
+package io.jans.service.message.provider;
 
 import io.jans.service.message.pubsub.PubSubInterface;
 

jans-core/message/src/main/java/io/jans/service/message/MessageProvider.java → jans-core/message/src/main/java/io/jans/service/message/provider/MessageProvider.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2023, Janssen Project
  */
 
-package io.jans.service.message;
+package io.jans.service.message.provider;
 
 import io.jans.service.message.model.config.MessageProviderType;
 

jans-core/message/src/main/java/io/jans/service/message/MessageProviderFactory.java → jans-core/message/src/main/java/io/jans/service/message/provider/MessageProviderFactory.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2023, Janssen Project
  */
 
-package io.jans.service.message;
+package io.jans.service.message.provider;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -68,12 +68,12 @@ public void destroy() {
 	public MessageProvider getMessageProvider() {
 		log.debug("Started to create message provider");
 
-		messageProvider = getCacheProvider(messageConfiguration);
+		messageProvider = getMessageProvider(messageConfiguration);
 
 		return messageProvider;
 	}
 
-	public MessageProvider getCacheProvider(MessageConfiguration messageConfiguration) {
+	public MessageProvider getMessageProvider(MessageConfiguration messageConfiguration) {
 		MessageProviderType messageProviderType = messageConfiguration.getMessageProviderType();
 
 		// Create proxied bean
@@ -95,7 +95,14 @@ public MessageProvider getCacheProvider(MessageConfiguration messageConfiguratio
 					"Failed to initialize messageProvider, messageProvider is unsupported: " + messageProviderType);
 		}
 
-		messageProvider.create(executorService);
+		// Call message provider from context class loader to load JDBC driver
+		ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
+		Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+		try {
+			messageProvider.create(executorService);
+		} finally {
+			Thread.currentThread().setContextClassLoader(oldClassLoader);
+		}
 
 		return messageProvider;
 	}

jans-core/message/src/main/java/io/jans/service/message/NullMessageProvider.java → jans-core/message/src/main/java/io/jans/service/message/provider/NullMessageProvider.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2023, Janssen Project
  */
 
-package io.jans.service.message;
+package io.jans.service.message.provider;
 
 import java.util.concurrent.ExecutorService;
 

jans-core/message/src/main/java/io/jans/service/message/NullPool.java → jans-core/message/src/main/java/io/jans/service/message/provider/NullPool.java

@@ -1,4 +1,4 @@
-package io.jans.service.message;
+package io.jans.service.message.provider;
 
 /**
  * Null pool

jans-core/message/src/main/java/io/jans/service/message/PostgresMessageProvider.java → jans-core/message/src/main/java/io/jans/service/message/provider/PostgresMessageProvider.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2023, Janssen Project
  */
 
-package io.jans.service.message;
+package io.jans.service.message.provider;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -29,6 +29,7 @@
 import io.jans.service.message.model.config.MessageProviderType;
 import io.jans.service.message.model.config.PostgresMessageConfiguration;
 import io.jans.service.message.pubsub.PubSubInterface;
+import io.jans.util.StringHelper;
 import io.jans.util.security.StringEncrypter;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
@@ -106,38 +107,43 @@ public void configure(MessageConfiguration messageConfiguration, StringEncrypter
 
 	private Properties toPostgresProperties(PostgresMessageConfiguration postgresMessageConfiguration) {
 		Properties connectionProperties = new Properties();
-		connectionProperties.setProperty("db.schema.name", postgresMessageConfiguration.getDbSchemaName());
-		connectionProperties.setProperty("connection.uri", postgresMessageConfiguration.getConnectionUri());
-		connectionProperties.setProperty("auth.userName", postgresMessageConfiguration.getAuthUserName());
-
+		setProperty(connectionProperties, "jdbc.driver.class-name", postgresMessageConfiguration.getDriverClassName());
+		setProperty(connectionProperties, "db.schema.name", postgresMessageConfiguration.getDbSchemaName());
+		setProperty(connectionProperties, "connection.uri", postgresMessageConfiguration.getConnectionUri());
+		setProperty(connectionProperties, "auth.userName", postgresMessageConfiguration.getAuthUserName());
+
+		String password = postgresMessageConfiguration.getAuthUserPassword();
 		try {
-			String encryptedPassword = postgresMessageConfiguration.getAuthUserPassword();
-			if (StringUtils.isNotBlank(encryptedPassword)) {
-				connectionProperties.setProperty("auth.userPassword", stringEncrypter.decrypt(encryptedPassword));
+			if (StringUtils.isNotBlank(password)) {
+				password = stringEncrypter.decrypt(password);
 				log.trace("Decrypted Postgres password successfully.");
 			}
 		} catch (StringEncrypter.EncryptionException e) {
 			log.error("Error during Postgres password decryption", e);
 		}
+		setProperty(connectionProperties, "auth.userPassword", password);
 
 		if (postgresMessageConfiguration.getConnectionPoolMaxTotal() != null) {
-			connectionProperties.setProperty("connection.pool.max-total",
-					postgresMessageConfiguration.getConnectionPoolMaxTotal().toString());
+			setProperty(connectionProperties, "connection.pool.max-total", postgresMessageConfiguration.getConnectionPoolMaxTotal().toString());
 		}
 
 		if (postgresMessageConfiguration.getConnectionPoolMaxIdle() != null) {
-			connectionProperties.setProperty("connection.pool.max-idle",
-					postgresMessageConfiguration.getConnectionPoolMaxIdle().toString());
+			setProperty(connectionProperties, "connection.pool.max-idle", postgresMessageConfiguration.getConnectionPoolMaxIdle().toString());
 		}
 
 		if (postgresMessageConfiguration.getConnectionPoolMinIdle() != null) {
-			connectionProperties.setProperty("connection.pool.min-idle",
-					postgresMessageConfiguration.getConnectionPoolMinIdle().toString());
+			setProperty(connectionProperties, "connection.pool.min-idle", postgresMessageConfiguration.getConnectionPoolMinIdle().toString());
 		}
 
 		return connectionProperties;
 	}
 
+	public void setProperty(Properties connectionProperties, String propertyName, String propertyValue) {
+		if (StringHelper.isNotEmpty(propertyValue)) {
+			connectionProperties.setProperty(propertyName, propertyValue);
+		}
+	}
+
 	public boolean isConnected() {
 		return сonnectionProviderPool.isConnected();
 	}

jans-core/message/src/main/java/io/jans/service/message/RedisMessageProvider.java → jans-core/message/src/main/java/io/jans/service/message/provider/RedisMessageProvider.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2023, Janssen Project
  */
 
-package io.jans.service.message;
+package io.jans.service.message.provider;
 
 import java.util.Arrays;
 import java.util.concurrent.CompletableFuture;

jans-core/message/src/main/java/io/jans/service/message/StandaloneMessageProviderFactory.java → jans-core/message/src/main/java/io/jans/service/message/provider/StandaloneMessageProviderFactory.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2023, Janssen Project
  */
 
-package io.jans.service.message;
+package io.jans.service.message.provider;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;