Issue #1229, rename security to elytron-security

build-parent/pom.xml

@@ -486,12 +486,12 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-security-deployment</artifactId>
+                <artifactId>quarkus-elytron-security-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-security-runtime</artifactId>
+                <artifactId>quarkus-elytron-security-runtime</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

extensions/security/deployment/pom.xml → extensions/elytron-security/deployment/pom.xml

@@ -19,14 +19,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-security</artifactId>
+        <artifactId>quarkus-elytron-security</artifactId>
         <groupId>io.quarkus</groupId>
         <version>1.0.0.Alpha1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-security-deployment</artifactId>
+    <artifactId>quarkus-elytron-security-deployment</artifactId>
     <name>Quarkus - Security - Deployment</name>
 
     <dependencies>
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-security-runtime</artifactId>
+            <artifactId>quarkus-elytron-security-runtime</artifactId>
         </dependency>
 
         <dependency>

extensions/security/deployment/src/main/java/io/quarkus/security/SecurityDeploymentProcessor.java → extensions/elytron-security/deployment/src/main/java/io/quarkus/security/SecurityDeploymentProcessor.java

@@ -34,9 +34,9 @@
 import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.security.runtime.AuthConfig;
+import io.quarkus.security.runtime.ElytronSecurityConfig;
 import io.quarkus.security.runtime.MPRealmConfig;
 import io.quarkus.security.runtime.PropertiesRealmConfig;
-import io.quarkus.security.runtime.SecurityConfig;
 import io.quarkus.security.runtime.SecurityTemplate;
 import io.quarkus.undertow.ServletExtensionBuildItem;
 import io.undertow.security.idm.IdentityManager;
@@ -60,8 +60,12 @@
  */
 class SecurityDeploymentProcessor {
     private static final Logger log = Logger.getLogger(SecurityDeploymentProcessor.class.getName());
+    /** Prefix for the user to password mapping properties */
+    private static final String USERS_PREFIX = "quarkus.elytron-security.embedded.users";
+    /** Prefix for the user to password mapping properties */
+    private static final String ROLES_PREFIX = "quarkus.elytron-security.embedded.roles";
 
-    SecurityConfig security;
+    ElytronSecurityConfig security;
 
     /**
      * Register this extension as a MP-JWT feature
@@ -142,18 +146,18 @@ AuthConfigBuildItem configureMPRealmConfig(SecurityTemplate template,
             // These are not being populated correctly by the core config Map logic for some reason, so reparse them here
             log.debugf("MPRealmConfig.users: %s", realmConfig.users);
             log.debugf("MPRealmConfig.roles: %s", realmConfig.roles);
-            Set<String> userKeys = QuarkusConfig.getNames("quarkus.security.embedded.users");
+            Set<String> userKeys = QuarkusConfig.getNames(USERS_PREFIX);
 
             log.debugf("userKeys: %s", userKeys);
             for (String key : userKeys) {
-                String pass = QuarkusConfig.getString("quarkus.security.embedded.users." + key, null, false);
+                String pass = QuarkusConfig.getString(USERS_PREFIX + '.' + key, null, false);
                 log.debugf("%s.pass = %s", key, pass);
                 realmConfig.users.put(key, pass);
             }
-            Set<String> roleKeys = QuarkusConfig.getNames("quarkus.security.embedded.roles");
+            Set<String> roleKeys = QuarkusConfig.getNames(ROLES_PREFIX);
             log.debugf("roleKeys: %s", roleKeys);
             for (String key : roleKeys) {
-                String roles = QuarkusConfig.getString("quarkus.security.embedded.roles." + key, null, false);
+                String roles = QuarkusConfig.getString(ROLES_PREFIX + '.' + key, null, false);
                 log.debugf("%s.roles = %s", key, roles);
                 realmConfig.roles.put(key, roles);
             }

extensions/elytron-security/deployment/src/test/resources/microprofile-config-custom-auth-embedded.properties

@@ -0,0 +1,14 @@
+quarkus.elytron-security.embedded.enabled=true
+quarkus.elytron-security.embedded.users.scott=jb0ss
+quarkus.elytron-security.embedded.users.stuart=test
+quarkus.elytron-security.embedded.users.jdoe=p4ssw0rd
+quarkus.elytron-security.embedded.users.noadmin=n0Adm1n
+quarkus.elytron-security.embedded.roles.scott=Admin,admin,Tester,user
+quarkus.elytron-security.embedded.roles.stuart=admin,user
+quarkus.elytron-security.embedded.roles.jdoe=NoRolesUser
+quarkus.elytron-security.embedded.roles.noadmin=user
+quarkus.elytron-security.embedded.auth-mechanism=CUSTOM
+
+#quarkus.log.min-level=DEBUG
+#quarkus.log.level=DEBUG
+#quarkus.log.console.level=DEBUG

extensions/elytron-security/deployment/src/test/resources/microprofile-config-custom-auth.properties

@@ -0,0 +1,8 @@
+quarkus.elytron-security.file.enabled=true
+quarkus.elytron-security.file.users=test-users.properties
+quarkus.elytron-security.file.roles=test-roles.properties
+quarkus.elytron-security.file.auth-mechanism=CUSTOM
+
+#quarkus.log.min-level=DEBUG
+#quarkus.log.level=DEBUG
+#quarkus.log.console.level=DEBUG

extensions/elytron-security/deployment/src/test/resources/microprofile-config.properties

@@ -0,0 +1,3 @@
+quarkus.elytron-security.file.enabled=true
+quarkus.elytron-security.file.users=test-users.properties
+quarkus.elytron-security.file.roles=test-roles.properties

extensions/security/pom.xml → extensions/elytron-security/pom.xml

@@ -26,7 +26,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-security</artifactId>
+    <artifactId>quarkus-elytron-security</artifactId>
     <name>Quarkus - Security</name>
     <packaging>pom</packaging>
     <modules>

extensions/security/runtime/pom.xml → extensions/elytron-security/runtime/pom.xml

@@ -18,14 +18,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-security</artifactId>
+        <artifactId>quarkus-elytron-security</artifactId>
         <groupId>io.quarkus</groupId>
         <version>1.0.0.Alpha1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-security-runtime</artifactId>
+    <artifactId>quarkus-elytron-security-runtime</artifactId>
     <name>Quarkus - Security - Runtime</name>
 
     <dependencies>

extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityConfig.java → extensions/elytron-security/runtime/src/main/java/io/quarkus/security/runtime/ElytronSecurityConfig.java

@@ -8,7 +8,7 @@
  *
  */
 @ConfigRoot(phase = ConfigPhase.RUN_TIME)
-public final class SecurityConfig {
+public final class ElytronSecurityConfig {
     /**
      * The configuration for the {@linkplain org.wildfly.security.auth.realm.LegacyPropertiesSecurityRealm}
      */

extensions/pom.xml

@@ -73,7 +73,7 @@
         <module>spring-di</module>
 
         <!-- Security -->
-        <module>security</module>
+        <module>elytron-security</module>
         <module>smallrye-jwt</module>
 
         <!-- Infinispan -->

extensions/smallrye-jwt/deployment/pom.xml

@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-security-deployment</artifactId>
+            <artifactId>quarkus-elytron-security-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

extensions/smallrye-jwt/runtime/pom.xml

@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-security-runtime</artifactId>
+            <artifactId>quarkus-elytron-security-runtime</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

integration-tests/main/pom.xml

@@ -110,7 +110,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-security-deployment</artifactId>
+            <artifactId>quarkus-elytron-security-deployment</artifactId>
             <scope>provided</scope>
         </dependency>
 

integration-tests/main/src/main/resources/META-INF/microprofile-config.properties

@@ -27,7 +27,7 @@ quarkus.datasource.url: ${datasource.url}
 quarkus.datasource.driver: ${datasource.driver}
 quarkus.datasource.username: ${datasource.username}
 quarkus.datasource.password: ${datasource.password}
-quarkus.security.file.enabled=true
+quarkus.elytron-security.file.enabled=true
 
 web-message=A message
 schedulerservice.cron.expr=0/10 * * * * ?