Dirty

quarkusio · Sep 9, 2019 · c7a354f · c7a354f
1 parent 53329ee
commit c7a354f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/...eployment/src/test/resources/jdbc-realm/single-query-no-attributes/application.properties b/...eployment/src/test/resources/jdbc-realm/single-query-no-attributes/application.properties
@@ -5,3 +5,6 @@ quarkus.datasource.password=sa
 
 quarkus.security.jdbc.enabled=true
 quarkus.security.jdbc.principal-query.sql=SELECT password FROM users WHERE username=?
+quarkus.security.jdbc.principal-query.clear-password-mapper.enabled=true
+quarkus.security.jdbc.principal-query.clear-password-mapper.password-index=1
+
diff --git a/...-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/SecurityRecorder.java b/...-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/SecurityRecorder.java
@@ -178,12 +178,12 @@ public Provider[] get() {
         JdbcSecurityRealmBuilder builder = JdbcSecurityRealm.builder().setProviders(providers);
         PrincipalQueryConfig principalQuery = config.principalQuery;
         QueryBuilder queryBuilder = builder.principalQuery(principalQuery.sql).from(beanContainer.instance(DataSource.class));
-        //        if (principalQuery.clearPasswordMapperConfig.enabled) {
-        //            queryBuilder.withMapper(principalQuery.clearPasswordMapperConfig.toPasswordKeyMapper());
-        //        }
-        //        if (principalQuery.bcryptPasswordKeyMapperConfig.enabled) {
-        //            queryBuilder.withMapper(principalQuery.bcryptPasswordKeyMapperConfig.toPasswordKeyMapper());
-        //        }
+        if (principalQuery.clearPasswordMapperConfig.enabled) {
+            queryBuilder.withMapper(principalQuery.clearPasswordMapperConfig.toPasswordKeyMapper());
+        }
+        if (principalQuery.bcryptPasswordKeyMapperConfig.enabled) {
+            queryBuilder.withMapper(principalQuery.bcryptPasswordKeyMapperConfig.toPasswordKeyMapper());
+        }
         return new RuntimeValue<>(builder.build());
     }
 

diff --git a/.../runtime/src/main/java/io/quarkus/elytron/security/runtime/jdbc/PrincipalQueryConfig.java b/.../runtime/src/main/java/io/quarkus/elytron/security/runtime/jdbc/PrincipalQueryConfig.java
@@ -21,20 +21,22 @@ public class PrincipalQueryConfig {
     /**
      *
      */
-    //    @ConfigItem(name = "clear-password-mapper")
+    @ConfigItem(name = "clear-password-mapper")
     public ClearPasswordMapperConfig clearPasswordMapperConfig;
 
     /**
      *
      */
-    //    @ConfigItem(name = "bcrypt-password-mapper")
+    @ConfigItem(name = "bcrypt-password-mapper")
     public BcryptPasswordKeyMapperConfig bcryptPasswordKeyMapperConfig;
 
     @Override
     public String toString() {
         return "PrincipalQueryConfig{" +
                 "sql='" + sql + '\'' +
                 ", datasource='" + datasource + '\'' +
+                ", clearPasswordMapperConfig=" + clearPasswordMapperConfig +
+                ", bcryptPasswordKeyMapperConfig=" + bcryptPasswordKeyMapperConfig +
                 '}';
     }
 }