Security - align module names, directories and packages.

Signed-off-by: Tomas Langer <[email protected]>
Captain1653 · Dec 30, 2018 · 37772d7 · 37772d7
1 parent 0c0f5e9
commit 37772d7
Show file tree

Hide file tree

Showing 325 changed files with 868 additions and 870 deletions.
diff --git a/DEV-GUIDELINES.md b/DEV-GUIDELINES.md
@@ -61,7 +61,7 @@ reviewing changes done by others.
             configured (e.g. a component may expect tracing endpoint - if not defined, tracing may be disabled)         
 
 
-Example: [io.helidon.security.oidc.common.OidcConfig](security/providers/oidc-common/src/main/java/io/helidon/security/oidc/common/OidcConfig.java)
+Example: [io.helidon.security.providers.oidc.common.OidcConfig](security/providers/oidc-common/src/main/java/io/helidon/security/oidc/common/OidcConfig.java)
 
 # Getters and Setters
 1. We do not use the verb, e.g. when a property "port" exists, the following methods are used:  
@@ -71,7 +71,7 @@ Example: [io.helidon.security.oidc.common.OidcConfig](security/providers/oidc-co
     1. Default is without a verb (e.g. authenticate(boolean atn), boolean authenticate())
     2. If this would be ambiguous, we can use verb to clear the meaning (e.g. isAuthenticated() or shouldAuthenticate())      
 
-Example: [io.helidon.security.oidc.common.OidcConfig](security/providers/oidc-common/src/main/java/io/helidon/security/oidc/common/OidcConfig.java) 
+Example: [io.helidon.security.providers.oidc.common.OidcConfig](security/providers/oidc-common/src/main/java/io/helidon/security/oidc/common/OidcConfig.java) 
 
 # Fluent API
 1. We use fluent API where applicable
@@ -112,7 +112,7 @@ Example: [io.helidon.security.oidc.common.OidcConfig](security/providers/oidc-co
         1. May accept other classes that are built using a builder, either directly, or as Supplier<T> 
             (as builder implements Supplier, this allows us to pass a builder to such a method, as well as a nice lambda)
 
-Example: [io.helidon.security.oidc.common.OidcConfig](security/providers/oidc-common/src/main/java/io/helidon/security/oidc/common/OidcConfig.java)
+Example: [io.helidon.security.providers.oidc.common.OidcConfig](security/providers/oidc-common/src/main/java/io/helidon/security/oidc/common/OidcConfig.java)
 
 # Java 9+ (Jigsaw/JPMS)
 1. Each java module has a module-info.java defined in a "java9" directory under src/main

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -99,72 +99,72 @@
                 <artifactId>helidon-config-testing</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <!-- security -->
             <dependency>
-                <groupId>io.helidon.security</groupId>
-                <artifactId>helidon-security</artifactId>
+                <groupId>io.helidon.config</groupId>
+                <artifactId>helidon-config-secure</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <!-- security -->
             <dependency>
                 <groupId>io.helidon.security</groupId>
-                <artifactId>helidon-security-tools-config</artifactId>
+                <artifactId>helidon-security</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.helidon.security</groupId>
+                <groupId>io.helidon.security.providers</groupId>
                 <artifactId>helidon-security-providers-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.helidon.security</groupId>
-                <artifactId>helidon-security-provider-google-login</artifactId>
+                <groupId>io.helidon.security.providers</groupId>
+                <artifactId>helidon-security-providers-google-login</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.helidon.security</groupId>
-                <artifactId>helidon-security-provider-oidc</artifactId>
+                <groupId>io.helidon.security.providers</groupId>
+                <artifactId>helidon-security-providers-oidc</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.helidon.security</groupId>
-                <artifactId>helidon-security-provider-jwt</artifactId>
+                <groupId>io.helidon.security.providers</groupId>
+                <artifactId>helidon-security-providers-jwt</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.helidon.security</groupId>
-                <artifactId>helidon-security-provider-idcs-mapper</artifactId>
+                <groupId>io.helidon.security.providers</groupId>
+                <artifactId>helidon-security-providers-idcs-mapper</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.helidon.security</groupId>
-                <artifactId>helidon-security-provider-http-auth</artifactId>
+                <groupId>io.helidon.security.providers</groupId>
+                <artifactId>helidon-security-providers-http-auth</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.helidon.security</groupId>
-                <artifactId>helidon-security-provider-http-signature</artifactId>
+                <groupId>io.helidon.security.providers</groupId>
+                <artifactId>helidon-security-providers-http-sign</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.helidon.security</groupId>
+                <groupId>io.helidon.security.integration</groupId>
                 <artifactId>helidon-security-integration-jersey</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.helidon.security</groupId>
+                <groupId>io.helidon.security.integration</groupId>
                 <artifactId>helidon-security-integration-webserver</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.helidon.security</groupId>
-                <artifactId>helidon-security-integration-annotations</artifactId>
+                <artifactId>helidon-security-annotations</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.helidon.security</groupId>
-                <artifactId>helidon-security-provider-abac</artifactId>
-                <version>${project.version}</version>
-            </dependency>
+            <groupId>io.helidon.security.providers</groupId>
+            <artifactId>helidon-security-providers-abac</artifactId>
+            <version>${project.version}</version>
+        </dependency>
             <dependency>
                 <groupId>io.helidon.security</groupId>
                 <artifactId>helidon-security-abac-time</artifactId>
@@ -195,11 +195,6 @@
                 <artifactId>helidon-security-jwt</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.helidon.security</groupId>
-                <artifactId>helidon-security-bundle</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <!-- SE Bundles -->
             <dependency>
                 <groupId>io.helidon.bundles</groupId>
@@ -216,6 +211,11 @@
                 <artifactId>helidon-bundles-jersey</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.bundles</groupId>
+                <artifactId>helidon-bundles-security</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <!-- microprofile -->
             <dependency>
                 <groupId>io.helidon.microprofile.bundles</groupId>

diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -28,6 +28,7 @@
         <module>config</module>
         <module>webserver</module>
         <module>jersey</module>
+        <module>security</module>
     </modules>
 
     <packaging>pom</packaging>

diff --git a/bundles/security/pom.xml b/bundles/security/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+        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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.helidon.bundles</groupId>
+        <artifactId>helidon-bundles-project</artifactId>
+        <version>0.11.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>helidon-bundles-security</artifactId>
+    <name>Helidon Bundles Security</name>
+
+    <description>
+        Helidon SE security bundle.
+        This bundle does not contain integration with webserver, jersey or
+            microprofile.
+    </description>
+
+    <properties>
+        <spotbugs.skip>true</spotbugs.skip>
+        <maven.source.skip>true</maven.source.skip>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.helidon.security</groupId>
+            <artifactId>helidon-security-annotations</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.security</groupId>
+            <artifactId>helidon-security</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.config</groupId>
+            <artifactId>helidon-config-secure</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.security.providers</groupId>
+            <artifactId>helidon-security-providers-header</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.security.providers</groupId>
+            <artifactId>helidon-security-providers-http-auth</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.security.providers</groupId>
+            <artifactId>helidon-security-providers-http-sign</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.security.providers</groupId>
+            <artifactId>helidon-security-providers-jwt</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.security.providers</groupId>
+            <artifactId>helidon-security-providers-abac</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.security.providers</groupId>
+            <artifactId>helidon-security-providers-oidc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.security.abac</groupId>
+            <artifactId>helidon-security-abac-time</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.security.abac</groupId>
+            <artifactId>helidon-security-abac-role</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.security.abac</groupId>
+            <artifactId>helidon-security-abac-scope</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.security.abac</groupId>
+            <artifactId>helidon-security-abac-policy</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...ty/bundle/src/main/java9/module-info.java → .../security/src/main/java9/module-info.java b/...ty/bundle/src/main/java9/module-info.java → .../security/src/main/java9/module-info.java
@@ -19,18 +19,16 @@
  */
 module io.helidon.security.bundle {
     requires transitive io.helidon.security;
-    requires transitive io.helidon.security.integration.annotations;
-    requires transitive io.helidon.security.tools.config;
-    requires transitive io.helidon.security.provider.google.login;
-    requires transitive io.helidon.security.provider.header;
-    requires transitive io.helidon.security.provider.http.auth;
-    requires transitive io.helidon.security.provider.signature;
-    requires transitive io.helidon.security.provider.jwt;
-    requires transitive io.helidon.security.provider.abac;
+    requires transitive io.helidon.security.annotations;
+    requires transitive io.helidon.config.secure;
+    requires transitive io.helidon.security.providers.header;
+    requires transitive io.helidon.security.providers.httpauth;
+    requires transitive io.helidon.security.providers.httpsign;
+    requires transitive io.helidon.security.providers.jwt;
+    requires transitive io.helidon.security.providers.abac;
     requires transitive io.helidon.security.abac.time;
     requires transitive io.helidon.security.abac.policy;
-    requires transitive io.helidon.security.abac.policy.el;
     requires transitive io.helidon.security.abac.role;
     requires transitive io.helidon.security.abac.scope;
-    requires transitive io.helidon.security.oidc;
+    requires transitive io.helidon.security.providers.oidc;
 }
diff --git a/config/object-mapping/pom.xml b/config/object-mapping/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>helidon-config-object-mapping</artifactId>
-    <name>Helidon Config Beans</name>
+    <name>Helidon Config Object Mapping</name>
     <description>
         Support for loading java pojos from configuration.
     </description>

diff --git a/config/pom.xml b/config/pom.xml
@@ -42,6 +42,7 @@
         <module>etcd</module>
         <module>git</module>
         <module>hocon</module>
+        <module>secure</module>
         <module>testing</module>
         <module>test-infrastructure</module>
         <module>tests</module>

diff --git a/security/tools/secure-config/pom.xml → config/secure/pom.xml b/security/tools/secure-config/pom.xml → config/secure/pom.xml
@@ -21,13 +21,13 @@
         xmlns="http://maven.apache.org/POM/4.0.0"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>io.helidon.security</groupId>
-        <artifactId>helidon-security-tools-project</artifactId>
+        <groupId>io.helidon.config</groupId>
+        <artifactId>helidon-config-project</artifactId>
         <version>0.11.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>helidon-security-tools-config</artifactId>
-    <name>Helidon Security Tools Secured Config</name>
+    <artifactId>helidon-config-secure</artifactId>
+    <name>Helidon Config Secure Filter</name>
 
     <description>
         Configuration filter checking property values and decrypting them if needed. Also provides tools to encrypt values to
@@ -46,8 +46,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.helidon.bundles</groupId>
-            <artifactId>helidon-bundles-config</artifactId>
+            <groupId>io.helidon.config</groupId>
+            <artifactId>helidon-config-yaml</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
@@ -71,7 +71,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>io.helidon.security.tools.config.Main</mainClass>
+                            <mainClass>io.helidon.config.secure.Main</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

diff --git a/...curity/tools/config/ConfigProperties.java → ...lidon/config/secure/ConfigProperties.java b/...curity/tools/config/ConfigProperties.java → ...lidon/config/secure/ConfigProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.helidon.security.tools.config;
+package io.helidon.config.secure;
 
 /**
  * Properties and their default values.

diff --git a/...idon/security/tools/config/CryptUtil.java → ...a/io/helidon/config/secure/CryptUtil.java b/...idon/security/tools/config/CryptUtil.java → ...a/io/helidon/config/secure/CryptUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.helidon.security.tools.config;
+package io.helidon.config.secure;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;

diff --git a/...o/helidon/security/tools/config/Main.java → ...n/java/io/helidon/config/secure/Main.java b/...o/helidon/security/tools/config/Main.java → ...n/java/io/helidon/config/secure/Main.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.helidon.security.tools.config;
+package io.helidon.config.secure;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

diff --git a/...y/tools/config/SecureConfigException.java → .../config/secure/SecureConfigException.java b/...y/tools/config/SecureConfigException.java → .../config/secure/SecureConfigException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.helidon.security.tools.config;
+package io.helidon.config.secure;
 
 /**
  * Secure config related exception.

diff --git a/...rity/tools/config/SecureConfigFilter.java → ...don/config/secure/SecureConfigFilter.java b/...rity/tools/config/SecureConfigFilter.java → ...don/config/secure/SecureConfigFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.helidon.security.tools.config;
+package io.helidon.config.secure;
 
 import java.security.PrivateKey;
 import java.security.interfaces.RSAPrivateKey;