[ELY-2084] Split Elytron SSL into it's own subsystem and layer

https://issues.redhat.com/browse/ELY-2084 removing the dependency of SSL related code on auth related code
wildfly-security · Jul 5, 2022 · e49a9be · e49a9be
1 parent 4381567
commit e49a9be
Show file tree

Hide file tree

Showing 72 changed files with 1,083 additions and 49 deletions.
diff --git a/pom.xml b/pom.xml
@@ -327,7 +327,8 @@
                             ${project.basedir}/sasl/otp/src/main/java/;
                             ${project.basedir}/sasl/plain/src/main/java/;
                             ${project.basedir}/sasl/scram/src/main/java/;
-                            ${project.basedir}/ssl/src/main/java/;
+                            ${project.basedir}/ssl/base/src/main/java/;
+                            ${project.basedir}/ssl/domain/src/main/java/;
                             ${project.basedir}/tests/base/src/main/java/;
                             ${project.basedir}/tests/common/src/main/java/;
                             ${project.basedir}/tool/src/main/java/;
@@ -385,7 +386,8 @@
                                     <include>org/wildfly/security/permission/*.java</include>
                                     <include>org/wildfly/security/sasl/util/*.java</include>
                                     <include>org/wildfly/security/sasl/auth/util/*.java</include>
-                                    <include>org/wildfly/security/ssl/*.java</include>
+                                    <include>org/wildfly/security/ssl/base/*.java</include>
+                                    <include>org/wildfly/security/ssl/domain/*.java</include>
                                     <include>org/wildfly/security/ssl/_private/*.java</include>
                                     <include>org/wildfly/security/ssl/*.java</include>
                                     <include>org/wildfly/security/x500/*.java</include>
@@ -810,6 +812,11 @@
                 <artifactId>wildfly-elytron-security-manager-action</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wildfly.security</groupId>
+                <artifactId>wildfly-elytron-ssl-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wildfly.security</groupId>
                 <artifactId>wildfly-elytron-ssl</artifactId>
@@ -1480,7 +1487,8 @@
         <module>sasl/otp</module>
         <module>sasl/plain</module>
         <module>sasl/scram</module>
-        <module>ssl</module>
+        <module>ssl/base</module>
+        <module>ssl/domain</module>
         <module>tool</module>
         <module>util</module>
         <module>x500/base</module>

diff --git a/sasl/base/pom.xml b/sasl/base/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-mechanism</artifactId>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-ssl</artifactId>

diff --git a/ssl/pom.xml → ssl/base/pom.xml b/ssl/pom.xml → ssl/base/pom.xml
@@ -25,11 +25,12 @@
         <groupId>org.wildfly.security</groupId>
         <artifactId>wildfly-elytron-parent</artifactId>
         <version>1.19.1.CR1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>wildfly-elytron-ssl</artifactId>
+    <artifactId>wildfly-elytron-ssl-common</artifactId>
 
     <name>WildFly Elytron - SSL</name>
     <description>WildFly Security SSL</description>
@@ -93,10 +94,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.wildfly.security</groupId>
-            <artifactId>wildfly-elytron-auth-server</artifactId>
-        </dependency>    
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-base</artifactId>
@@ -105,10 +102,6 @@
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-credential</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.wildfly.security</groupId>
-            <artifactId>wildfly-elytron-auth</artifactId>
-        </dependency>        
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-util</artifactId>

diff --git a/.../ssl/AbstractDelegatingSSLContextSpi.java → .../ssl/AbstractDelegatingSSLContextSpi.java b/.../ssl/AbstractDelegatingSSLContextSpi.java → .../ssl/AbstractDelegatingSSLContextSpi.java
diff --git a/...rity/ssl/AbstractDelegatingSSLEngine.java → ...rity/ssl/AbstractDelegatingSSLEngine.java b/...rity/ssl/AbstractDelegatingSSLEngine.java → ...rity/ssl/AbstractDelegatingSSLEngine.java
diff --git a/.../ssl/AbstractDelegatingSSLParameters.java → .../ssl/AbstractDelegatingSSLParameters.java b/.../ssl/AbstractDelegatingSSLParameters.java → .../ssl/AbstractDelegatingSSLParameters.java
diff --git a/...sl/AbstractDelegatingSSLServerSocket.java → ...sl/AbstractDelegatingSSLServerSocket.java b/...sl/AbstractDelegatingSSLServerSocket.java → ...sl/AbstractDelegatingSSLServerSocket.java
diff --git a/...ractDelegatingSSLServerSocketFactory.java → ...ractDelegatingSSLServerSocketFactory.java b/...ractDelegatingSSLServerSocketFactory.java → ...ractDelegatingSSLServerSocketFactory.java
diff --git a/.../AbstractDelegatingSSLSessionContext.java → .../AbstractDelegatingSSLSessionContext.java b/.../AbstractDelegatingSSLSessionContext.java → .../AbstractDelegatingSSLSessionContext.java
diff --git a/...rity/ssl/AbstractDelegatingSSLSocket.java → ...rity/ssl/AbstractDelegatingSSLSocket.java b/...rity/ssl/AbstractDelegatingSSLSocket.java → ...rity/ssl/AbstractDelegatingSSLSocket.java
diff --git a/...l/AbstractDelegatingSSLSocketFactory.java → ...l/AbstractDelegatingSSLSocketFactory.java b/...l/AbstractDelegatingSSLSocketFactory.java → ...l/AbstractDelegatingSSLSocketFactory.java
diff --git a/...security/ssl/AndCipherSuitePredicate.java → ...security/ssl/AndCipherSuitePredicate.java b/...security/ssl/AndCipherSuitePredicate.java → ...security/ssl/AndCipherSuitePredicate.java
diff --git a/.../wildfly/security/ssl/Authentication.java → .../wildfly/security/ssl/Authentication.java b/.../wildfly/security/ssl/Authentication.java → .../wildfly/security/ssl/Authentication.java
diff --git a/...l/AuthenticationCipherSuitePredicate.java → ...l/AuthenticationCipherSuitePredicate.java b/...l/AuthenticationCipherSuitePredicate.java → ...l/AuthenticationCipherSuitePredicate.java
diff --git a/...rity/ssl/BooleanCipherSuitePredicate.java → ...rity/ssl/BooleanCipherSuitePredicate.java b/...rity/ssl/BooleanCipherSuitePredicate.java → ...rity/ssl/BooleanCipherSuitePredicate.java
diff --git a/...ly/security/ssl/CipherSuitePredicate.java → ...ly/security/ssl/CipherSuitePredicate.java b/...ly/security/ssl/CipherSuitePredicate.java → ...ly/security/ssl/CipherSuitePredicate.java
diff --git a/...fly/security/ssl/CipherSuiteSelector.java → ...fly/security/ssl/CipherSuiteSelector.java b/...fly/security/ssl/CipherSuiteSelector.java → ...fly/security/ssl/CipherSuiteSelector.java
diff --git a/...security/ssl/ConfiguredSSLContextSpi.java → ...security/ssl/ConfiguredSSLContextSpi.java b/...security/ssl/ConfiguredSSLContextSpi.java → ...security/ssl/ConfiguredSSLContextSpi.java
diff --git a/...fly/security/ssl/ConfiguredSSLEngine.java → ...fly/security/ssl/ConfiguredSSLEngine.java b/...fly/security/ssl/ConfiguredSSLEngine.java → ...fly/security/ssl/ConfiguredSSLEngine.java
diff --git a/...curity/ssl/ConfiguredSSLServerSocket.java → ...curity/ssl/ConfiguredSSLServerSocket.java b/...curity/ssl/ConfiguredSSLServerSocket.java → ...curity/ssl/ConfiguredSSLServerSocket.java
diff --git a/...ssl/ConfiguredSSLServerSocketFactory.java → ...ssl/ConfiguredSSLServerSocketFactory.java b/...ssl/ConfiguredSSLServerSocketFactory.java → ...ssl/ConfiguredSSLServerSocketFactory.java
diff --git a/...fly/security/ssl/ConfiguredSSLSocket.java → ...fly/security/ssl/ConfiguredSSLSocket.java b/...fly/security/ssl/ConfiguredSSLSocket.java → ...fly/security/ssl/ConfiguredSSLSocket.java
diff --git a/...urity/ssl/ConfiguredSSLSocketFactory.java → ...urity/ssl/ConfiguredSSLSocketFactory.java b/...urity/ssl/ConfiguredSSLSocketFactory.java → ...urity/ssl/ConfiguredSSLSocketFactory.java
diff --git a/...ly/security/ssl/DelegatingSSLContext.java → ...ly/security/ssl/DelegatingSSLContext.java b/...ly/security/ssl/DelegatingSSLContext.java → ...ly/security/ssl/DelegatingSSLContext.java
diff --git a/...java/org/wildfly/security/ssl/Digest.java → ...java/org/wildfly/security/ssl/Digest.java b/...java/org/wildfly/security/ssl/Digest.java → ...java/org/wildfly/security/ssl/Digest.java
diff --git a/...urity/ssl/DigestCipherSuitePredicate.java → ...urity/ssl/DigestCipherSuitePredicate.java b/...urity/ssl/DigestCipherSuitePredicate.java → ...urity/ssl/DigestCipherSuitePredicate.java