Trim security config usernames and roles

Fixes quarkusio#13787
stuartwdouglas · Dec 16, 2020 · 5ef182c · 5ef182c
1 parent c2376a7
commit 5ef182c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/...-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/MPRealmRuntimeConfig.java b/...-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/MPRealmRuntimeConfig.java
@@ -7,6 +7,8 @@
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.quarkus.runtime.annotations.ConvertWith;
+import io.quarkus.runtime.configuration.TrimmedStringConverter;
 
 /**
  * Configuration information used to populate a {@linkplain org.wildfly.security.auth.realm.SimpleMapBackedSecurityRealm}
@@ -35,13 +37,15 @@ public class MPRealmRuntimeConfig {
      * See <a href="#embedded-users">Embedded Users</a>.
      */
     @ConfigItem(defaultValueDocumentation = "none")
+    @ConvertWith(TrimmedStringConverter.class)
     public Map<String, String> users;
 
     /**
      * The realm roles user1=role1,role2,...\nuser2=role1,role2,... mapping
      * See <a href="#embedded-roles">Embedded Roles</a>.
      */
     @ConfigItem(defaultValueDocumentation = "none")
+    @ConvertWith(TrimmedStringConverter.class)
     public Map<String, String> roles;
 
 }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/PolicyConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/PolicyConfig.java
@@ -4,6 +4,8 @@
 
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConvertWith;
+import io.quarkus.runtime.configuration.TrimmedStringConverter;
 
 @ConfigGroup
 public class PolicyConfig {
@@ -12,5 +14,6 @@ public class PolicyConfig {
      * The roles that are allowed to access resources protected by this policy
      */
     @ConfigItem
+    @ConvertWith(TrimmedStringConverter.class)
     public List<String> rolesAllowed;
 }
diff --git a/integration-tests/elytron-undertow/src/main/resources/application.properties b/integration-tests/elytron-undertow/src/main/resources/application.properties
@@ -1,8 +1,10 @@
 quarkus.security.users.embedded.enabled=true
-quarkus.security.users.embedded.users.john=john
-quarkus.security.users.embedded.roles.john=employees
-quarkus.security.users.embedded.users.mary=mary
-quarkus.security.users.embedded.roles.mary=managers
+#note that the spaces after the usernames and roles are deliberate
+#to verify that they are trimmed correctly
+quarkus.security.users.embedded.users.john=john 
+quarkus.security.users.embedded.roles.john=employees 
+quarkus.security.users.embedded.users.mary=mary 
+quarkus.security.users.embedded.roles.mary=managers 
 quarkus.security.users.embedded.users.poul=poul
 quarkus.security.users.embedded.roles.poul=interns
 quarkus.security.users.embedded.plain-text=true