[broker-67] Design of authentication mechanism

acl-groovy-dsl/src/main/groovy/javasabr/mqtt/acl/groovy/dsl/builder/AllOfBuilder.groovy

@@ -12,7 +12,7 @@ class AllOfBuilder extends ConditionBuilder {
     USER_NAME, CLIENT_ID, IP_ADDRESS
   }
 
-  private final Set<Identity> alreadySetIdentities = new HashSet<>()
+  private final Set<Identity> alreadySetIdentities = EnumSet.noneOf(Identity.class)
 
   @Override
   ConditionBuilder userName(ValueMatcher<String>... userNames) {

application/build.gradle

@@ -9,12 +9,15 @@ description = "Standard configuration of standalone version of MQTT Broker"
 
 dependencies {
   implementation projects.coreService
+  implementation projects.credentialsSourceFile
+  implementation projects.credentialsSourceDb
   implementation projects.aclService
   implementation projects.aclGroovyDsl
   implementation libs.rlib.logger.slf4j
   implementation libs.springboot.starter.core
   implementation libs.springboot.starter.log4j2
 
+  testImplementation libs.r2dbc.h2
   testImplementation projects.testSupport
   testImplementation testFixtures(projects.network)
 }

application/src/main/java/javasabr/mqtt/broker/application/config/AuthenticationSpringConfig.java

@@ -0,0 +1,96 @@
+package javasabr.mqtt.broker.application.config;
+
+import static io.r2dbc.postgresql.PostgresqlConnectionFactoryProvider.OPTIONS;
+import static io.r2dbc.spi.ConnectionFactoryOptions.DATABASE;
+import static io.r2dbc.spi.ConnectionFactoryOptions.DRIVER;
+import static io.r2dbc.spi.ConnectionFactoryOptions.HOST;
+import static io.r2dbc.spi.ConnectionFactoryOptions.PASSWORD;
+import static io.r2dbc.spi.ConnectionFactoryOptions.PORT;
+import static io.r2dbc.spi.ConnectionFactoryOptions.USER;
+
+import io.r2dbc.pool.ConnectionPool;
+import io.r2dbc.pool.ConnectionPoolConfiguration;
+import io.r2dbc.spi.ConnectionFactories;
+import io.r2dbc.spi.ConnectionFactory;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import java.util.List;
+import java.util.Map;
+import javasabr.mqtt.service.auth.AuthenticationService;
+import javasabr.mqtt.service.auth.DefaultAuthenticationService;
+import javasabr.mqtt.service.auth.PasswordBasedAuthenticationProvider;
+import javasabr.mqtt.service.auth.provider.AuthenticationProvider;
+import javasabr.mqtt.service.auth.source.CredentialSource;
+import javasabr.mqtt.service.auth.source.DatabaseProperties;
+import javasabr.mqtt.service.auth.source.FileCredentialsSource;
+import javasabr.mqtt.service.auth.source.R2dbcCredentialsSource;
+import javasabr.rlib.collections.dictionary.DictionaryFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.r2dbc.core.DatabaseClient;
+
+@Configuration(proxyBeanMethods = false)
+public class AuthenticationSpringConfig {
+
+  private static final String LOCK_TIMEOUT_OPTION = "lock_timeout";
+  private static final String STATEMENT_TIMEOUT_OPTION = "statement_timeout";
+
+  @Bean
+  ConnectionFactory connectionFactory(DatabaseProperties config) {
+    Map<String, String> timeoutOptions = Map.of(
+        LOCK_TIMEOUT_OPTION, config.lockTimeout(),
+        STATEMENT_TIMEOUT_OPTION, config.statementTimeout());
+    ConnectionFactoryOptions connectionFactoryOptions = ConnectionFactoryOptions
+        .builder()
+        .option(DRIVER, config.driver())
+        .option(HOST, config.host())
+        .option(PORT, config.port())
+        .option(USER, config.username())
+        .option(PASSWORD, config.password())
+        .option(DATABASE, config.name())
+        .option(OPTIONS, timeoutOptions)
+        .build();
+    ConnectionFactory connectionFactory = ConnectionFactories.get(connectionFactoryOptions);
+    ConnectionPoolConfiguration configuration = ConnectionPoolConfiguration
+        .builder(connectionFactory)
+        .maxIdleTime(config.maxIdleTime())
+        .maxSize(config.maxPoolSize())
+        .initialSize(config.initialPoolSize())
+        .build();
+    return new ConnectionPool(configuration);
+  }
+
+  @Bean
+  DatabaseClient databaseClient(ConnectionFactory connectionFactory) {
+    return DatabaseClient.create(connectionFactory);
+  }
+
+  @Bean
+  CredentialSource credentialSource(@Value("${credentials.source.file.name:credentials}") String fileName) {
+    return new FileCredentialsSource(fileName);
+  }
+
+  @Bean
+  CredentialSource dbCredentialSource(DatabaseClient connectionFactory, DatabaseProperties databaseProperties) {
+    return new R2dbcCredentialsSource(connectionFactory, databaseProperties.credentialsQuery());
+  }
+
+  @Bean
+  AuthenticationProvider passwordBasedAuthenticationProvider(CredentialSource credentialSource) {
+    return new PasswordBasedAuthenticationProvider(credentialSource);
+  }
+
+  @Bean
+  AuthenticationService authenticationService(
+      List<AuthenticationProvider> authenticationProviders,
+      @Value("${authentication.allow.anonymous:false}") boolean allowAnonymousAuth,
+      @Value("${authentication.provider.default:basic}") String defaultProviderName) {
+    var providers = DictionaryFactory.mutableRefToRefDictionary(String.class, AuthenticationProvider.class);
+    authenticationProviders.forEach(value -> providers.put(value.getAuthMethodName(), value));
+    AuthenticationProvider defaultProvider = providers.get(defaultProviderName);
+    if (defaultProvider == null) {
+      throw new IllegalArgumentException("[%s] authenticator provider not found".formatted(defaultProviderName));
+    }
+    return new DefaultAuthenticationService(providers.toReadOnly(), defaultProvider, allowAnonymousAuth);
+  }
+}

application/src/main/java/javasabr/mqtt/broker/application/config/CredentialsSourceDatabaseProperties.java

@@ -0,0 +1,20 @@
+package javasabr.mqtt.broker.application.config;
+
+import java.time.Duration;
+import javasabr.mqtt.service.auth.source.DatabaseProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "credentials.source.db")
+public record CredentialsSourceDatabaseProperties(
+    String username,
+    String password,
+    String driver,
+    String host,
+    int port,
+    String name,
+    String credentialsQuery,
+    Duration maxIdleTime,
+    int initialPoolSize,
+    int maxPoolSize,
+    String lockTimeout,
+    String statementTimeout) implements DatabaseProperties {}

application/src/main/java/javasabr/mqtt/broker/application/config/MqttBrokerSpringConfig.java

@@ -14,15 +14,14 @@
 import javasabr.mqtt.network.message.in.PublishMqttInMessage;
 import javasabr.mqtt.network.user.NetworkMqttUserFactory;
 import javasabr.mqtt.service.AuthorizationService;
-import javasabr.mqtt.service.AuthenticationService;
 import javasabr.mqtt.service.ClientIdRegistry;
 import javasabr.mqtt.service.ConnectionService;
-import javasabr.mqtt.service.CredentialSource;
 import javasabr.mqtt.service.MessageOutFactoryService;
 import javasabr.mqtt.service.PublishDeliveringService;
 import javasabr.mqtt.service.PublishReceivingService;
 import javasabr.mqtt.service.SubscriptionService;
 import javasabr.mqtt.service.TopicService;
+import javasabr.mqtt.service.auth.AuthenticationService;
 import javasabr.mqtt.service.handler.client.ExternalNetworkMqttUserReleaseHandler;
 import javasabr.mqtt.service.impl.DefaultConnectionService;
 import javasabr.mqtt.service.impl.DefaultMessageOutFactoryService;
@@ -32,10 +31,8 @@
 import javasabr.mqtt.service.impl.DefaultTopicService;
 import javasabr.mqtt.service.impl.DisabledAuthorizationService;
 import javasabr.mqtt.service.impl.ExternalNetworkMqttUserFactory;
-import javasabr.mqtt.service.impl.FileCredentialsSource;
 import javasabr.mqtt.service.impl.InMemoryClientIdRegistry;
 import javasabr.mqtt.service.impl.InMemorySubscriptionService;
-import javasabr.mqtt.service.impl.SimpleAuthenticationService;
 import javasabr.mqtt.service.message.handler.MqttInMessageHandler;
 import javasabr.mqtt.service.message.handler.impl.ConnectInMqttInMessageHandler;
 import javasabr.mqtt.service.message.handler.impl.DisconnectMqttInMessageHandler;
@@ -73,6 +70,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -82,7 +80,8 @@
 import org.springframework.core.env.Environment;
 
 @Import({
-    GroovyDslBasedAclServiceSpringConfig.class
+    GroovyDslBasedAclServiceSpringConfig.class,
+    AuthenticationSpringConfig.class
 })
 @CustomLog
 @Configuration(proxyBeanMethods = false)
@@ -91,6 +90,7 @@
     @PropertySource(value = "file:./application.properties", ignoreResourceNotFound = true),
     @PropertySource(value = "${BROKER_CONFIG}", ignoreResourceNotFound = true)
 })
+@EnableConfigurationProperties(CredentialsSourceDatabaseProperties.class)
 public class MqttBrokerSpringConfig {
 
   @Bean
@@ -108,19 +108,6 @@ MqttSessionService mqttSessionService(
     return new InMemoryMqttSessionService(cleanInterval);
   }
 
-  @Bean
-  CredentialSource credentialSource(
-      @Value("${credentials.source.file.name:credentials}") String fileName) {
-    return new FileCredentialsSource(fileName);
-  }
-
-  @Bean
-  AuthenticationService authenticationService(
-      CredentialSource credentialSource,
-      @Value("${authentication.allow.anonymous:false}") boolean allowAnonymousAuth) {
-    return new SimpleAuthenticationService(credentialSource, allowAnonymousAuth);
-  }
-
   @Bean
   @ConditionalOnProperty(
       name = "acl.engine.type", 
@@ -180,7 +167,7 @@ MqttInMessageHandler publishAckMqttInMessageHandler(MessageOutFactoryService mes
   MqttInMessageHandler publishCompleteMqttInMessageHandler(MessageOutFactoryService messageOutFactoryService) {
     return new PublishCompleteMqttInMessageHandler(messageOutFactoryService);
   }
-  
+
   @Bean
   PublishPayloadMqttInMessageFieldValidator publishPayloadMqttInMessageFieldValidator(
       MessageOutFactoryService messageOutFactoryService) {
@@ -192,7 +179,7 @@ PublishQosMqttInMessageFieldValidator publishQosMqttInMessageFieldValidator(
       MessageOutFactoryService messageOutFactoryService) {
     return new PublishQosMqttInMessageFieldValidator(messageOutFactoryService);
   }
-  
+
   @Bean
   PublishRetainMqttInMessageFieldValidator publishRetainMqttInMessageFieldValidator(
       MessageOutFactoryService messageOutFactoryService) {
@@ -204,13 +191,13 @@ PublishMessageExpiryIntervalMqttInMessageFieldValidator publishMessageExpiryInte
       MessageOutFactoryService messageOutFactoryService) {
     return new PublishMessageExpiryIntervalMqttInMessageFieldValidator(messageOutFactoryService);
   }
-  
+
   @Bean
   PublishResponseTopicMqttInMessageFieldValidator publishResponseTopicMqttInMessageFieldValidator(
       MessageOutFactoryService messageOutFactoryService) {
     return new PublishResponseTopicMqttInMessageFieldValidator(messageOutFactoryService);
   }
-  
+
   @Bean
   PublishTopicAliasMqttInMessageFieldValidator publishTopicAliasMqttInMessageFieldValidator(
       MessageOutFactoryService messageOutFactoryService) {
@@ -227,7 +214,8 @@ MqttInMessageHandler publishMqttInMessageHandler(
     return new PublishMqttInMessageHandler(
         publishReceivingService,
         messageOutFactoryService,
-        topicService, authorizationService,
+        topicService,
+        authorizationService,
         fieldValidators);
   }