Rework craftsnet security from scratch

.gitignore

@@ -72,5 +72,5 @@ addons
 logs
 libraries
 
-.env
+.env.repo
 

README.md

@@ -10,5 +10,5 @@
 
 | CraftsNet Version | Compatible |
 |-------------------|------------|
-| >= 3.4.1-SNAPSHOT | ✅          |
-| <= 3.4.0-SNAPSHOT | ❌          |
+| >= 3.7.0          | ✅          |
+| <= 3.7.0          | ❌          |

bom/build.gradle

@@ -0,0 +1,51 @@
+plugins {
+    id "java-platform"
+}
+
+gradle.projectsEvaluated {
+    def validSubprojects = rootProject.subprojects.findAll { sub ->
+        sub.name != project.name &&
+                (!sub.ext.has("shouldPublish") || sub.ext["shouldPublish"]) &&
+                sub.tasks.findByName("classes") != null
+    }
+
+    dependencies {
+        constraints {
+            validSubprojects.sort { "$it.name" }.each {
+                api it
+            }
+        }
+    }
+}
+
+craftsPublish {
+    artifactId = project.name
+    name = "CraftsNet Security ${project.name}"
+
+    component = project.components.javaPlatform
+
+    pom {
+        name = project.name
+        description = project.description
+
+        scm {
+            url = 'https://github.com/CraftsBlock/CraftsNet-Security'
+            connection = 'scm:git:git://github.com/CraftsBlock/CraftsNet-Security.git'
+            developerConnection = 'scm:git:[email protected]:CraftsBlock/CraftsNet-Security.git'
+        }
+
+        issueManagement {
+            system = 'github'
+            url = 'https://github.com/CraftsBlock/CraftsNet-Security/issues'
+        }
+
+        licenses {
+            license {
+                name = 'GNU General Public License v3.0'
+                url = 'https://github.com/CraftsBlock/CraftsNet-Security/blob/master/LICENSE'
+            }
+        }
+    }
+}
+
+description = "Bill-of-Materials for craftsnet security"

build.gradle

@@ -1,86 +1,96 @@
 plugins {
-    id 'java'
-    id 'maven-publish'
+    id "de.craftsblock.gradle.publish" version "0.0.20" apply false
 }
 
-def env = new Properties()
-file(".env").withInputStream {
-    env.load(it)
-}
+version = "1.0.0-pre1"
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+subprojects {
+    apply plugin: "maven-publish"
+    apply plugin: "de.craftsblock.gradle.publish"
 
-    withJavadocJar()
-    withSourcesJar()
-}
+    group = 'de.craftsblock.craftsnet.modules.security'
+    version = rootProject.version
 
-group = 'de.craftsblock.craftsnet.modules'
-version = '1.0.0-pre10'
+    repositories {
+        mavenCentral()
+        maven { url "https://repo.craftsblock.de/releases" }
+        maven { url "https://repo.craftsblock.de/experimental" }
+    }
 
-repositories {
-    mavenCentral()
-    maven { url "https://repo.craftsblock.de/releases" }
-    maven { url "https://repo.craftsblock.de/experimental" }
-}
+    afterEvaluate {
+        if (project.components.findByName("javaPlatform") != null) {
+            return
+        }
 
-dependencies {
-    // CraftsBlock dependencies ----------------------------------------------------------------------------------------
+        java {
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
 
-    // https://repo.craftsblock.de/#/releases/de/craftsblock/craftscore/bom
-    implementation platform("de.craftsblock.craftscore:bom:3.8.12")
+            withJavadocJar()
+            withSourcesJar()
+        }
 
-    // https://repo.craftsblock.de/#/releases/de/craftsblock/craftscore/event
-    implementation "de.craftsblock.craftscore:event"
+        dependencies {
+            // CraftsBlock dependencies ----------------------------------------------------------------------------------------
 
-    // https://repo.craftsblock.de/#/releases/de/craftsblock/craftscore/json
-    implementation "de.craftsblock.craftscore:json"
+            // https://repo.craftsblock.de/#/releases/de/craftsblock/craftscore/bom
+            implementation platform("de.craftsblock.craftscore:bom:3.8.13-pre9")
 
-    // https://repo.craftsblock.de/#/releases/de/craftsblock/craftscore/sql
-    implementation "de.craftsblock.craftscore:sql"
+            // https://repo.craftsblock.de/#/releases/de/craftsblock/craftsnet
+            implementation "de.craftsblock:craftsnet:3.7.1"
 
-    // https://repo.craftsblock.de/#/releases/de/craftsblock/craftscore/utils
-    implementation "de.craftsblock.craftscore:utils"
+            // Third party dependencies ----------------------------------------------------------------------------------------
 
-    // https://repo.craftsblock.de/#/releases/de/craftsblock/craftsnet
-    implementation "de.craftsblock:craftsnet:3.5.6-pre6"
+            // https://mvnrepository.com/artifact/org.springframework.security/spring-security-crypto
+            implementation 'org.springframework.security:spring-security-crypto:7.1.0-M3'
 
-    // Third party dependencies ----------------------------------------------------------------------------------------
+            // https://mvnrepository.com/artifact/org.jetbrains/annotations
+            implementation 'org.jetbrains:annotations:26.1.0'
 
-    // https://mvnrepository.com/artifact/org.springframework.security/spring-security-crypto
-    implementation 'org.springframework.security:spring-security-crypto:6.5.0'
+        }
 
-    // https://mvnrepository.com/artifact/org.jetbrains/annotations
-    implementation 'org.jetbrains:annotations:26.0.2'
+        tasks.withType(JavaCompile).configureEach {
+            options.encoding = 'UTF-8'
+        }
 
-}
+        jar {
+            from sourceSets.main.output
 
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8'
-}
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
-jar {
-    from sourceSets.main.output
+            manifest {
+                attributes(
+                        'Implementation-Title': project.name,
+                        'Implementation-Version': project.version
+                )
+            }
+        }
 
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        tasks.register("runnableJar", Jar) {
+            archiveClassifier.set("runnable")
 
-    manifest {
-        attributes(
-                'Implementation-Title': project.name,
-                'Implementation-Version': project.version
-        )
-    }
-}
+            manifest {
+                attributes "Main-Class": application.mainClass.get()
+            }
+
+            from sourceSets.main.output
+
+            from {
+                configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+            }
+
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        }
+
+        craftsPublish {
+            artifactId = project.name
+            name = "CraftsNet Security ${project.name}"
+
+            component = project.components.java
 
-publishing {
-    publications {
-        normal(MavenPublication) {
-            artifactId "security"
-            from components.java
             pom {
-                name = 'Security'
-                description = 'Protect your CraftsNet Restful API with an token-based access control system'
+                name = project.name
+                description = project.description
 
                 scm {
                     url = 'https://github.com/CraftsBlock/CraftsNet-Security'
@@ -100,18 +110,15 @@ publishing {
                     }
                 }
             }
-        }
-    }
-    repositories {
-        maven {
-            url('https://repo.craftsblock.de/experimental')
-            authentication {
-                basic(BasicAuthentication)
-            }
-            credentials {
-                username = env["username"]
-                password = env["password"]
+
+            extraArtifacts {
+
+                runnable {
+                    task = "runnableJar"
+                    classifier = "runnable"
+                }
+
             }
         }
     }
-}
+}

common/build.gradle

@@ -0,0 +1,10 @@
+plugins {
+    id "java"
+    id "application"
+}
+
+application {
+    mainClass = "de.craftsblock.cnet.modules.security.CraftsNetSecurity"
+}
+
+description = "Protect your CraftsNet API with easy drop in security features."

common/src/main/java/de/craftsblock/cnet/modules/security/CraftsNetSecurity.java

@@ -0,0 +1,54 @@
+package de.craftsblock.cnet.modules.security;
+
+import de.craftsblock.cnet.modules.security.auth.AuthChain;
+import de.craftsblock.cnet.modules.security.auth.autoregister.AuthChainAutoRegisterHandler;
+import de.craftsblock.craftsnet.CraftsNet;
+import de.craftsblock.craftsnet.addon.Addon;
+import de.craftsblock.craftsnet.addon.meta.annotations.Meta;
+import de.craftsblock.craftsnet.api.http.HttpMethod;
+import de.craftsblock.craftsnet.autoregister.AutoRegisterRegistry;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+
+@Meta(name = "CraftsNetSecurity")
+public final class CraftsNetSecurity extends Addon {
+
+    public static final String VERSION = "1.0.0-pre1";
+
+    private AuthChain authChain;
+
+    public static void main(String[] args) throws IOException {
+        CraftsNet.create(CraftsNetSecurity.class)
+                .withArgs(args)
+                .build();
+    }
+
+    @Override
+    public void onLoad() {
+        super.onLoad();
+        this.authChain = new AuthChain();
+
+        AutoRegisterRegistry autoRegisterRegistry = this.getAutoRegisterRegistry();
+        autoRegisterRegistry.register(new AuthChainAutoRegisterHandler());
+    }
+
+    @Override
+    public void onEnable() {
+        super.onEnable();
+    }
+
+    @Override
+    public void onDisable() {
+        super.onDisable();
+    }
+
+    public static @NotNull AuthChain getAuthChain() {
+        return getInstance().authChain;
+    }
+
+    public static CraftsNetSecurity getInstance() {
+        return getAddon(CraftsNetSecurity.class);
+    }
+
+}