added jpms url protocol

.gitea/workflows/build.yaml

@@ -17,53 +17,45 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
       - name: Execute Gradle build
-        run: ./gradlew build
-      - name: Prepare Docker image build
-        run: ./gradlew prepareDockerBuild
-      - name: Get project version
-        id: retrieve-version
-        run: ./gradlew -q version >> "$GITHUB_OUTPUT"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        env:
+          PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}
+        run: ./gradlew build publish
+  build-docker:
+    name: "Build Docker images"
+    runs-on: hostinger
+    steps:
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.4.0
         with:
           driver: docker-container
-      - name: Login to Gitea container registry
+      -
+        name: Login to Gitea container registry
         uses: docker/login-action@v3
         with:
           registry: gitea.woggioni.net
           username: woggioni
           password: ${{ secrets.PUBLISHER_TOKEN }}
       -
-        name: Build gbcs Docker image
-        uses: docker/build-push-action@v5.3.0
+        name: Build and push gbcs images
+        uses: docker/build-push-action@v6
         with:
-          context: "docker/build/docker"
-          platforms: linux/amd64,linux/arm64
           push: true
           pull: true
           tags: |
-            gitea.woggioni.net/woggioni/gbcs:latest
-            gitea.woggioni.net/woggioni/gbcs:${{ steps.retrieve-version.outputs.VERSION }}
-          target: release
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/gbcs:buildx
-      -
-        name: Build gbcs memcached Docker image
-        uses: docker/build-push-action@v5.3.0
-        with:
-          context: "docker/build/docker"
-          platforms: linux/amd64,linux/arm64
-          push: true
-          pull: true
-          tags: |
-            gitea.woggioni.net/woggioni/gbcs:memcached
-            gitea.woggioni.net/woggioni/gbcs:memcached-${{ steps.retrieve-version.outputs.VERSION }}
-          target: release-memcached
+            "gitea.woggioni.net/woggioni/gbcs:slim"
           cache-from: type=registry,ref=gitea.woggioni.net/woggioni/gbcs:buildx
           cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/gbcs:buildx
-      - name: Publish artifacts
-        env:
-          PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}
-        run: ./gradlew publish
-
+          target: release
+      -
+        name: Build and push gbcs memcached image
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          pull: true
+          tags: |
+            "gitea.woggioni.net/woggioni/gbcs:latest"
+            "gitea.woggioni.net/woggioni/gbcs:memcached"
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/gbcs:buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/gbcs:buildx
+          target: release-memcached

Dockerfile

@@ -1,2 +1,46 @@
-FROM gitea.woggioni.net/woggioni/gbcs:memcached
+FROM container-registry.oracle.com/graalvm/native-image:21 AS oracle
+
+FROM ubuntu:24.04 AS build
+COPY --from=oracle /usr/lib64/graalvm/ /usr/lib64/graalvm/
+ENV JAVA_HOME=/usr/lib64/graalvm/graalvm-java21
+USER ubuntu
+WORKDIR /home/ubuntu
+
+RUN mkdir gbcs
+WORKDIR /home/ubuntu/gbcs
+
+COPY --chown=ubuntu:users .git .git
+COPY --chown=ubuntu:users gbcs-base gbcs-base
+COPY --chown=ubuntu:users gbcs-api gbcs-api
+COPY --chown=ubuntu:users gbcs-memcached gbcs-memcached
+COPY --chown=ubuntu:users gbcs-cli gbcs-cli
+COPY --chown=ubuntu:users src src
+COPY --chown=ubuntu:users settings.gradle settings.gradle
+COPY --chown=ubuntu:users build.gradle build.gradle
+COPY --chown=ubuntu:users gradle.properties gradle.properties
+COPY --chown=ubuntu:users gradle gradle
+COPY --chown=ubuntu:users gradlew gradlew
+
+RUN --mount=type=cache,target=/home/ubuntu/.gradle,uid=1000,gid=1000 ./gradlew --no-daemon assemble
+
+FROM alpine:latest AS base-release
+RUN --mount=type=cache,target=/var/cache/apk apk update
+RUN --mount=type=cache,target=/var/cache/apk apk add openjdk21-jre
+RUN adduser -D luser
+USER luser
+WORKDIR /home/luser
+
+FROM base-release AS release
+RUN --mount=type=bind,from=build,source=/home/ubuntu/gbcs/gbcs-cli/build,target=/home/luser/build cp build/libs/gbcs-cli-envelope-*.jar gbcs.jar
+ENTRYPOINT ["java", "-jar", "/home/luser/gbcs.jar"]
+
+FROM base-release AS release-memcached
+RUN --mount=type=bind,from=build,source=/home/ubuntu/gbcs/gbcs-cli/build,target=/home/luser/build cp build/libs/gbcs-cli-envelope-*.jar gbcs.jar
+RUN mkdir plugins
+WORKDIR /home/luser/plugins
+RUN --mount=type=bind,from=build,source=/home/ubuntu/gbcs/gbcs-memcached/build/distributions,target=/build/distributions tar -xf /build/distributions/gbcs-memcached*.tar
+WORKDIR /home/luser
+ENTRYPOINT ["java", "-jar", "/home/luser/gbcs.jar"]
+
+FROM release-memcached as compose
 COPY --chown=luser:luser conf/gbcs-memcached.xml /home/luser/.config/gbcs/gbcs.xml

build.gradle

@@ -6,19 +6,19 @@ plugins {
     id 'maven-publish'
 }
 
-
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
-allprojects { subproject ->
+
+allprojects {
     group = 'net.woggioni'
 
     if(project.currentTag.isPresent()) {
-            version = project.currentTag.map { it[0] }.get()
+        version = project.currentTag
     } else {
         version = project.gitRevision.map { gitRevision ->
             "${getProperty('gbcs.version')}.${gitRevision[0..10]}"
-            }.get()
+        }
     }
 
     repositories {
@@ -36,7 +36,7 @@ allprojects { subproject ->
     pluginManager.withPlugin('java-library') {
 
         ext {
-            jpmsModuleName = subproject.group + '.' + subproject.name.replace('-', '.')
+            jpmsModuleName = project.group + '.' + project.name.replace('-', '.')
         }
 
         java {
@@ -61,13 +61,14 @@ allprojects { subproject ->
             options.compilerArgumentProviders << new CommandLineArgumentProvider() {
                 @Override
                 Iterable<String> asArguments() {
-                    return ['--patch-module', subproject.jpmsModuleName + '=' + subproject.sourceSets.main.output.asPath]
+                    return ['--patch-module', project.jpmsModuleName + '=' + project.sourceSets.main.output.asPath]
                 }
             }
             options.javaModuleVersion = version
         }
     }
 
+
     pluginManager.withPlugin(catalog.plugins.kotlin.jvm.get().pluginId) {
         tasks.withType(KotlinCompile.class) {
             compilerOptions.jvmTarget = JvmTarget.JVM_21
@@ -100,6 +101,10 @@ allprojects { subproject ->
             }
         }
     }
+
+    tasks.withType(AbstractArchiveTask.class) {
+        archiveVersion = project.version
+    }
 }
 
 dependencies {
@@ -130,9 +135,3 @@ publishing {
     }
 }
 
-tasks.register('version') {
-    doLast {
-        println("VERSION=$version")
-    }
-}
-

conf/gbcs-memcached.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gbcs:server useVirtualThreads="true" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+<gbcs:server useVirtualThreads="false" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
              xmlns:gbcs="urn:net.woggioni.gbcs"
              xmlns:gbcs-memcached="urn:net.woggioni.gbcs-memcached"
              xs:schemaLocation="urn:net.woggioni.gbcs-memcached jpms://net.woggioni.gbcs.memcached/net/woggioni/gbcs/memcached/schema/gbcs-memcached.xsd urn:net.woggioni.gbcs jpms://net.woggioni.gbcs/net/woggioni/gbcs/schema/gbcs.xsd">

conf/logback.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration>
-
-<configuration>
-    <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
-    <import class="ch.qos.logback.core.ConsoleAppender"/>
-
-    <appender name="console" class="ConsoleAppender">
-        <target>System.err</target>
-        <encoder class="PatternLayoutEncoder">
-            <pattern>%d [%highlight(%-5level)] \(%thread\) %logger{36} -%kvp- %msg %n</pattern>
-        </encoder>
-    </appender>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-    <logger name="io.netty" level="debug"/>
-    <logger name="com.google.code.yanf4j" level="warn"/>
-    <logger name="net.rubyeye.xmemcached" level="warn"/>
-</configuration>

docker-compose.yml

@@ -11,6 +11,7 @@ services:
   gbcs:
     build:
       context: .
+      target: compose
     container_name: gbcs
     restart: unless-stopped
     ports:

docker/Dockerfile

@@ -1,21 +0,0 @@
-FROM alpine:latest AS base-release
-RUN --mount=type=cache,target=/var/cache/apk apk update
-RUN --mount=type=cache,target=/var/cache/apk apk add openjdk21-jre
-RUN adduser -D luser
-USER luser
-WORKDIR /home/luser
-
-FROM base-release AS release
-ADD gbcs-cli-envelope-*.jar gbcs.jar
-ENTRYPOINT ["java", "-jar", "/home/luser/gbcs.jar", "server"]
-
-FROM base-release AS release-memcached
-ADD --chown=luser:luser gbcs-cli-envelope-*.jar gbcs.jar
-RUN mkdir plugins
-WORKDIR /home/luser/plugins
-RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/gbcs-memcached*.tar
-WORKDIR /home/luser
-ENTRYPOINT ["java", "-jar", "/home/luser/gbcs.jar", "server"]
-
-FROM release-memcached as compose
-COPY --chown=luser:luser conf/gbcs-memcached.xml /home/luser/.config/gbcs/gbcs.xml

docker/build.gradle

@@ -1,67 +0,0 @@
-plugins {
-    id 'base'
-    alias(catalog.plugins.gradle.docker)
-}
-
-import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
-import com.bmuschko.gradle.docker.tasks.image.DockerPushImage
-import com.bmuschko.gradle.docker.tasks.image.DockerTagImage
-
-
-configurations {
-    docker {
-        canBeResolved = true
-        transitive = false
-        visible = false
-        canBeConsumed = false
-    }
-}
-
-dependencies {
-    docker project(path: ':gbcs-cli', configuration: 'release')
-    docker project(path: ':gbcs-memcached', configuration: 'release')
-}
-
-Provider<Task> cleanTaskProvider = tasks.named(BasePlugin.CLEAN_TASK_NAME) {}
-
-Provider<Copy> prepareDockerBuild = tasks.register('prepareDockerBuild', Copy) {
-    dependsOn cleanTaskProvider
-    group = 'docker'
-    into project.layout.buildDirectory.file('docker')
-    from(configurations.docker)
-    from(file('Dockerfile'))
-}
-
-Provider<DockerBuildImage> dockerBuild = tasks.register('dockerBuildImage', DockerBuildImage) {
-    group = 'docker'
-    dependsOn prepareDockerBuild
-    images.add('gitea.woggioni.net/woggioni/gbcs:latest')
-    images.add("gitea.woggioni.net/woggioni/gbcs:${version}")
-}
-
-Provider<DockerTagImage> dockerTag = tasks.register('dockerTagImage', DockerTagImage) {
-    group = 'docker'
-    repository = 'gitea.woggioni.net/woggioni/gbcs'
-    imageId = 'gitea.woggioni.net/woggioni/gbcs:latest'
-    tag = version
-}
-
-Provider<DockerTagImage> dockerTagMemcached = tasks.register('dockerTagMemcachedImage', DockerTagImage) {
-    group = 'docker'
-    repository = 'gitea.woggioni.net/woggioni/gbcs'
-    imageId = 'gitea.woggioni.net/woggioni/gbcs:memcached'
-    tag = "${version}-memcached"
-}
-
-Provider<DockerPushImage> dockerPush = tasks.register('dockerPushImage', DockerPushImage) {
-    group = 'docker'
-    dependsOn dockerTag, dockerTagMemcached
-    registryCredentials {
-        url = getProperty('docker.registry.url')
-        username = 'woggioni'
-        password = System.getenv().get("PUBLISHER_TOKEN")
-    }
-    images = [dockerTag.flatMap{ it.tag }, dockerTagMemcached.flatMap{ it.tag }]
-}
-
-

gbcs-api/build.gradle

@@ -7,6 +7,10 @@ plugins {
 dependencies {
 }
 
+tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
+    options.javaModuleVersion = version
+}
+
 publishing {
     publications {
         maven(MavenPublication) {

gbcs-api/src/main/java/net/woggioni/gbcs/api/Configuration.java

@@ -1,7 +1,6 @@
 package net.woggioni.gbcs.api;
 
 
-import lombok.EqualsAndHashCode;
 import lombok.Value;
 
 import java.nio.file.Path;
@@ -24,18 +23,25 @@ public class Configuration {
 
     @Value
     public static class Group {
-        @EqualsAndHashCode.Include
         String name;
         Set<Role> roles;
+
+        @Override
+        public int hashCode() {
+            return name.hashCode();
+        }
     }
 
     @Value
     public static class User {
-        @EqualsAndHashCode.Include
         String name;
         String password;
         Set<Group> groups;
 
+        @Override
+        public int hashCode() {
+            return name.hashCode();
+        }
 
         public Set<Role> getRoles() {
             return groups.stream()

gbcs-base/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id 'java-library'
@@ -10,6 +12,15 @@ dependencies {
     compileOnly catalog.slf4j.api
 }
 
+tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
+    options.compilerArgs << '--patch-module' << 'net.woggioni.gbcs.base=' + project.sourceSets.main.output.asPath
+    options.javaModuleVersion = version
+}
+
+tasks.named("compileKotlin", KotlinCompile.class) {
+    compilerOptions.jvmTarget = JvmTarget.JVM_21
+}
+
 publishing {
     publications {
         maven(MavenPublication) {

gbcs-base/src/main/kotlin/net/woggioni/gbcs/base/Xml.kt

@@ -146,8 +146,8 @@ class Xml(val doc: Document, val element: Element) {
             dbf.isExpandEntityReferences = true
             dbf.isIgnoringComments = true
             dbf.isNamespaceAware = true
-            dbf.isValidating = schemaResourceURL == null
-            dbf.setFeature("http://apache.org/xml/features/validation/schema", true)
+            dbf.isValidating = false
+            dbf.setFeature("http://apache.org/xml/features/validation/schema", true);
             schemaResourceURL?.let {
                 dbf.schema = getSchema(it)
             }
@@ -165,7 +165,7 @@ class Xml(val doc: Document, val element: Element) {
         return resource.openStream().use(db::parse)
     }
 
-        fun parseXml(sourceURL: URL, sourceStream: InputStream? = null, schemaResourceURL: URL? = null): Document {
+    fun parseXml(sourceURL : URL, sourceStream: InputStream? = null, schemaResourceURL: URL? = null): Document {
         val db = newDocumentBuilder(sourceURL, schemaResourceURL)
         return sourceStream?.let(db::parse) ?: sourceURL.openStream().use(db::parse)
     }
@@ -183,12 +183,7 @@ class Xml(val doc: Document, val element: Element) {
             transformer.transform(source, result)
         }
 
-        fun of(
-            namespaceURI: String,
-            qualifiedName: String,
-            schemaResourceURL: URL? = null,
-            cb: Xml.(el: Element) -> Unit
-        ): Document {
+        fun of(namespaceURI: String, qualifiedName: String, schemaResourceURL: URL? = null, cb: Xml.(el: Element) -> Unit): Document {
             val dbf = newDocumentBuilderFactory(schemaResourceURL)
             val db = dbf.newDocumentBuilder()
             val doc = db.newDocument()
@@ -212,7 +207,7 @@ class Xml(val doc: Document, val element: Element) {
 
     fun node(
         name: String,
-        namespaceURI: String? = null,
+        namespaceURI : String? = null,
         attrs: Map<String, String> = emptyMap(),
         cb: Xml.(el: Element) -> Unit = {}
     ): Element {
@@ -227,7 +222,7 @@ class Xml(val doc: Document, val element: Element) {
             }
     }
 
-    fun attr(key: String, value: String, namespaceURI: String? = null) {
+    fun attr(key: String, value: String, namespaceURI : String? = null) {
         element.setAttributeNS(namespaceURI, key, value)
     }
 

gbcs-cli/build.gradle

@@ -7,28 +7,22 @@ plugins {
     id 'maven-publish'
 }
 
-
 import net.woggioni.gradle.envelope.EnvelopeJarTask
-import net.woggioni.gradle.graalvm.NativeImageConfigurationTask
 import net.woggioni.gradle.graalvm.NativeImagePlugin
 import net.woggioni.gradle.graalvm.NativeImageTask
+import net.woggioni.gradle.graalvm.NativeImageConfigurationTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 Property<String> mainClassName = objects.property(String.class)
 mainClassName.set('net.woggioni.gbcs.cli.GradleBuildCacheServerCli')
 
 tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
+    options.compilerArgs << '--patch-module' << 'net.woggioni.gbcs.cli=' + project.sourceSets.main.output.asPath
+    options.javaModuleVersion = version
     options.javaModuleMainClass = mainClassName
 }
 
-configurations {
-    release {
-        transitive = false
-        canBeConsumed = true
-        canBeResolved = true
-        visible = true
-    }
-}
-
 envelopeJar {
     mainModule = 'net.woggioni.gbcs.cli'
     mainClass = mainClassName
@@ -42,7 +36,8 @@ dependencies {
     implementation catalog.netty.codec.http
     implementation catalog.picocli
 
-    implementation project(":gbcs-client")
+//    implementation project(':gbcs-base')
+//    implementation project(':gbcs-api')
     implementation rootProject
 
 //    runtimeOnly catalog.slf4j.jdk14
@@ -55,6 +50,11 @@ Provider<EnvelopeJarTask> envelopeJarTaskProvider = tasks.named('envelopeJar', E
     systemProperties['logback.configurationFile'] = 'classpath:net/woggioni/gbcs/cli/logback.xml'
 }
 
+def envelopeJarArtifact = artifacts.add('archives', envelopeJarTaskProvider.get().archiveFile.get().asFile) {
+    type = 'jar'
+    builtBy envelopeJarTaskProvider
+}
+
 tasks.named(NativeImagePlugin.CONFIGURE_NATIVE_IMAGE_TASK_NAME, NativeImageConfigurationTask) {
     mainClass = 'net.woggioni.gbcs.GraalNativeImageConfiguration'
 }
@@ -65,16 +65,11 @@ tasks.named(NativeImagePlugin.NATIVE_IMAGE_TASK_NAME, NativeImageTask) {
     buildStaticImage = true
 }
 
-artifacts {
-    release(envelopeJarTaskProvider)
-}
-
 publishing {
     publications {
         maven(MavenPublication) {
-            artifact envelopeJar
+            artifact envelopeJarArtifact
         }
     }
 }
 
-

gbcs-cli/src/main/java/module-info.java

@@ -3,7 +3,6 @@ module net.woggioni.gbcs.cli {
     requires net.woggioni.gbcs;
     requires info.picocli;
     requires net.woggioni.gbcs.base;
-    requires net.woggioni.gbcs.client;
     requires kotlin.stdlib;
     requires net.woggioni.jwo;
 

gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/GradleBuildCacheServerCli.kt

@@ -1,22 +1,28 @@
 package net.woggioni.gbcs.cli
 
+import net.woggioni.gbcs.GradleBuildCacheServer
+import net.woggioni.gbcs.GradleBuildCacheServer.Companion.DEFAULT_CONFIGURATION_URL
 import net.woggioni.gbcs.base.GbcsUrlStreamHandlerFactory
 import net.woggioni.gbcs.base.contextLogger
+import net.woggioni.gbcs.base.debug
+import net.woggioni.gbcs.base.info
 import net.woggioni.gbcs.cli.impl.AbstractVersionProvider
 import net.woggioni.gbcs.cli.impl.GbcsCommand
-import net.woggioni.gbcs.cli.impl.commands.BenchmarkCommand
-import net.woggioni.gbcs.cli.impl.commands.ClientCommand
 import net.woggioni.gbcs.cli.impl.commands.PasswordHashCommand
-import net.woggioni.gbcs.cli.impl.commands.ServerCommand
 import net.woggioni.jwo.Application
+import net.woggioni.jwo.JWO
+import org.slf4j.Logger
 import picocli.CommandLine
 import picocli.CommandLine.Model.CommandSpec
+import java.io.ByteArrayOutputStream
+import java.nio.file.Files
+import java.nio.file.Path
 
 
 @CommandLine.Command(
     name = "gbcs", versionProvider = GradleBuildCacheServerCli.VersionProvider::class
 )
-class GradleBuildCacheServerCli : GbcsCommand() {
+class GradleBuildCacheServerCli(application : Application, private val log : Logger) : GbcsCommand() {
 
     class VersionProvider : AbstractVersionProvider()
     companion object {
@@ -29,22 +35,24 @@ class GradleBuildCacheServerCli : GbcsCommand() {
                 .configurationDirectoryEnvVar("GBCS_CONFIGURATION_DIR")
                 .configurationDirectoryPropertyKey("net.woggioni.gbcs.conf.dir")
                 .build()
-            val gbcsCli = GradleBuildCacheServerCli()
+            val gbcsCli = GradleBuildCacheServerCli(app, log)
             val commandLine = CommandLine(gbcsCli)
             commandLine.setExecutionExceptionHandler { ex, cl, parseResult ->
                 log.error(ex.message, ex)
                 CommandLine.ExitCode.SOFTWARE
             }
-            commandLine.addSubcommand(ServerCommand(app))
             commandLine.addSubcommand(PasswordHashCommand())
-            commandLine.addSubcommand(
-                CommandLine(ClientCommand(app)).apply {
-                    addSubcommand(BenchmarkCommand())
-                })
             System.exit(commandLine.execute(*args))
         }
     }
 
+    @CommandLine.Option(
+        names = ["-c", "--config-file"],
+        description = ["Read the application configuration from this file"],
+        paramLabel = "CONFIG_FILE"
+    )
+    private var configurationFile: Path = findConfigurationFile(application)
+
     @CommandLine.Option(names = ["-V", "--version"], versionHelp = true)
     var versionHelp = false
         private set
@@ -52,8 +60,39 @@ class GradleBuildCacheServerCli : GbcsCommand() {
     @CommandLine.Spec
     private lateinit var spec: CommandSpec
 
+    private fun findConfigurationFile(app : Application): Path {
+        val confDir = app.computeConfigurationDirectory()
+        val configurationFile = confDir.resolve("gbcs.xml")
+        return configurationFile
+    }
+
+    private fun createDefaultConfigurationFile(configurationFile : Path) {
+        log.info {
+            "Creating default configuration file at '$configurationFile'"
+        }
+        val defaultConfigurationFileResource = DEFAULT_CONFIGURATION_URL
+        Files.newOutputStream(configurationFile).use { outputStream ->
+            defaultConfigurationFileResource.openStream().use { inputStream ->
+                JWO.copy(inputStream, outputStream)
+            }
+        }
+    }
 
     override fun run() {
-        spec.commandLine().usage(System.out);
+        if (!Files.exists(configurationFile)) {
+            Files.createDirectories(configurationFile.parent)
+            createDefaultConfigurationFile(configurationFile)
+        }
+
+        val configuration = GradleBuildCacheServer.loadConfiguration(configurationFile)
+        log.debug {
+            ByteArrayOutputStream().also {
+                GradleBuildCacheServer.dumpConfiguration(configuration, it)
+            }.let {
+                "Server configuration:\n${String(it.toByteArray())}"
+            }
+        }
+        GradleBuildCacheServer(configuration).run().use {
+        }
     }
 }

gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/AbstractVersionProvider.kt

@@ -1,6 +1,8 @@
 package net.woggioni.gbcs.cli.impl
 
 import picocli.CommandLine
+import java.net.URL
+import java.util.Enumeration
 import java.util.jar.Attributes
 import java.util.jar.JarFile
 import java.util.jar.Manifest

gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/GbcsCommand.kt

@@ -1,8 +1,6 @@
 package net.woggioni.gbcs.cli.impl
 
-import net.woggioni.jwo.Application
 import picocli.CommandLine
-import java.nio.file.Path
 
 
 abstract class GbcsCommand : Runnable {
@@ -10,10 +8,4 @@ abstract class GbcsCommand : Runnable {
     @CommandLine.Option(names = ["-h", "--help"], usageHelp = true)
     var usageHelp = false
         private set
-
-    protected fun findConfigurationFile(app: Application, fileName : String): Path {
-        val confDir = app.computeConfigurationDirectory()
-        val configurationFile = confDir.resolve(fileName)
-        return configurationFile
-    }
 }

gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/BenchmarkCommand.kt

@@ -1,119 +0,0 @@
-package net.woggioni.gbcs.cli.impl.commands
-
-import net.woggioni.gbcs.base.contextLogger
-import net.woggioni.gbcs.base.error
-import net.woggioni.gbcs.base.info
-import net.woggioni.gbcs.cli.impl.GbcsCommand
-import net.woggioni.gbcs.client.GbcsClient
-import picocli.CommandLine
-import java.security.SecureRandom
-import java.time.Duration
-import java.time.Instant
-import java.util.Base64
-import java.util.concurrent.ExecutionException
-import java.util.concurrent.Future
-import java.util.concurrent.LinkedBlockingQueue
-import kotlin.random.Random
-
-@CommandLine.Command(
-    name = "benchmark",
-    description = ["Run a load test against the server"],
-    showDefaultValues = true
-)
-class BenchmarkCommand : GbcsCommand() {
-    private val log = contextLogger()
-
-    @CommandLine.Spec
-    private lateinit var spec: CommandLine.Model.CommandSpec
-
-    @CommandLine.Option(
-        names = ["-e", "--entries"],
-        description = ["Total number of elements to be added to the cache"],
-        paramLabel = "NUMBER_OF_ENTRIES"
-    )
-    private var numberOfEntries = 1000
-
-    override fun run() {
-        val clientCommand = spec.parent().userObject() as ClientCommand
-        val profile = clientCommand.profileName.let { profileName ->
-            clientCommand.configuration.profiles[profileName]
-                ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration")
-        }
-        val client = GbcsClient(profile)
-
-        val entryGenerator = sequence {
-            val random = Random(SecureRandom.getInstance("NativePRNGNonBlocking").nextLong())
-            while (true) {
-                val key = Base64.getUrlEncoder().encode(random.nextBytes(16)).toString(Charsets.UTF_8)
-                val value = random.nextBytes(0x1000)
-                yield(key to value)
-            }
-        }
-
-        val entries = let {
-            val completionQueue = LinkedBlockingQueue<Future<Pair<String, ByteArray>>>(numberOfEntries)
-            val start = Instant.now()
-            entryGenerator.take(numberOfEntries).forEach { entry ->
-                val future = client.put(entry.first, entry.second).thenApply { entry }
-                future.whenComplete { _, _ ->
-                    completionQueue.put(future)
-                }
-            }
-
-            val inserted = sequence<Pair<String, ByteArray>> {
-                var completionCounter = 0
-                while (completionCounter < numberOfEntries) {
-                    val future = completionQueue.take()
-                    try {
-                        yield(future.get())
-                    } catch (ee: ExecutionException) {
-                        val cause = ee.cause ?: ee
-                        log.error(cause.message, cause)
-                    }
-                    completionCounter += 1
-                }
-            }.toList()
-            val end = Instant.now()
-            log.info {
-                val elapsed = Duration.between(start, end).toMillis()
-                "Insertion rate: ${numberOfEntries.toDouble() / elapsed * 1000} ops/s"
-            }
-            inserted
-        }
-        log.info {
-            "Inserted ${entries.size} entries"
-        }
-        if (entries.isNotEmpty()) {
-            val completionQueue = LinkedBlockingQueue<Future<Unit>>(entries.size)
-            val start = Instant.now()
-            entries.forEach { entry ->
-                val future = client.get(entry.first).thenApply {
-                    if (it == null) {
-                        log.error {
-                            "Missing entry for key '${entry.first}'"
-                        }
-                    } else if (!entry.second.contentEquals(it)) {
-                        log.error {
-                            "Retrieved a value different from what was inserted for key '${entry.first}'"
-                        }
-                    }
-                }
-                future.whenComplete { _, _ ->
-                    completionQueue.put(future)
-                }
-            }
-            var completionCounter = 0
-            while (completionCounter < entries.size) {
-                completionQueue.take()
-                completionCounter += 1
-            }
-            val end = Instant.now()
-            log.info {
-                val elapsed = Duration.between(start, end).toMillis()
-                "Retrieval rate: ${entries.size.toDouble() / elapsed * 1000} ops/s"
-            }
-        } else {
-            log.error("Skipping retrieval benchmark as it was not possible to insert any entry in the cache")
-        }
-    }
-}

gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ClientCommand.kt

@@ -1,41 +0,0 @@
-package net.woggioni.gbcs.cli.impl.commands
-
-import net.woggioni.gbcs.cli.impl.GbcsCommand
-import net.woggioni.gbcs.client.GbcsClient
-import net.woggioni.jwo.Application
-import picocli.CommandLine
-import java.nio.file.Path
-
-@CommandLine.Command(
-    name = "client",
-    description = ["GBCS client"],
-    showDefaultValues = true
-)
-class ClientCommand(app : Application) : GbcsCommand() {
-
-    @CommandLine.Option(
-        names = ["-c", "--configuration"],
-        description = ["Path to the client configuration file"],
-        paramLabel = "CONFIGURATION_FILE"
-    )
-    private var configurationFile : Path = findConfigurationFile(app, "gbcs-client.xml")
-
-    @CommandLine.Option(
-        names = ["-p", "--profile"],
-        description = ["Name of the client profile to be used"],
-        paramLabel = "PROFILE",
-        required = true
-    )
-    var profileName : String? = null
-
-    val configuration : GbcsClient.Configuration by lazy {
-        GbcsClient.Configuration.parse(configurationFile)
-    }
-
-    override fun run() {
-        println("Available profiles:")
-        configuration.profiles.forEach { (profileName, _) ->
-            println(profileName)
-        }
-    }
-}

gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/PasswordHashCommand.kt

@@ -5,9 +5,9 @@ import net.woggioni.gbcs.cli.impl.GbcsCommand
 import net.woggioni.gbcs.cli.impl.converters.OutputStreamConverter
 import net.woggioni.jwo.UncloseableOutputStream
 import picocli.CommandLine
+import java.io.BufferedWriter
 import java.io.OutputStream
 import java.io.OutputStreamWriter
-import java.io.PrintWriter
 
 
 @CommandLine.Command(
@@ -20,7 +20,7 @@ class PasswordHashCommand : GbcsCommand() {
         names = ["-o", "--output-file"],
         description = ["Write the output to a file instead of stdout"],
         converter = [OutputStreamConverter::class],
-        showDefaultValue = CommandLine.Help.Visibility.NEVER,
+        defaultValue = "stdout",
         paramLabel = "OUTPUT_FILE"
     )
     private var outputStream: OutputStream = UncloseableOutputStream(System.out)
@@ -30,8 +30,9 @@ class PasswordHashCommand : GbcsCommand() {
         val password2 = String(System.console().readPassword("Type your password again for confirmation:"))
         if(password1 != password2) throw IllegalArgumentException("Passwords do not match")
 
-        PrintWriter(OutputStreamWriter(outputStream, Charsets.UTF_8)).use {
-            it.println(hashPassword(password1))
+        BufferedWriter(OutputStreamWriter(outputStream, Charsets.UTF_8)).use {
+            it.write(hashPassword(password1))
+            it.newLine()
         }
     }
 }

gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ServerCommand.kt

@@ -1,67 +0,0 @@
-package net.woggioni.gbcs.cli.impl.commands
-
-import net.woggioni.gbcs.GradleBuildCacheServer
-import net.woggioni.gbcs.GradleBuildCacheServer.Companion.DEFAULT_CONFIGURATION_URL
-import net.woggioni.gbcs.base.contextLogger
-import net.woggioni.gbcs.base.debug
-import net.woggioni.gbcs.base.info
-import net.woggioni.gbcs.cli.impl.GbcsCommand
-import net.woggioni.gbcs.client.GbcsClient
-import net.woggioni.jwo.Application
-import net.woggioni.jwo.JWO
-import picocli.CommandLine
-import java.io.ByteArrayOutputStream
-import java.nio.file.Files
-import java.nio.file.Path
-
-@CommandLine.Command(
-    name = "server",
-    description = ["GBCS server"],
-    showDefaultValues = true
-)
-class ServerCommand(app : Application) : GbcsCommand() {
-
-    private val log = contextLogger()
-
-    private fun createDefaultConfigurationFile(configurationFile: Path) {
-        log.info {
-            "Creating default configuration file at '$configurationFile'"
-        }
-        val defaultConfigurationFileResource = DEFAULT_CONFIGURATION_URL
-        Files.newOutputStream(configurationFile).use { outputStream ->
-            defaultConfigurationFileResource.openStream().use { inputStream ->
-                JWO.copy(inputStream, outputStream)
-            }
-        }
-    }
-
-    @CommandLine.Option(
-        names = ["-c", "--config-file"],
-        description = ["Read the application configuration from this file"],
-        paramLabel = "CONFIG_FILE"
-    )
-    private var configurationFile: Path = findConfigurationFile(app, "gbcs-server.xml")
-
-    val configuration : GbcsClient.Configuration by lazy {
-        GbcsClient.Configuration.parse(configurationFile)
-    }
-
-    override fun run() {
-        if (!Files.exists(configurationFile)) {
-            Files.createDirectories(configurationFile.parent)
-            createDefaultConfigurationFile(configurationFile)
-        }
-
-        val configuration = GradleBuildCacheServer.loadConfiguration(configurationFile)
-        log.debug {
-            ByteArrayOutputStream().also {
-                GradleBuildCacheServer.dumpConfiguration(configuration, it)
-            }.let {
-                "Server configuration:\n${String(it.toByteArray())}"
-            }
-        }
-        val server = GradleBuildCacheServer(configuration)
-        server.run().use {
-        }
-    }
-}

gbcs-cli/src/main/resources/net/woggioni/gbcs/cli/logback.xml

@@ -12,11 +12,10 @@
         </encoder>
     </appender>
 
-    <root level="info">
+    <root level="debug">
         <appender-ref ref="console"/>
     </root>
     <logger name="io.netty" level="debug"/>
-    <logger name="io.netty.handler.ssl.BouncyCastlePemReader" level="info"/>
     <logger name="com.google.code.yanf4j" level="warn"/>
     <logger name="net.rubyeye.xmemcached" level="warn"/>
 </configuration>

gbcs-client/build.gradle

@@ -1,14 +0,0 @@
-plugins {
-    id 'java-library'
-    alias catalog.plugins.kotlin.jvm
-}
-
-dependencies {
-    implementation project(':gbcs-base')
-    implementation catalog.picocli
-    implementation catalog.slf4j.api
-    implementation catalog.netty.buffer
-    implementation catalog.netty.codec.http
-}
-
-

gbcs-client/src/jmh/java/net/woggioni/gbcs/benchmark/Main.java

@@ -1,262 +0,0 @@
-package net.woggioni.gbcs.benchmark;
-
-import lombok.Getter;
-import lombok.SneakyThrows;
-import net.woggioni.jwo.Fun;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Level;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.TearDown;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.KeyStore;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
-
-public class Main {
-
-    @SneakyThrows
-    private static Properties loadProperties() {
-        Properties properties = new Properties();
-        try (final var is = Main.class.getResourceAsStream("/benchmark.properties")) {
-            properties.load(is);
-        }
-        return properties;
-    }
-
-    private static final Properties properties = loadProperties();
-
-    @State(Scope.Thread)
-    public static class ExecutionPlan {
-        private final Random random = new Random(101325);
-
-        @Getter
-        private final HttpClient client = createHttpClient();
-
-        private final Map<String, byte[]> entries = new HashMap<>();
-
-
-        private HttpClient createHttpClient() {
-            final var clientBuilder = HttpClient.newBuilder();
-            getSslContext().ifPresent(clientBuilder::sslContext);
-            return clientBuilder.build();
-        }
-
-        public final Map<String, byte[]> getEntries() {
-            return Collections.unmodifiableMap(entries);
-        }
-
-        public Map.Entry<String, byte[]> newEntry() {
-            final var keyBuffer = new byte[0x20];
-            random.nextBytes(keyBuffer);
-            final var key = Base64.getUrlEncoder().encodeToString(keyBuffer);
-            final var value = new byte[0x1000];
-            random.nextBytes(value);
-            return Map.entry(key, value);
-        }
-
-        @SneakyThrows
-        public HttpRequest.Builder newRequestBuilder(String key) {
-            final var requestBuilder = HttpRequest.newBuilder()
-                    .uri(getServerURI().resolve(key));
-            String user = getUser();
-            if (user != null) {
-                requestBuilder.header("Authorization", buildAuthorizationHeader(user, getPassword()));
-            }
-            return requestBuilder;
-        }
-
-        @SneakyThrows
-        public URI getServerURI() {
-            return new URI(properties.getProperty("gbcs.server.url"));
-        }
-
-        @SneakyThrows
-        public Optional<String> getClientTrustStorePassword() {
-            return Optional.ofNullable(properties.getProperty("gbcs.client.ssl.truststore.password"))
-                    .filter(Predicate.not(String::isEmpty));
-
-        }
-
-        @SneakyThrows
-        public Optional<KeyStore> getClientTrustStore() {
-            return Optional.ofNullable(properties.getProperty("gbcs.client.ssl.truststore.file"))
-                    .filter(Predicate.not(String::isEmpty))
-                    .map(Path::of)
-                    .map((Fun<Path, KeyStore>) keyStoreFile -> {
-                        final var keyStore = KeyStore.getInstance("PKCS12");
-                        try (final var is = Files.newInputStream(keyStoreFile)) {
-                            keyStore.load(is, getClientTrustStorePassword().map(String::toCharArray).orElse(null));
-                        }
-                        return keyStore;
-                    });
-
-        }
-
-        @SneakyThrows
-        public Optional<KeyStore> getClientKeyStore() {
-            return Optional.ofNullable(properties.getProperty("gbcs.client.ssl.keystore.file"))
-                    .filter(Predicate.not(String::isEmpty))
-                    .map(Path::of)
-                    .map((Fun<Path, KeyStore>) keyStoreFile -> {
-                        final var keyStore = KeyStore.getInstance("PKCS12");
-                        try (final var is = Files.newInputStream(keyStoreFile)) {
-                            keyStore.load(is, getClientKeyStorePassword().map(String::toCharArray).orElse(null));
-                        }
-                        return keyStore;
-                    });
-
-        }
-
-        @SneakyThrows
-        public Optional<String> getClientKeyStorePassword() {
-            return Optional.ofNullable(properties.getProperty("gbcs.client.ssl.keystore.password"))
-                    .filter(Predicate.not(String::isEmpty));
-
-        }
-
-        @SneakyThrows
-        public Optional<String> getClientKeyPassword() {
-            return Optional.ofNullable(properties.getProperty("gbcs.client.ssl.key.password"))
-                    .filter(Predicate.not(String::isEmpty));
-
-        }
-
-        @SneakyThrows
-        public String getUser() {
-            return Optional.ofNullable(properties.getProperty("gbcs.server.username"))
-                    .filter(Predicate.not(String::isEmpty))
-                    .orElse(null);
-
-        }
-
-        @SneakyThrows
-        public String getPassword() {
-            return Optional.ofNullable(properties.getProperty("gbcs.server.password"))
-                    .filter(Predicate.not(String::isEmpty))
-                    .orElse(null);
-        }
-
-        private String buildAuthorizationHeader(String user, String password) {
-            final var b64 = Base64.getEncoder().encode(String.format("%s:%s", user, password).getBytes(StandardCharsets.UTF_8));
-            return "Basic " + new String(b64);
-        }
-
-        @SneakyThrows
-        private Optional<SSLContext> getSslContext() {
-            return getClientKeyStore().map((Fun<KeyStore, SSLContext>) clientKeyStore -> {
-                final var kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-                kmf.init(clientKeyStore, getClientKeyStorePassword().map(String::toCharArray).orElse(null));
-
-
-                // Set up trust manager factory with the truststore
-                final var trustManagers = getClientTrustStore().map((Fun<KeyStore, TrustManager[]>) ts -> {
-                    final var tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                    tmf.init(ts);
-                    return tmf.getTrustManagers();
-                }).orElse(new TrustManager[0]);
-
-                // Create SSL context with the key and trust managers
-                final var sslContext = SSLContext.getInstance("TLS");
-                sslContext.init(kmf.getKeyManagers(), trustManagers, null);
-                return sslContext;
-            });
-        }
-
-        @SneakyThrows
-        @Setup(Level.Trial)
-        public void setUp() {
-            final var client = getClient();
-            for (int i = 0; i < 1000; i++) {
-                final var pair = newEntry();
-                final var requestBuilder = newRequestBuilder(pair.getKey())
-                        .header("Content-Type", "application/octet-stream")
-                        .PUT(HttpRequest.BodyPublishers.ofByteArray(pair.getValue()));
-                final var response = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString());
-                if (201 != response.statusCode()) {
-                    throw new IllegalStateException(Integer.toString(response.statusCode()));
-                } else {
-                    entries.put(pair.getKey(), pair.getValue());
-                }
-            }
-        }
-
-        @TearDown
-        public void tearDown() {
-            client.close();
-        }
-
-
-        private Iterator<Map.Entry<String, byte[]>> it = null;
-
-        private Map.Entry<String, byte[]> nextEntry() {
-            if (it == null || !it.hasNext()) {
-                it = getEntries().entrySet().iterator();
-            }
-            return it.next();
-        }
-    }
-
-    @SneakyThrows
-    @Benchmark
-    @BenchmarkMode(Mode.Throughput)
-    @OutputTimeUnit(TimeUnit.SECONDS)
-    public void get(ExecutionPlan plan) {
-        final var client = plan.getClient();
-        final var entry = plan.nextEntry();
-        final var requestBuilder = plan.newRequestBuilder(entry.getKey())
-                .header("Accept", "application/octet-stream")
-                .GET();
-        final var response = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray());
-        if (200 != response.statusCode()) {
-            throw new IllegalStateException(Integer.toString(response.statusCode()));
-        } else {
-            if (!Arrays.equals(entry.getValue(), response.body())) {
-                throw new IllegalStateException("Retrieved unexpected value");
-            }
-        }
-    }
-
-
-    @SneakyThrows
-    @Benchmark
-    @BenchmarkMode(Mode.Throughput)
-    @OutputTimeUnit(TimeUnit.SECONDS)
-    public void put(Main.ExecutionPlan plan) {
-        final var client = plan.getClient();
-        final var entry = plan.nextEntry();
-
-        final var requestBuilder = plan.newRequestBuilder(entry.getKey())
-                .header("Content-Type", "application/octet-stream")
-                .PUT(HttpRequest.BodyPublishers.ofByteArray(entry.getValue()));
-
-        final var response = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray());
-        if (201 != response.statusCode()) {
-            throw new IllegalStateException(Integer.toString(response.statusCode()));
-        }
-    }
-}

gbcs-client/src/jmh/resources/benchmark.properties

@@ -1,6 +0,0 @@
-gbcs.server.url= https://gbcs.woggioni.net:443
-gbcs.client.ssl.keystore.file=conf/woggioni@c962475fa38.p12
-gbcs.client.ssl.keystore.password=password
-gbcs.client.ssl.key.password=password
-gbcs.client.ssl.truststore.file=conf/truststore.pfx
-gbcs.client.ssl.truststore.password=password

gbcs-client/src/main/java/module-info.java

@@ -1,16 +0,0 @@
-module net.woggioni.gbcs.client {
-    requires io.netty.handler;
-    requires io.netty.codec.http;
-    requires io.netty.transport;
-    requires kotlin.stdlib;
-    requires io.netty.common;
-    requires io.netty.buffer;
-    requires java.xml;
-    requires net.woggioni.gbcs.base;
-    requires io.netty.codec;
-    requires org.slf4j;
-
-    exports net.woggioni.gbcs.client;
-
-    opens net.woggioni.gbcs.client.schema;
-}

gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Client.kt

@@ -1,254 +0,0 @@
-package net.woggioni.gbcs.client
-
-import io.netty.bootstrap.Bootstrap
-import io.netty.buffer.ByteBuf
-import io.netty.buffer.Unpooled
-import io.netty.channel.Channel
-import io.netty.channel.ChannelHandlerContext
-import io.netty.channel.ChannelOption
-import io.netty.channel.ChannelPipeline
-import io.netty.channel.SimpleChannelInboundHandler
-import io.netty.channel.nio.NioEventLoopGroup
-import io.netty.channel.pool.AbstractChannelPoolHandler
-import io.netty.channel.pool.ChannelPool
-import io.netty.channel.pool.FixedChannelPool
-import io.netty.channel.socket.nio.NioSocketChannel
-import io.netty.handler.codec.DecoderException
-import io.netty.handler.codec.http.DefaultFullHttpRequest
-import io.netty.handler.codec.http.FullHttpRequest
-import io.netty.handler.codec.http.FullHttpResponse
-import io.netty.handler.codec.http.HttpClientCodec
-import io.netty.handler.codec.http.HttpContentDecompressor
-import io.netty.handler.codec.http.HttpHeaderNames
-import io.netty.handler.codec.http.HttpHeaderValues
-import io.netty.handler.codec.http.HttpMethod
-import io.netty.handler.codec.http.HttpObjectAggregator
-import io.netty.handler.codec.http.HttpResponseStatus
-import io.netty.handler.codec.http.HttpVersion
-import io.netty.handler.ssl.SslContext
-import io.netty.handler.ssl.SslContextBuilder
-import io.netty.handler.stream.ChunkedWriteHandler
-import io.netty.util.concurrent.Future
-import io.netty.util.concurrent.GenericFutureListener
-import net.woggioni.gbcs.base.Xml
-import net.woggioni.gbcs.base.contextLogger
-import net.woggioni.gbcs.base.debug
-import net.woggioni.gbcs.base.info
-import net.woggioni.gbcs.client.impl.Parser
-import java.net.InetSocketAddress
-import java.net.URI
-import java.nio.file.Files
-import java.nio.file.Path
-import java.security.PrivateKey
-import java.security.cert.X509Certificate
-import java.util.Base64
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.atomic.AtomicInteger
-import io.netty.util.concurrent.Future as NettyFuture
-
-
-class GbcsClient(private val profile: Configuration.Profile) : AutoCloseable {
-    private val group: NioEventLoopGroup
-    private var sslContext: SslContext
-    private val log = contextLogger()
-    private val pool: ChannelPool
-
-    data class Configuration(
-        val profiles: Map<String, Profile>
-    ) {
-        sealed class Authentication {
-            data class TlsClientAuthenticationCredentials(
-                val key: PrivateKey,
-                val certificateChain: Array<X509Certificate>
-            ) : Authentication()
-
-            data class BasicAuthenticationCredentials(val username: String, val password: String) : Authentication()
-        }
-
-        data class Profile(
-            val serverURI: URI,
-            val authentication: Authentication?,
-            val maxConnections : Int
-        )
-
-        companion object {
-            fun parse(path: Path): Configuration {
-                return Files.newInputStream(path).use {
-                    Xml.parseXml(path.toUri().toURL(), it)
-                }.let(Parser::parse)
-            }
-        }
-    }
-
-    init {
-        group = NioEventLoopGroup()
-        sslContext = SslContextBuilder.forClient().also { builder ->
-            (profile.authentication as? Configuration.Authentication.TlsClientAuthenticationCredentials)?.let { tlsClientAuthenticationCredentials ->
-                builder.keyManager(
-                    tlsClientAuthenticationCredentials.key,
-                    *tlsClientAuthenticationCredentials.certificateChain
-                )
-            }
-        }.build()
-
-        val (scheme, host, port) = profile.serverURI.run {
-            Triple(
-                if (scheme == null) "http" else profile.serverURI.scheme,
-                host,
-                port.takeIf { it > 0 } ?: if ("https" == scheme.lowercase()) 443 else 80
-            )
-        }
-
-        val bootstrap = Bootstrap().apply {
-            group(group)
-            channel(NioSocketChannel::class.java)
-            option(ChannelOption.TCP_NODELAY, true)
-            option(ChannelOption.SO_KEEPALIVE, true)
-            remoteAddress(InetSocketAddress(host, port))
-        }
-        val channelPoolHandler = object : AbstractChannelPoolHandler() {
-
-            @Volatile
-            private var connectionCount = AtomicInteger()
-
-            @Volatile
-            private var leaseCount = AtomicInteger()
-
-            override fun channelReleased(ch: Channel) {
-                log.debug {
-                    "Released lease ${leaseCount.decrementAndGet()}"
-                }
-            }
-
-            override fun channelAcquired(ch: Channel?) {
-                log.debug {
-                    "Acquired lease ${leaseCount.getAndIncrement()}"
-                }
-            }
-
-            override fun channelCreated(ch: Channel) {
-                log.debug {
-                    "Created connection ${connectionCount.getAndIncrement()}"
-                }
-                val pipeline: ChannelPipeline = ch.pipeline()
-
-                // Add SSL handler if needed
-                if ("https".equals(scheme, ignoreCase = true)) {
-                    pipeline.addLast("ssl", sslContext.newHandler(ch.alloc(), host, port))
-                }
-
-                // HTTP handlers
-                pipeline.addLast("codec", HttpClientCodec())
-                pipeline.addLast("decompressor", HttpContentDecompressor())
-                pipeline.addLast("aggregator", HttpObjectAggregator(1048576))
-                pipeline.addLast("chunked", ChunkedWriteHandler())
-            }
-        }
-        pool = FixedChannelPool(bootstrap, channelPoolHandler, profile.maxConnections)
-    }
-
-    fun get(key: String): CompletableFuture<ByteArray?> {
-        return sendRequest(profile.serverURI.resolve(key), HttpMethod.GET, null)
-            .thenApply {
-                val status = it.status()
-                if (it.status() == HttpResponseStatus.NOT_FOUND) {
-                    null
-                } else if (it.status() != HttpResponseStatus.OK) {
-                    throw HttpException(status)
-                } else {
-                    it.content()
-                }
-            }.thenApply { maybeByteBuf ->
-                maybeByteBuf?.let {
-                    val result = ByteArray(it.readableBytes())
-                    it.getBytes(0, result)
-                    result
-                }
-            }
-    }
-
-    fun put(key: String, content: ByteArray): CompletableFuture<Unit> {
-        return sendRequest(profile.serverURI.resolve(key), HttpMethod.PUT, content).thenApply {
-            val status = it.status()
-            if (it.status() != HttpResponseStatus.CREATED) {
-                throw HttpException(status)
-            }
-        }
-    }
-
-    private fun sendRequest(uri: URI, method: HttpMethod, body: ByteArray?): CompletableFuture<FullHttpResponse> {
-        val responseFuture = CompletableFuture<FullHttpResponse>()
-        // Custom handler for processing responses
-        pool.acquire().addListener(object : GenericFutureListener<NettyFuture<Channel>> {
-            override fun operationComplete(channelFuture: Future<Channel>) {
-                if (channelFuture.isSuccess) {
-                    val channel = channelFuture.now
-                    val pipeline = channel.pipeline()
-                    channel.pipeline().addLast("handler", object : SimpleChannelInboundHandler<FullHttpResponse>() {
-                        override fun channelRead0(
-                            ctx: ChannelHandlerContext,
-                            response: FullHttpResponse
-                        ) {
-                            responseFuture.complete(response)
-                            pipeline.removeLast()
-                            pool.release(channel)
-                        }
-
-                        override fun exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable) {
-                            val ex = when (cause) {
-                                is DecoderException -> cause.cause
-                                else -> cause
-                            }
-                            responseFuture.completeExceptionally(ex)
-                            ctx.close()
-                            pipeline.removeLast()
-                            pool.release(channel)
-                        }
-                    })
-                    // Prepare the HTTP request
-                    val request: FullHttpRequest = let {
-                        val content: ByteBuf? = body?.takeIf(ByteArray::isNotEmpty)?.let(Unpooled::wrappedBuffer)
-                        DefaultFullHttpRequest(
-                            HttpVersion.HTTP_1_1,
-                            method,
-                            uri.rawPath,
-                            content ?: Unpooled.buffer(0)
-                        ).apply {
-                            headers().apply {
-                                if (content != null) {
-                                    set(HttpHeaderNames.CONTENT_TYPE, HttpHeaderValues.APPLICATION_OCTET_STREAM)
-                                    set(HttpHeaderNames.CONTENT_LENGTH, content.readableBytes())
-                                }
-                                set(HttpHeaderNames.HOST, profile.serverURI.host)
-                                set(HttpHeaderNames.CONNECTION, HttpHeaderValues.CLOSE)
-                                set(
-                                    HttpHeaderNames.ACCEPT_ENCODING,
-                                    HttpHeaderValues.GZIP.toString() + "," + HttpHeaderValues.DEFLATE.toString()
-                                )
-                                // Add basic auth if configured
-                                (profile.authentication as? Configuration.Authentication.BasicAuthenticationCredentials)?.let { credentials ->
-                                    val auth = "${credentials.username}:${credentials.password}"
-                                    val encodedAuth = Base64.getEncoder().encodeToString(auth.toByteArray())
-                                    set(HttpHeaderNames.AUTHORIZATION, "Basic $encodedAuth")
-                                }
-                            }
-                        }
-                    }
-
-                    // Set headers
-                    // Send the request
-                    channel.writeAndFlush(request)
-                }
-            }
-        })
-        return responseFuture
-    }
-
-    fun shutDown(): NettyFuture<*> {
-        return group.shutdownGracefully()
-    }
-
-    override fun close() {
-        shutDown().sync()
-    }
-}

gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Exception.kt

@@ -1,9 +0,0 @@
-package net.woggioni.gbcs.client
-
-import io.netty.handler.codec.http.HttpResponseStatus
-
-class HttpException(private val status : HttpResponseStatus) : RuntimeException(status.reasonPhrase()) {
-
-    override val message: String
-        get() = "Http status ${status.code()}: ${status.reasonPhrase()}"
-}

gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/impl/Parser.kt

@@ -1,68 +0,0 @@
-package net.woggioni.gbcs.client.impl
-
-import net.woggioni.gbcs.base.Xml.Companion.asIterable
-import net.woggioni.gbcs.client.GbcsClient
-import org.w3c.dom.Document
-import java.net.URI
-import java.nio.file.Files
-import java.nio.file.Path
-import java.security.KeyStore
-import java.security.PrivateKey
-import java.security.cert.X509Certificate
-
-object Parser {
-
-    fun parse(document: Document): GbcsClient.Configuration {
-        val root = document.documentElement
-
-        val profiles = mutableMapOf<String, GbcsClient.Configuration.Profile>()
-
-        for (child in root.asIterable()) {
-            val tagName = child.localName
-            when (tagName) {
-                "profile" -> {
-                    val name = child.getAttribute("name")
-                    val uri = child.getAttribute("base-url").let(::URI)
-                    var authentication: GbcsClient.Configuration.Authentication? = null
-                    for (gchild in child.asIterable()) {
-                        when (gchild.localName) {
-                            "tls-client-auth" -> {
-                                val keyStoreFile = gchild.getAttribute("key-store-file")
-                                val keyStorePassword =
-                                    gchild.getAttribute("key-store-password").takeIf(String::isNotEmpty)
-                                val keyAlias = gchild.getAttribute("key-alias")
-                                val keyPassword = gchild.getAttribute("key-password").takeIf(String::isNotEmpty)
-
-                                val keystore = KeyStore.getInstance("PKCS12").apply {
-                                    Files.newInputStream(Path.of(keyStoreFile)).use {
-                                        load(it, keyStorePassword?.toCharArray())
-                                    }
-                                }
-                                val key = keystore.getKey(keyAlias, keyPassword?.toCharArray()) as PrivateKey
-                                val certChain = keystore.getCertificateChain(keyAlias).asSequence()
-                                    .map { it as X509Certificate }
-                                    .toList()
-                                    .toTypedArray()
-                                authentication =
-                                    GbcsClient.Configuration.Authentication.TlsClientAuthenticationCredentials(key, certChain)
-                            }
-
-                            "basic-auth" -> {
-                                val username = gchild.getAttribute("user")
-                                val password = gchild.getAttribute("password")
-                                authentication =
-                                    GbcsClient.Configuration.Authentication.BasicAuthenticationCredentials(username, password)
-                            }
-                        }
-                    }
-                    val maxConnections = child.getAttribute("max-connections")
-                        .takeIf(String::isNotEmpty)
-                        ?.let(String::toInt)
-                        ?: 50
-                    profiles[name] = GbcsClient.Configuration.Profile(uri, authentication, maxConnections)
-                }
-            }
-        }
-        return GbcsClient.Configuration(profiles)
-    }
-}

gbcs-client/src/main/resources/net/woggioni/gbcs/client/schema/gbcs-client.xsd

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema targetNamespace="urn:net.woggioni.gbcs.client"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:gbcs-client="urn:net.woggioni.gbcs.client"
-           elementFormDefault="unqualified"
->
-    <xs:element name="profiles" type="gbcs-client:profilesType"/>
-
-    <xs:complexType name="profilesType">
-        <xs:sequence minOccurs="0">
-            <xs:element name="profile" type="gbcs-client:profileType" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="profileType">
-        <xs:choice>
-            <xs:element name="basic-auth" type="gbcs-client:basicAuthType"/>
-            <xs:element name="tls-client-auth" type="gbcs-client:tlsClientAuthType"/>
-        </xs:choice>
-        <xs:attribute name="name" type="xs:token" use="required"/>
-        <xs:attribute name="base-url" type="xs:anyURI" use="required"/>
-        <xs:attribute name="max-connections" type="xs:positiveInteger" default="50"/>
-    </xs:complexType>
-
-    <xs:complexType name="basicAuthType">
-        <xs:attribute name="user" type="xs:string" use="required"/>
-        <xs:attribute name="password" type="xs:string" use="required"/>
-    </xs:complexType>
-
-    <xs:complexType name="tlsClientAuthType">
-        <xs:attribute name="key-store-file" type="xs:anyURI" use="required"/>
-        <xs:attribute name="key-store-password" type="xs:string" use="required"/>
-        <xs:attribute name="key-alias" type="xs:string" use="required"/>
-        <xs:attribute name="key-password" type="xs:string" use="optional"/>
-    </xs:complexType>
-
-</xs:schema>

gbcs-client/src/test/resources/net/woggioni/gbcs/client/test/gbcs-client.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gbcs-client:profiles xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-                      xmlns:gbcs-client="urn:net.woggioni.gbcs.client"
-                      xs:schemaLocation="urn:net.woggioni.gbcs.client jms://net.woggioni.gbcs.client/net/woggioni/gbcs/client/schema/gbcs-client.xsd"
-                      >
-    <profile name="profile1" base-url="https://gbcs1.example.com/">
-        <tls-client-auth
-                key-store-file="keystore.pfx"
-                key-store-password="password"
-                key-alias="woggioni@c962475fa38"
-                key-password="key-password"/>
-    </profile>
-    <profile name="profile2" base-url="https://gbcs2.example.com/">
-        <basic-auth user="user" password="password"/>
-    </profile>
-</gbcs-client:profiles>

gbcs-memcached/build.gradle

@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id 'java-library'
     id 'maven-publish'
@@ -19,15 +22,7 @@ configurations {
             }
         }
     }
-
-    release {
-        transitive = false
-        canBeConsumed = true
-        canBeResolved = true
-        visible = true
-    }
 }
-
 dependencies {
     compileOnly project(':gbcs-base')
     compileOnly project(':gbcs-api')
@@ -35,6 +30,15 @@ dependencies {
     implementation catalog.xmemcached
 }
 
+tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
+    options.compilerArgs << '--patch-module' << 'net.woggioni.gbcs.memcached=' + project.sourceSets.main.output.asPath
+    options.javaModuleVersion = version
+}
+
+tasks.named("compileKotlin", KotlinCompile.class) {
+    compilerOptions.jvmTarget = JvmTarget.JVM_21
+}
+
 Provider<Tar> bundleTask = tasks.register("bundle", Tar) {
     from(tasks.named(JavaPlugin.JAR_TASK_NAME))
     from(configurations.bundle)
@@ -45,14 +49,16 @@ tasks.named(BasePlugin.ASSEMBLE_TASK_NAME) {
     dependsOn(bundleTask)
 }
 
-artifacts {
-    release(bundleTask)
+def bundleArtifact = artifacts.add('archives', bundleTask.get().archiveFile.get().asFile) {
+    type = 'tar'
+    builtBy bundleTask
 }
 
+
 publishing {
     publications {
         maven(MavenPublication) {
-            artifact bundleTask
+            artifact bundleArtifact
         }
     }
 }

gbcs-memcached/src/main/kotlin/net/woggioni/gbcs/memcached/MemcachedCache.kt

@@ -1,5 +1,6 @@
 package net.woggioni.gbcs.memcached
 
+import net.rubyeye.xmemcached.MemcachedClient
 import net.rubyeye.xmemcached.XMemcachedClientBuilder
 import net.rubyeye.xmemcached.command.BinaryCommandFactory
 import net.rubyeye.xmemcached.transcoders.CompressionMode

gbcs-memcached/src/main/kotlin/net/woggioni/gbcs/memcached/MemcachedCacheProvider.kt

@@ -9,16 +9,14 @@ import net.woggioni.gbcs.base.Xml.Companion.asIterable
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 import java.time.Duration
+import java.util.zip.Deflater
 
 class MemcachedCacheProvider : CacheProvider<MemcachedCacheConfiguration> {
     override fun getXmlSchemaLocation() = "classpath:net/woggioni/gbcs/memcached/schema/gbcs-memcached.xsd"
 
     override fun getXmlType() = "memcachedCacheType"
 
-    override fun getXmlNamespace() = "urn:net.woggioni.gbcs-memcached"
-
-    val xmlNamespacePrefix : String
-        get() = "gbcs-memcached"
+    override fun getXmlNamespace()= "urn:net.woggioni.gbcs-memcached"
 
     override fun deserialize(el: Element): MemcachedCacheConfiguration {
         val servers = mutableListOf<HostAndPort>()
@@ -37,7 +35,7 @@ class MemcachedCacheProvider : CacheProvider<MemcachedCacheConfiguration> {
         val compressionMode = el.getAttribute("compression-mode")
             .takeIf(String::isNotEmpty)
             ?.let {
-                when (it) {
+                when(it) {
                     "gzip" -> CompressionMode.GZIP
                     "zip" -> CompressionMode.ZIP
                     else -> CompressionMode.ZIP
@@ -62,14 +60,12 @@ class MemcachedCacheProvider : CacheProvider<MemcachedCacheConfiguration> {
         )
     }
 
-    override fun serialize(doc: Document, cache: MemcachedCacheConfiguration) = cache.run {
-        val result = doc.createElement("cache")
+    override fun serialize(doc: Document, cache : MemcachedCacheConfiguration) = cache.run {
+        val result = doc.createElementNS(xmlNamespace,"cache")
         Xml.of(doc, result) {
-            attr("xmlns:${xmlNamespacePrefix}", xmlNamespace, namespaceURI = "http://www.w3.org/2000/xmlns/")
-
-            attr("xs:type", "${xmlNamespacePrefix}:$xmlType", GBCS.XML_SCHEMA_NAMESPACE_URI)
+            attr("xs:type", xmlType, GBCS.XML_SCHEMA_NAMESPACE_URI)
             for (server in servers) {
-                node("server") {
+                node("server", xmlNamespace) {
                     attr("host", server.host)
                     attr("port", server.port.toString())
                 }
@@ -79,12 +75,10 @@ class MemcachedCacheProvider : CacheProvider<MemcachedCacheConfiguration> {
             digestAlgorithm?.let { digestAlgorithm ->
                 attr("digest", digestAlgorithm)
             }
-            attr(
-                "compression-mode", when (compressionMode) {
+            attr("compression-mode", when(compressionMode) {
                 CompressionMode.GZIP -> "gzip"
                 CompressionMode.ZIP -> "zip"
-                }
-            )
+            })
         }
         result
     }

gbcs-memcached/src/main/resources/net/woggioni/gbcs/memcached/schema/gbcs-memcached.xsd

@@ -20,14 +20,14 @@
                 <xs:attribute name="max-age" type="xs:duration" default="P1D"/>
                 <xs:attribute name="max-size" type="xs:unsignedInt" default="1048576"/>
                 <xs:attribute name="digest" type="xs:token" />
-                <xs:attribute name="compression-mode" type="gbcs-memcached:compressionType" default="zip"/>
+                <xs:attribute name="compression-type" type="gbcs-memcached:compressionType" default="deflate"/>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
 
     <xs:simpleType name="compressionType">
         <xs:restriction base="xs:token">
-            <xs:enumeration value="zip"/>
+            <xs:enumeration value="deflate"/>
             <xs:enumeration value="gzip"/>
         </xs:restriction>
     </xs:simpleType>

gradle.properties

@@ -4,7 +4,6 @@ org.gradle.caching=true
 
 gbcs.version = 0.0.1
 
-lys.version = 2025.01.10
+lys.version = 2025.01.09
 
 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven
-docker.registry.url=gitea.woggioni.net

settings.gradle

@@ -30,6 +30,5 @@ include 'gbcs-api'
 include 'gbcs-base'
 include 'gbcs-memcached'
 include 'gbcs-cli'
-include 'docker'
-include 'gbcs-client'
+
 

src/main/kotlin/net/woggioni/gbcs/GradleBuildCacheServer.kt

@@ -12,6 +12,7 @@ import io.netty.channel.ChannelInitializer
 import io.netty.channel.ChannelOption
 import io.netty.channel.ChannelPromise
 import io.netty.channel.DefaultFileRegion
+import io.netty.channel.EventLoopGroup
 import io.netty.channel.SimpleChannelInboundHandler
 import io.netty.channel.nio.NioEventLoopGroup
 import io.netty.channel.socket.nio.NioServerSocketChannel
@@ -33,6 +34,8 @@ import io.netty.handler.codec.http.HttpServerCodec
 import io.netty.handler.codec.http.HttpUtil
 import io.netty.handler.codec.http.HttpVersion
 import io.netty.handler.codec.http.LastHttpContent
+import io.netty.handler.ssl.ApplicationProtocolNames
+import io.netty.handler.ssl.ApplicationProtocolNegotiationHandler
 import io.netty.handler.ssl.ClientAuth
 import io.netty.handler.ssl.SslContext
 import io.netty.handler.ssl.SslContextBuilder
@@ -54,7 +57,6 @@ import net.woggioni.gbcs.base.PasswordSecurity.decodePasswordHash
 import net.woggioni.gbcs.base.PasswordSecurity.hashPassword
 import net.woggioni.gbcs.base.Xml
 import net.woggioni.gbcs.base.contextLogger
-import net.woggioni.gbcs.base.info
 import net.woggioni.gbcs.configuration.Parser
 import net.woggioni.gbcs.configuration.Serializer
 import net.woggioni.jwo.JWO
@@ -69,6 +71,7 @@ import java.security.PrivateKey
 import java.security.cert.X509Certificate
 import java.util.Arrays
 import java.util.Base64
+import java.util.concurrent.Executors
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 import javax.naming.ldap.LdapName
@@ -102,7 +105,6 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
     private class ClientCertificateAuthenticator(
         authorizer: Authorizer,
         private val sslEngine: SSLEngine,
-        private val anonymousUserRoles: Set<Role>?,
         private val userExtractor: Configuration.UserExtractor?,
         private val groupExtractor: Configuration.GroupExtractor?,
     ) : AbstractNettyHttpAuthenticator(authorizer) {
@@ -113,16 +115,16 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
 
         override fun authenticate(ctx: ChannelHandlerContext, req: HttpRequest): Set<Role>? {
             return try {
-                sslEngine.session.peerCertificates.takeIf {
+                sslEngine.session.peerCertificates
+            } catch (es: SSLPeerUnverifiedException) {
+                null
+            }?.takeIf {
                 it.isNotEmpty()
             }?.let { peerCertificates ->
                 val clientCertificate = peerCertificates.first() as X509Certificate
                 val user = userExtractor?.extract(clientCertificate)
                 val group = groupExtractor?.extract(clientCertificate)
                 (group?.roles ?: emptySet()) + (user?.roles ?: emptySet())
-                } ?: anonymousUserRoles
-            } catch (es: SSLPeerUnverifiedException) {
-                anonymousUserRoles
             }
         }
     }
@@ -140,21 +142,21 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
                 log.debug(ctx) {
                     "Missing Authorization header"
                 }
-                return users[""]?.roles
+                return null
             }
             val cursor = authorizationHeader.indexOf(' ')
             if (cursor < 0) {
                 log.debug(ctx) {
                     "Invalid Authorization header: '$authorizationHeader'"
                 }
-                return users[""]?.roles
+                return null
             }
             val authenticationType = authorizationHeader.substring(0, cursor)
             if ("Basic" != authenticationType) {
                 log.debug(ctx) {
                     "Invalid authentication type header: '$authenticationType'"
                 }
-                return users[""]?.roles
+                return null
             }
             val (username, password) = Base64.getDecoder().decode(authorizationHeader.substring(cursor + 1))
                 .let(::String)
@@ -178,12 +180,8 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
         }
     }
 
-    private class ServerInitializer(
-        private val cfg: Configuration,
-        private val eventExecutorGroup: EventExecutorGroup
-    ) : ChannelInitializer<Channel>() {
+    private class ServerInitializer(private val cfg: Configuration) : ChannelInitializer<Channel>() {
 
-        companion object {
         private fun createSslCtx(tls: Configuration.Tls): SslContext {
             val keyStore = tls.keyStore
             return if (keyStore == null) {
@@ -191,7 +189,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
             } else {
                 val javaKeyStore = loadKeystore(keyStore.file, keyStore.password)
                 val serverKey = javaKeyStore.getKey(
-                        keyStore.keyAlias, (keyStore.keyPassword ?: "").let(String::toCharArray)
+                    keyStore.keyAlias, keyStore.keyPassword?.let(String::toCharArray)
                 ) as PrivateKey
                 val serverCert: Array<X509Certificate> =
                     Arrays.stream(javaKeyStore.getCertificateChain(keyStore.keyAlias))
@@ -200,7 +198,8 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
                 SslContextBuilder.forServer(serverKey, *serverCert).apply {
                     if (tls.isVerifyClients) {
                         clientAuth(ClientAuth.OPTIONAL)
-                            tls.trustStore?.let { trustStore ->
+                        val trustStore = tls.trustStore
+                        if (trustStore != null) {
                             val ts = loadKeystore(trustStore.file, trustStore.password)
                             trustManager(
                                 ClientCertificateValidator.getTrustManager(ts, trustStore.isCheckCertificateStatus)
@@ -211,6 +210,11 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
             }
         }
 
+        private val sslContext: SslContext? = cfg.tls?.let(this::createSslCtx)
+        private val group: EventExecutorGroup = DefaultEventExecutorGroup(Runtime.getRuntime().availableProcessors())
+
+        companion object {
+
             fun loadKeystore(file: Path, password: String?): KeyStore {
                 val ext = JWO.splitExtension(file)
                     .map(Tuple2<String, String>::get_2)
@@ -233,8 +237,6 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
             }
         }
 
-        private val sslContext: SslContext? = cfg.tls?.let(Companion::createSslCtx)
-
         private fun userExtractor(authentication: Configuration.ClientCertificateAuthentication) =
             authentication.userExtractor?.let { extractor ->
                 val pattern = Pattern.compile(extractor.pattern)
@@ -268,17 +270,18 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
             val auth = cfg.authentication
             var authenticator: AbstractNettyHttpAuthenticator? = null
             if (auth is Configuration.BasicAuthentication) {
-                authenticator = (NettyHttpBasicAuthenticator(cfg.users, RoleAuthorizer()))
+                val roleAuthorizer = RoleAuthorizer()
+                authenticator = (NettyHttpBasicAuthenticator(cfg.users, roleAuthorizer))
             }
             if (sslContext != null) {
                 val sslHandler = sslContext.newHandler(ch.alloc())
                 pipeline.addLast(sslHandler)
 
                 if (auth is Configuration.ClientCertificateAuthentication) {
+                    val roleAuthorizer = RoleAuthorizer()
                     authenticator = ClientCertificateAuthenticator(
-                        RoleAuthorizer(),
+                        roleAuthorizer,
                         sslHandler.engine(),
-                        cfg.users[""]?.roles,
                         userExtractor(auth),
                         groupExtractor(auth)
                     )
@@ -293,7 +296,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
             }
             val cacheImplementation = cfg.cache.materialize()
             val prefix = Path.of("/").resolve(Path.of(cfg.serverPath ?: "/"))
-            pipeline.addLast(eventExecutorGroup, ServerHandler(cacheImplementation, prefix))
+            pipeline.addLast(group, ServerHandler(cacheImplementation, prefix))
             pipeline.addLast(ExceptionHandler())
         }
     }
@@ -444,50 +447,46 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
     }
 
     class ServerHandle(
-        httpChannelFuture: ChannelFuture,
-        private val executorGroups: Iterable<EventExecutorGroup>
+        private val httpChannel: ChannelFuture,
+        private val bossGroup: EventLoopGroup,
+        private val workerGroup: EventLoopGroup
     ) : AutoCloseable {
-        private val httpChannel: Channel = httpChannelFuture.channel()
 
-        private val closeFuture: ChannelFuture = httpChannel.closeFuture()
+        private val closeFuture: ChannelFuture = httpChannel.channel().closeFuture()
 
         fun shutdown(): ChannelFuture {
-            return httpChannel.close()
+            return httpChannel.channel().close()
         }
 
         override fun close() {
             try {
                 closeFuture.sync()
             } finally {
-                executorGroups.forEach {
-                    it.shutdownGracefully().sync()
-                }
-            }
-            log.info {
-                "GradleBuildCacheServer has been gracefully shut down"
+                val fut1 = workerGroup.shutdownGracefully()
+                val fut2 = if (bossGroup !== workerGroup) {
+                    bossGroup.shutdownGracefully()
+                } else null
+                fut1.sync()
+                fut2?.sync()
             }
         }
     }
 
     fun run(): ServerHandle {
         // Create the multithreaded event loops for the server
-        val bossGroup = NioEventLoopGroup(0)
+        val bossGroup = NioEventLoopGroup()
         val serverSocketChannel = NioServerSocketChannel::class.java
-        val workerGroup = bossGroup
-        val eventExecutorGroup = run {
-            val threadFactory = if (cfg.isUseVirtualThread) {
-                Thread.ofVirtual().factory()
+        val workerGroup = if (cfg.isUseVirtualThread) {
+            NioEventLoopGroup(0, Executors.newVirtualThreadPerTaskExecutor())
         } else {
-                null
-            }
-            DefaultEventExecutorGroup(Runtime.getRuntime().availableProcessors(), threadFactory)
+            NioEventLoopGroup(0, Executors.newWorkStealingPool())
         }
         // A helper class that simplifies server configuration
         val bootstrap = ServerBootstrap().apply {
             // Configure the server
             group(bossGroup, workerGroup)
             channel(serverSocketChannel)
-            childHandler(ServerInitializer(cfg, eventExecutorGroup))
+            childHandler(ServerInitializer(cfg))
             option(ChannelOption.SO_BACKLOG, 128)
             childOption(ChannelOption.SO_KEEPALIVE, true)
         }
@@ -496,10 +495,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
         // Bind and start to accept incoming connections.
         val bindAddress = InetSocketAddress(cfg.host, cfg.port)
         val httpChannel = bootstrap.bind(bindAddress).sync()
-        log.info {
-            "GradleBuildCacheServer is listening on ${cfg.host}:${cfg.port}"
-        }
-        return ServerHandle(httpChannel, setOf(bossGroup, workerGroup, eventExecutorGroup))
+        return ServerHandle(httpChannel, bossGroup, workerGroup)
     }
 
     companion object {
@@ -513,10 +509,8 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
             return Parser.parse(doc)
         }
 
-        fun dumpConfiguration(conf: Configuration, outputStream: OutputStream) {
+        fun dumpConfiguration(conf : Configuration, outputStream: OutputStream) {
             Xml.write(Serializer.serialize(conf), outputStream)
         }
-
-        private val log = contextLogger()
     }
 }

src/main/kotlin/net/woggioni/gbcs/auth/ClientCertificateValidator.kt

@@ -1,18 +1,16 @@
 package net.woggioni.gbcs.auth
 
-import io.netty.channel.ChannelHandlerContext
-import io.netty.channel.ChannelInboundHandlerAdapter
-import io.netty.handler.ssl.SslHandler
-import io.netty.handler.ssl.SslHandshakeCompletionEvent
 import java.security.KeyStore
 import java.security.cert.CertPathValidator
-import java.security.cert.CertPathValidatorException
-import java.security.cert.CertificateException
 import java.security.cert.CertificateFactory
 import java.security.cert.PKIXParameters
 import java.security.cert.PKIXRevocationChecker
 import java.security.cert.X509Certificate
 import java.util.EnumSet
+import io.netty.channel.ChannelHandlerContext
+import io.netty.channel.ChannelInboundHandlerAdapter
+import io.netty.handler.ssl.SslHandler
+import io.netty.handler.ssl.SslHandshakeCompletionEvent
 import javax.net.ssl.SSLSession
 import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509TrustManager
@@ -50,11 +48,7 @@ class ClientCertificateValidator private constructor(
                 object : X509TrustManager {
                     override fun checkClientTrusted(chain: Array<out X509Certificate>, authType: String) {
                         val clientCertificateChain = certificateFactory.generateCertPath(chain.toList())
-                        try {
                         validator.validate(clientCertificateChain, params)
-                        } catch (ex : CertPathValidatorException) {
-                            throw CertificateException(ex)
-                        }
                     }
 
                     override fun checkServerTrusted(chain: Array<out X509Certificate>, authType: String) {

src/main/kotlin/net/woggioni/gbcs/configuration/Parser.kt

@@ -16,36 +16,35 @@ import net.woggioni.gbcs.base.Xml.Companion.asIterable
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 import org.w3c.dom.TypeInfo
+import java.lang.IllegalArgumentException
 import java.nio.file.Paths
 
 object Parser {
 
     fun parse(document: Document): Configuration {
         val root = document.documentElement
-        val anonymousUser = User("", null, emptySet())
         var cache: Cache? = null
         var host = "127.0.0.1"
         var port = 11080
-        var users : Map<String, User> = mapOf(anonymousUser.name to anonymousUser)
+        var users = emptyMap<String, User>()
         var groups = emptyMap<String, Group>()
         var tls: Tls? = null
         val serverPath = root.getAttribute("path")
         val useVirtualThread = root.getAttribute("useVirtualThreads")
             .takeIf(String::isNotEmpty)
-            ?.let(String::toBoolean) ?: true
+            ?.let(String::toBoolean) ?: false
         var authentication: Authentication? = null
         for (child in root.asIterable()) {
-            val tagName = child.localName
-            when (tagName) {
+            when (child.localName) {
                 "authorization" -> {
-                    var knownUsers = sequenceOf(anonymousUser)
                     for (gchild in child.asIterable()) {
-                        when (gchild.localName) {
+                        when (child.localName) {
                             "users" -> {
-                                knownUsers += parseUsers(gchild)
+                                users = parseUsers(child)
                             }
+
                             "groups" -> {
-                                val pair = parseGroups(gchild, knownUsers)
+                                val pair = parseGroups(child, users)
                                 users = pair.first
                                 groups = pair.second
                             }
@@ -77,17 +76,17 @@ object Parser {
                             "client-certificate" -> {
                                 var tlsExtractorUser: TlsCertificateExtractor? = null
                                 var tlsExtractorGroup: TlsCertificateExtractor? = null
-                                for (ggchild in gchild.asIterable()) {
-                                    when (ggchild.localName) {
+                                for (gchild in child.asIterable()) {
+                                    when (gchild.localName) {
                                         "group-extractor" -> {
-                                            val attrName = ggchild.getAttribute("attribute-name")
-                                            val pattern = ggchild.getAttribute("pattern")
+                                            val attrName = gchild.getAttribute("attribute-name")
+                                            val pattern = gchild.getAttribute("pattern")
                                             tlsExtractorGroup = TlsCertificateExtractor(attrName, pattern)
                                         }
 
                                         "user-extractor" -> {
-                                            val attrName = ggchild.getAttribute("attribute-name")
-                                            val pattern = ggchild.getAttribute("pattern")
+                                            val attrName = gchild.getAttribute("attribute-name")
+                                            val pattern = gchild.getAttribute("pattern")
                                             tlsExtractorUser = TlsCertificateExtractor(attrName, pattern)
                                         }
                                     }
@@ -152,22 +151,23 @@ object Parser {
         }
     }.toSet()
 
-    private fun parseUserRefs(root: Element) = root.asIterable().asSequence().map {
+    private fun parseUserRefs(root: Element) = root.asIterable().asSequence().filter {
+        it.localName == "user"
+    }.map {
         it.getAttribute("ref")
     }.toSet()
 
-    private fun parseUsers(root: Element): Sequence<User> {
+    private fun parseUsers(root: Element): Map<String, User> {
         return root.asIterable().asSequence().filter {
             it.localName == "user"
         }.map { el ->
             val username = el.getAttribute("name")
             val password = el.getAttribute("password").takeIf(String::isNotEmpty)
-            User(username, password, emptySet())
-        }
+            username to User(username, password, emptySet())
+        }.toMap()
     }
 
-    private fun parseGroups(root: Element, knownUsers: Sequence<User>): Pair<Map<String, User>, Map<String, Group>> {
-        val knownUsersMap = knownUsers.associateBy(User::getName)
+    private fun parseGroups(root: Element, knownUsers: Map<String, User>): Pair<Map<String, User>, Map<String, Group>> {
         val userGroups = mutableMapOf<String, MutableSet<String>>()
         val groups = root.asIterable().asSequence().filter {
             it.localName == "group"
@@ -177,7 +177,7 @@ object Parser {
             for (child in el.asIterable()) {
                 when (child.localName) {
                     "users" -> {
-                        parseUserRefs(child).mapNotNull(knownUsersMap::get).forEach { user ->
+                        parseUserRefs(child).mapNotNull(knownUsers::get).forEach { user ->
                             userGroups.computeIfAbsent(user.name) {
                                 mutableSetOf()
                             }.add(groupName)
@@ -191,7 +191,7 @@ object Parser {
             }
             groupName to Group(groupName, roles)
         }.toMap()
-        val users = knownUsersMap.map { (name, user) ->
+        val users = knownUsers.map { (name, user) ->
             name to User(name, user.password, userGroups[name]?.mapNotNull { groups[it] }?.toSet() ?: emptySet())
         }.toMap()
         return users to groups

src/main/kotlin/net/woggioni/gbcs/configuration/Serializer.kt

@@ -17,7 +17,7 @@ object Serializer {
             attr("useVirtualThreads", conf.isUseVirtualThread.toString())
 //            attr("xmlns:xs", GradleBuildCacheServer.XML_SCHEMA_NAMESPACE_URI)
             val value = schemaLocations.asSequence().map { (k, v) -> "$k $v" }.joinToString(" ")
-            attr("xs:schemaLocation", value , namespaceURI = GBCS.XML_SCHEMA_NAMESPACE_URI)
+            attr("xs:schemaLocation",value , namespaceURI = GBCS.XML_SCHEMA_NAMESPACE_URI)
 
             conf.serverPath
                 ?.takeIf(String::isNotEmpty)
@@ -35,7 +35,6 @@ object Serializer {
             node("authorization") {
                 node("users") {
                     for(user in conf.users.values) {
-                        if(user.name.isNotEmpty()) {
                         node("user") {
                             attr("name", user.name)
                             user.password?.let { password ->
@@ -44,7 +43,6 @@ object Serializer {
                         }
                     }
                 }
-                }
                 node("groups") {
                     val groups = conf.users.values.asSequence()
                         .flatMap {
@@ -57,18 +55,10 @@ object Serializer {
                             attr("name", group.name)
                             if(users.isNotEmpty()) {
                                 node("users") {
-                                    var anonymousUser : Configuration.User? = null
                                     for(user in users) {
-                                        if(user.name.isNotEmpty()) {
                                         node("user") {
                                             attr("ref", user.name)
                                         }
-                                        } else {
-                                            anonymousUser = user
-                                        }
-                                    }
-                                    if(anonymousUser != null) {
-                                        node("anonymous")
                                     }
                                 }
                             }
@@ -92,12 +82,6 @@ object Serializer {
                         }
                         is Configuration.ClientCertificateAuthentication -> {
                             node("client-certificate") {
-                                authentication.groupExtractor?.let { extractor ->
-                                    node("group-extractor") {
-                                        attr("attribute-name", extractor.rdnType)
-                                        attr("pattern", extractor.pattern)
-                                    }
-                                }
                                 authentication.userExtractor?.let { extractor ->
                                     node("user-extractor") {
                                         attr("attribute-name", extractor.rdnType)

src/main/resources/net/woggioni/gbcs/schema/gbcs.xsd

@@ -10,6 +10,9 @@
         <xs:sequence minOccurs="0">
             <xs:element name="bind" type="gbcs:bindType" maxOccurs="1"/>
             <xs:element name="cache" type="gbcs:cacheType" maxOccurs="1"/>
+<!--            <xs:choice>-->
+<!--                <xs:element name="fileSystemCache" type="fileSystemCacheType"/>-->
+<!--            </xs:choice>-->
             <xs:element name="authorization" type="gbcs:authorizationType" minOccurs="0">
                 <xs:key name="userId">
                     <xs:selector xpath="users/user"/>
@@ -21,10 +24,11 @@
                 </xs:keyref>
             </xs:element>
             <xs:element name="authentication" type="gbcs:authenticationType" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="tls-certificate-authorization" type="gbcs:tlsCertificateAuthorizationType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="tls" type="gbcs:tlsType" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
         <xs:attribute name="path" type="xs:string" use="optional"/>
-        <xs:attribute name="useVirtualThreads" type="xs:boolean" use="optional" default="true"/>
+        <xs:attribute name="useVirtualThreads" type="xs:boolean" use="optional"/>
     </xs:complexType>
 
     <xs:complexType name="bindType">
@@ -127,7 +131,6 @@
     <xs:complexType name="userRefsType">
         <xs:sequence>
             <xs:element name="user" type="gbcs:userRefType" maxOccurs="unbounded" minOccurs="0"/>
-                <xs:element name="anonymous" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
 

src/test/java/net/woggioni/gbcs/utils/NetworkUtils.java

@@ -1,30 +1,19 @@
 package net.woggioni.gbcs.utils;
 
-import net.woggioni.jwo.JWO;
-
 import java.io.IOException;
-import java.net.InetAddress;
 import java.net.ServerSocket;
 
 public class NetworkUtils {
 
-    private static final int MAX_ATTEMPTS = 50;
-
     public static int getFreePort() {
-        int count = 0;
-        while(count < MAX_ATTEMPTS) {
-            try (ServerSocket serverSocket = new ServerSocket(0, 50, InetAddress.getLocalHost())) {
+        while(true) {
+            try (ServerSocket serverSocket = new ServerSocket(0)) {
                 final var candidate = serverSocket.getLocalPort();
-                if (candidate > 0) {
+                if (serverSocket.getLocalPort() > 0) {
                     return candidate;
-                } else {
-                    JWO.newThrowable(RuntimeException.class, "Got invalid port number: %d", candidate);
-                    throw new RuntimeException("Error trying to find an open port");
                 }
             } catch (IOException ignored) {
-                ++count;
             }
         }
-        throw new RuntimeException("Error trying to find an open port");
     }
 }

src/test/kotlin/net/woggioni/gbcs/test/AbstractBasicAuthServerTest.kt

@@ -1,76 +0,0 @@
-package net.woggioni.gbcs.test
-
-import net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.api.Role
-import net.woggioni.gbcs.base.Xml
-import net.woggioni.gbcs.cache.FileSystemCacheConfiguration
-import net.woggioni.gbcs.configuration.Serializer
-import net.woggioni.gbcs.utils.NetworkUtils
-import java.net.URI
-import java.net.http.HttpRequest
-import java.nio.charset.StandardCharsets
-import java.nio.file.Path
-import java.time.Duration
-import java.util.Base64
-import java.util.zip.Deflater
-import kotlin.random.Random
-
-
-abstract class AbstractBasicAuthServerTest : AbstractServerTest() {
-
-    private lateinit var cacheDir : Path
-
-    protected val random = Random(101325)
-    protected val keyValuePair = newEntry(random)
-    protected val serverPath = "gbcs"
-    protected val readersGroup = Configuration.Group("readers", setOf(Role.Reader))
-    protected val writersGroup = Configuration.Group("writers", setOf(Role.Writer))
-
-    abstract protected val users : List<Configuration.User>
-
-    override fun setUp() {
-        this.cacheDir = testDir.resolve("cache")
-        cfg = Configuration(
-            "127.0.0.1",
-            NetworkUtils.getFreePort(),
-            serverPath,
-            users.asSequence().map { it.name to it}.toMap(),
-            sequenceOf(writersGroup, readersGroup).map { it.name to it}.toMap(),
-            FileSystemCacheConfiguration(this.cacheDir,
-                maxAge = Duration.ofSeconds(3600 * 24),
-                digestAlgorithm = "MD5",
-                compressionLevel = Deflater.DEFAULT_COMPRESSION,
-                compressionEnabled = false
-            ),
-            Configuration.BasicAuthentication(),
-            null,
-            true,
-        )
-        Xml.write(Serializer.serialize(cfg), System.out)
-    }
-
-    override fun tearDown() {
-    }
-
-    protected fun buildAuthorizationHeader(user : Configuration.User, password : String) : String {
-        val b64 = Base64.getEncoder().encode("${user.name}:${password}".toByteArray(Charsets.UTF_8)).let{
-            String(it, StandardCharsets.UTF_8)
-        }
-        return "Basic $b64"
-    }
-
-    protected fun newRequestBuilder(key : String) = HttpRequest.newBuilder()
-        .uri(URI.create("http://${cfg.host}:${cfg.port}/$serverPath/$key"))
-
-
-    protected fun newEntry(random : Random) : Pair<String, ByteArray> {
-        val key = ByteArray(0x10).let {
-            random.nextBytes(it)
-            Base64.getUrlEncoder().encodeToString(it)
-        }
-        val value = ByteArray(0x1000).also {
-            random.nextBytes(it)
-        }
-        return key to value
-    }
-}

src/test/kotlin/net/woggioni/gbcs/test/AbstractTlsServerTest.kt

@@ -1,187 +0,0 @@
-package net.woggioni.gbcs.test
-
-import net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.api.Role
-import net.woggioni.gbcs.base.Xml
-import net.woggioni.gbcs.cache.FileSystemCacheConfiguration
-import net.woggioni.gbcs.configuration.Serializer
-import net.woggioni.gbcs.utils.CertificateUtils
-import net.woggioni.gbcs.utils.CertificateUtils.X509Credentials
-import net.woggioni.gbcs.utils.NetworkUtils
-import org.bouncycastle.asn1.x500.X500Name
-import java.net.URI
-import java.net.http.HttpClient
-import java.net.http.HttpRequest
-import java.nio.charset.StandardCharsets
-import java.nio.file.Files
-import java.nio.file.Path
-import java.security.KeyStore
-import java.security.KeyStore.PasswordProtection
-import java.time.Duration
-import java.util.Base64
-import java.util.zip.Deflater
-import javax.net.ssl.KeyManagerFactory
-import javax.net.ssl.SSLContext
-import javax.net.ssl.TrustManagerFactory
-import kotlin.random.Random
-
-
-abstract class AbstractTlsServerTest : AbstractServerTest() {
-
-    companion object {
-        private const val CA_CERTIFICATE_ENTRY = "gbcs-ca"
-        private const val CLIENT_CERTIFICATE_ENTRY = "gbcs-client"
-        private const val SERVER_CERTIFICATE_ENTRY = "gbcs-server"
-        private const val PASSWORD = "password"
-    }
-
-    private lateinit var cacheDir: Path
-    private lateinit var serverKeyStoreFile: Path
-    private lateinit var clientKeyStoreFile: Path
-    private lateinit var trustStoreFile: Path
-    private lateinit var serverKeyStore: KeyStore
-    private lateinit var clientKeyStore: KeyStore
-    private lateinit var trustStore: KeyStore
-    protected lateinit var ca: X509Credentials
-
-    protected val readersGroup = Configuration.Group("readers", setOf(Role.Reader))
-    protected val writersGroup = Configuration.Group("writers", setOf(Role.Writer))
-    protected val random = Random(101325)
-    protected val keyValuePair = newEntry(random)
-    private val serverPath : String? = null
-
-    protected abstract val users : List<Configuration.User>
-
-    protected fun createKeyStoreAndTrustStore() {
-        ca = CertificateUtils.createCertificateAuthority(CA_CERTIFICATE_ENTRY, 30)
-        val serverCert = CertificateUtils.createServerCertificate(ca, X500Name("CN=$SERVER_CERTIFICATE_ENTRY"), 30)
-        val clientCert = CertificateUtils.createClientCertificate(ca, X500Name("CN=$CLIENT_CERTIFICATE_ENTRY"), 30)
-
-        serverKeyStore = KeyStore.getInstance("PKCS12").apply {
-            load(null, null)
-            setEntry(CA_CERTIFICATE_ENTRY, KeyStore.TrustedCertificateEntry(ca.certificate), PasswordProtection(null))
-            setEntry(
-                SERVER_CERTIFICATE_ENTRY,
-                KeyStore.PrivateKeyEntry(
-                    serverCert.keyPair().private,
-                    arrayOf(serverCert.certificate(), ca.certificate)
-                ),
-                PasswordProtection(PASSWORD.toCharArray())
-            )
-        }
-        Files.newOutputStream(this.serverKeyStoreFile).use {
-            serverKeyStore.store(it, null)
-        }
-
-        clientKeyStore = KeyStore.getInstance("PKCS12").apply {
-            load(null, null)
-            setEntry(CA_CERTIFICATE_ENTRY, KeyStore.TrustedCertificateEntry(ca.certificate), PasswordProtection(null))
-            setEntry(
-                CLIENT_CERTIFICATE_ENTRY,
-                KeyStore.PrivateKeyEntry(
-                    clientCert.keyPair().private,
-                    arrayOf(clientCert.certificate(), ca.certificate)
-                ),
-                PasswordProtection(PASSWORD.toCharArray())
-            )
-        }
-        Files.newOutputStream(this.clientKeyStoreFile).use {
-            clientKeyStore.store(it, null)
-        }
-
-        trustStore = KeyStore.getInstance("PKCS12").apply {
-            load(null, null)
-            setEntry(CA_CERTIFICATE_ENTRY, KeyStore.TrustedCertificateEntry(ca.certificate), PasswordProtection(null))
-        }
-        Files.newOutputStream(this.trustStoreFile).use {
-            trustStore.store(it, null)
-        }
-    }
-
-    protected fun getClientKeyStore(ca: X509Credentials, subject: X500Name) = KeyStore.getInstance("PKCS12").apply {
-        val clientCert = CertificateUtils.createClientCertificate(ca, subject, 30)
-
-        load(null, null)
-        setEntry(CA_CERTIFICATE_ENTRY, KeyStore.TrustedCertificateEntry(ca.certificate), PasswordProtection(null))
-        setEntry(
-            CLIENT_CERTIFICATE_ENTRY,
-            KeyStore.PrivateKeyEntry(clientCert.keyPair().private, arrayOf(clientCert.certificate(), ca.certificate)),
-            PasswordProtection(PASSWORD.toCharArray())
-        )
-    }
-
-    protected fun getHttpClient(clientKeyStore: KeyStore?): HttpClient {
-        val kmf = clientKeyStore?.let {
-            KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()).apply {
-                init(it, PASSWORD.toCharArray())
-            }
-        }
-
-
-        // Set up trust manager factory with the truststore
-        val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-        tmf.init(trustStore)
-
-        // Create SSL context with the key and trust managers
-        val sslContext = SSLContext.getInstance("TLS").apply {
-            init(kmf?.keyManagers ?: emptyArray(), tmf.trustManagers, null)
-        }
-        return HttpClient.newBuilder().sslContext(sslContext).build()
-    }
-
-    override fun setUp() {
-        this.clientKeyStoreFile = testDir.resolve("client-keystore.p12")
-        this.serverKeyStoreFile = testDir.resolve("server-keystore.p12")
-        this.trustStoreFile = testDir.resolve("truststore.p12")
-        this.cacheDir = testDir.resolve("cache")
-        createKeyStoreAndTrustStore()
-        cfg = Configuration(
-            "127.0.0.1",
-            NetworkUtils.getFreePort(),
-            serverPath,
-            users.asSequence().map { it.name to it }.toMap(),
-            sequenceOf(writersGroup, readersGroup).map { it.name to it }.toMap(),
-            FileSystemCacheConfiguration(this.cacheDir,
-                maxAge = Duration.ofSeconds(3600 * 24),
-                compressionEnabled = true,
-                compressionLevel = Deflater.DEFAULT_COMPRESSION,
-                digestAlgorithm = "MD5"
-            ),
-            Configuration.ClientCertificateAuthentication(
-                Configuration.TlsCertificateExtractor("CN", "(.*)"),
-                null
-            ),
-            Configuration.Tls(
-                Configuration.KeyStore(this.serverKeyStoreFile, null, SERVER_CERTIFICATE_ENTRY, PASSWORD),
-                Configuration.TrustStore(this.trustStoreFile, null, false),
-                true
-            ),
-            false,
-        )
-        Xml.write(Serializer.serialize(cfg), System.out)
-    }
-
-    override fun tearDown() {
-    }
-
-    protected fun newRequestBuilder(key: String) = HttpRequest.newBuilder()
-        .uri(URI.create("https://${cfg.host}:${cfg.port}/${serverPath ?: ""}/$key"))
-
-    private fun buildAuthorizationHeader(user: Configuration.User, password: String): String {
-        val b64 = Base64.getEncoder().encode("${user.name}:${password}".toByteArray(Charsets.UTF_8)).let {
-            String(it, StandardCharsets.UTF_8)
-        }
-        return "Basic $b64"
-    }
-
-    protected fun newEntry(random: Random): Pair<String, ByteArray> {
-        val key = ByteArray(0x10).let {
-            random.nextBytes(it)
-            Base64.getUrlEncoder().encodeToString(it)
-        }
-        val value = ByteArray(0x1000).also {
-            random.nextBytes(it)
-        }
-        return key to value
-    }
-}

src/test/kotlin/net/woggioni/gbcs/test/BasicAuthServerTest.kt

@@ -4,26 +4,90 @@ import io.netty.handler.codec.http.HttpResponseStatus
 import net.woggioni.gbcs.api.Configuration
 import net.woggioni.gbcs.api.Role
 import net.woggioni.gbcs.base.PasswordSecurity.hashPassword
+import net.woggioni.gbcs.base.Xml
+import net.woggioni.gbcs.cache.FileSystemCacheConfiguration
+import net.woggioni.gbcs.configuration.Serializer
+import net.woggioni.gbcs.utils.NetworkUtils
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Order
 import org.junit.jupiter.api.Test
+import java.io.IOException
+import java.net.ServerSocket
+import java.net.URI
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
+import java.nio.charset.StandardCharsets
+import java.nio.file.Path
+import java.time.Duration
+import java.util.Base64
+import java.util.zip.Deflater
+import kotlin.random.Random
 
 
-class BasicAuthServerTest : AbstractBasicAuthServerTest() {
+class BasicAuthServerTest : AbstractServerTest() {
 
     companion object {
         private const val PASSWORD = "password"
     }
 
-    override val users = listOf(
+    private lateinit var cacheDir : Path
+
+    private val random = Random(101325)
+    private val keyValuePair = newEntry(random)
+    private val serverPath = "gbcs"
+
+    override fun setUp() {
+        this.cacheDir = testDir.resolve("cache")
+        val readersGroup = Configuration.Group("readers", setOf(Role.Reader))
+        val writersGroup = Configuration.Group("writers", setOf(Role.Writer))
+        cfg = Configuration(
+            "127.0.0.1",
+            NetworkUtils.getFreePort(),
+            serverPath,
+            listOf(
                 Configuration.User("user1", hashPassword(PASSWORD), setOf(readersGroup)),
                 Configuration.User("user2", hashPassword(PASSWORD), setOf(writersGroup)),
-        Configuration.User("user3", hashPassword(PASSWORD), setOf(readersGroup, writersGroup)),
-        Configuration.User("", null, setOf(readersGroup))
+                Configuration.User("user3", hashPassword(PASSWORD), setOf(readersGroup, writersGroup))
+            ).asSequence().map { it.name to it}.toMap(),
+            sequenceOf(writersGroup, readersGroup).map { it.name to it}.toMap(),
+            FileSystemCacheConfiguration(this.cacheDir,
+                maxAge = Duration.ofSeconds(3600 * 24),
+                digestAlgorithm = "MD5",
+                compressionLevel = Deflater.DEFAULT_COMPRESSION,
+                compressionEnabled = false
+            ),
+            Configuration.BasicAuthentication(),
+            null,
+            true,
         )
+        Xml.write(Serializer.serialize(cfg), System.out)
+    }
+
+    override fun tearDown() {
+    }
+
+    fun buildAuthorizationHeader(user : Configuration.User, password : String) : String {
+        val b64 = Base64.getEncoder().encode("${user.name}:${password}".toByteArray(Charsets.UTF_8)).let{
+            String(it, StandardCharsets.UTF_8)
+        }
+        return "Basic $b64"
+    }
+
+    fun newRequestBuilder(key : String) = HttpRequest.newBuilder()
+        .uri(URI.create("http://${cfg.host}:${cfg.port}/$serverPath/$key"))
+
+
+    fun newEntry(random : Random) : Pair<String, ByteArray> {
+        val key = ByteArray(0x10).let {
+            random.nextBytes(it)
+            Base64.getUrlEncoder().encodeToString(it)
+        }
+        val value = ByteArray(0x1000).also {
+            random.nextBytes(it)
+        }
+        return key to value
+    }
 
     @Test
     @Order(1)
@@ -36,7 +100,7 @@ class BasicAuthServerTest : AbstractBasicAuthServerTest() {
             .PUT(HttpRequest.BodyPublishers.ofByteArray(value))
 
         val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
-        Assertions.assertEquals(HttpResponseStatus.FORBIDDEN.code(), response.statusCode())
+        Assertions.assertEquals(HttpResponseStatus.UNAUTHORIZED.code(), response.statusCode())
     }
 
     @Test
@@ -115,20 +179,6 @@ class BasicAuthServerTest : AbstractBasicAuthServerTest() {
 
     @Test
     @Order(6)
-    fun getAsAnonymousUser() {
-        val client: HttpClient = HttpClient.newHttpClient()
-        val (key, value) = keyValuePair
-
-        val requestBuilder = newRequestBuilder(key)
-            .GET()
-
-        val response: HttpResponse<ByteArray> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray())
-        Assertions.assertEquals(HttpResponseStatus.OK.code(), response.statusCode())
-        Assertions.assertArrayEquals(value, response.body())
-    }
-
-    @Test
-    @Order(7)
     fun getMissingKeyAsAReaderUser() {
         val client: HttpClient = HttpClient.newHttpClient()
 

src/test/kotlin/net/woggioni/gbcs/test/ConfigurationTest.kt

@@ -1,7 +1,7 @@
 package net.woggioni.gbcs.test
 
-import net.woggioni.gbcs.base.GBCS.toUrl
 import net.woggioni.gbcs.base.GbcsUrlStreamHandlerFactory
+import net.woggioni.gbcs.base.GBCS.toUrl
 import net.woggioni.gbcs.base.Xml
 import net.woggioni.gbcs.configuration.Parser
 import net.woggioni.gbcs.configuration.Serializer
@@ -18,7 +18,6 @@ class ConfigurationTest {
         strings = [
             "classpath:net/woggioni/gbcs/test/gbcs-default.xml",
             "classpath:net/woggioni/gbcs/test/gbcs-memcached.xml",
-            "classpath:net/woggioni/gbcs/test/gbcs-tls.xml",
         ]
     )
     @ParameterizedTest

src/test/kotlin/net/woggioni/gbcs/test/NoAnonymousUserBasicAuthServerTest.kt

@@ -1,52 +0,0 @@
-package net.woggioni.gbcs.test
-
-import io.netty.handler.codec.http.HttpResponseStatus
-import net.woggioni.gbcs.api.Configuration
-import net.woggioni.gbcs.base.PasswordSecurity.hashPassword
-import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.Order
-import org.junit.jupiter.api.Test
-import java.net.http.HttpClient
-import java.net.http.HttpRequest
-import java.net.http.HttpResponse
-
-
-class NoAnonymousUserBasicAuthServerTest : AbstractBasicAuthServerTest() {
-
-    companion object {
-        private const val PASSWORD = "anotherPassword"
-    }
-
-    override val users = listOf(
-        Configuration.User("user1", hashPassword(PASSWORD), setOf(readersGroup)),
-        Configuration.User("user2", hashPassword(PASSWORD), setOf(writersGroup)),
-        Configuration.User("user3", hashPassword(PASSWORD), setOf(readersGroup, writersGroup)),
-    )
-
-    @Test
-    @Order(1)
-    fun putWithNoAuthorizationHeader() {
-        val client: HttpClient = HttpClient.newHttpClient()
-        val (key, value) = keyValuePair
-
-        val requestBuilder = newRequestBuilder(key)
-            .header("Content-Type", "application/octet-stream")
-            .PUT(HttpRequest.BodyPublishers.ofByteArray(value))
-
-        val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
-        Assertions.assertEquals(HttpResponseStatus.UNAUTHORIZED.code(), response.statusCode())
-    }
-
-    @Test
-    @Order(2)
-    fun getWithNoAuthorizationHeader() {
-        val client: HttpClient = HttpClient.newHttpClient()
-        val (key, value) = keyValuePair
-
-        val requestBuilder = newRequestBuilder(key)
-            .GET()
-
-        val response: HttpResponse<ByteArray> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray())
-        Assertions.assertEquals(HttpResponseStatus.UNAUTHORIZED.code(), response.statusCode())
-    }
-}

src/test/kotlin/net/woggioni/gbcs/test/NoAnonymousUserTlsServerTest.kt

@@ -1,47 +0,0 @@
-package net.woggioni.gbcs.test
-
-import io.netty.handler.codec.http.HttpResponseStatus
-import net.woggioni.gbcs.api.Configuration
-import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.Order
-import org.junit.jupiter.api.Test
-import java.net.http.HttpClient
-import java.net.http.HttpRequest
-import java.net.http.HttpResponse
-
-class NoAnonymousUserTlsServerTest : AbstractTlsServerTest() {
-
-    override val users = listOf(
-        Configuration.User("user1", null, setOf(readersGroup)),
-        Configuration.User("user2", null, setOf(writersGroup)),
-        Configuration.User("user3", null, setOf(readersGroup, writersGroup)),
-    )
-
-    @Test
-    @Order(1)
-    fun getAsAnonymousUser() {
-        val (key, _) = keyValuePair
-        val client: HttpClient = getHttpClient(null)
-
-        val requestBuilder = newRequestBuilder(key)
-            .header("Content-Type", "application/octet-stream")
-            .GET()
-
-        val response: HttpResponse<ByteArray> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray())
-        Assertions.assertEquals(HttpResponseStatus.UNAUTHORIZED.code(), response.statusCode())
-    }
-
-    @Test
-    @Order(2)
-    fun putAsAnonymousUser() {
-        val (key, value) = keyValuePair
-        val client: HttpClient = getHttpClient(null)
-
-        val requestBuilder = newRequestBuilder(key)
-            .header("Content-Type", "application/octet-stream")
-            .PUT(HttpRequest.BodyPublishers.ofByteArray(value))
-
-        val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
-        Assertions.assertEquals(HttpResponseStatus.UNAUTHORIZED.code(), response.statusCode())
-    }
-}

src/test/kotlin/net/woggioni/gbcs/test/NoAuthServerTest.kt

@@ -1,14 +1,15 @@
 package net.woggioni.gbcs.test
 
 import io.netty.handler.codec.http.HttpResponseStatus
-import net.woggioni.gbcs.api.Configuration
 import net.woggioni.gbcs.base.Xml
+import net.woggioni.gbcs.api.Configuration
 import net.woggioni.gbcs.cache.FileSystemCacheConfiguration
 import net.woggioni.gbcs.configuration.Serializer
 import net.woggioni.gbcs.utils.NetworkUtils
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Order
 import org.junit.jupiter.api.Test
+import java.net.ServerSocket
 import java.net.URI
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
@@ -104,28 +105,4 @@ class NoAuthServerTest : AbstractServerTest() {
         val response: HttpResponse<ByteArray> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray())
         Assertions.assertEquals(HttpResponseStatus.NOT_FOUND.code(), response.statusCode())
     }
-
-//    @Test
-//    @Order(4)
-//    fun manyRequestsTest() {
-//        val client: HttpClient = HttpClient.newHttpClient()
-//
-//        for(i in 0 until 100000) {
-//
-//            val newEntry = random.nextBoolean()
-//            val (key, _) = if(newEntry) {
-//                newEntry(random)
-//            } else {
-//                keyValuePair
-//            }
-//            val requestBuilder = newRequestBuilder(key).GET()
-//
-//            val response: HttpResponse<ByteArray> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray())
-//            if(newEntry) {
-//                Assertions.assertEquals(HttpResponseStatus.NOT_FOUND.code(), response.statusCode())
-//            } else {
-//                Assertions.assertEquals(HttpResponseStatus.OK.code(), response.statusCode())
-//            }
-//        }
-//    }
 }

src/test/kotlin/net/woggioni/gbcs/test/TlsServerTest.kt

@@ -3,26 +3,214 @@ package net.woggioni.gbcs.test
 import io.netty.handler.codec.http.HttpResponseStatus
 import net.woggioni.gbcs.api.Configuration
 import net.woggioni.gbcs.api.Role
+import net.woggioni.gbcs.base.Xml
+import net.woggioni.gbcs.cache.FileSystemCacheConfiguration
+import net.woggioni.gbcs.configuration.Serializer
+import net.woggioni.gbcs.utils.CertificateUtils
+import net.woggioni.gbcs.utils.CertificateUtils.X509Credentials
+import net.woggioni.gbcs.utils.NetworkUtils
 import org.bouncycastle.asn1.x500.X500Name
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Order
 import org.junit.jupiter.api.Test
+import java.net.ServerSocket
+import java.net.URI
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
+import java.nio.charset.StandardCharsets
+import java.nio.file.Files
+import java.nio.file.Path
+import java.security.KeyStore
+import java.security.KeyStore.PasswordProtection
+import java.time.Duration
+import java.util.Base64
+import java.util.zip.Deflater
+import javax.net.ssl.KeyManagerFactory
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManagerFactory
+import kotlin.random.Random
 
 
-class TlsServerTest : AbstractTlsServerTest() {
+class TlsServerTest : AbstractServerTest() {
 
-    override val users = listOf(
+    companion object {
+        private const val CA_CERTIFICATE_ENTRY = "gbcs-ca"
+        private const val CLIENT_CERTIFICATE_ENTRY = "gbcs-client"
+        private const val SERVER_CERTIFICATE_ENTRY = "gbcs-server"
+        private const val PASSWORD = "password"
+    }
+
+    private lateinit var cacheDir: Path
+    private lateinit var serverKeyStoreFile: Path
+    private lateinit var clientKeyStoreFile: Path
+    private lateinit var trustStoreFile: Path
+    private lateinit var serverKeyStore: KeyStore
+    private lateinit var clientKeyStore: KeyStore
+    private lateinit var trustStore: KeyStore
+    private lateinit var ca: X509Credentials
+
+    private val readersGroup = Configuration.Group("readers", setOf(Role.Reader))
+    private val writersGroup = Configuration.Group("writers", setOf(Role.Writer))
+    private val random = Random(101325)
+    private val keyValuePair = newEntry(random)
+    private val serverPath : String? = null
+
+    private val users = listOf(
         Configuration.User("user1", null, setOf(readersGroup)),
         Configuration.User("user2", null, setOf(writersGroup)),
-        Configuration.User("user3", null, setOf(readersGroup, writersGroup)),
-        Configuration.User("", null, setOf(readersGroup))
+        Configuration.User("user3", null, setOf(readersGroup, writersGroup))
     )
 
+    fun createKeyStoreAndTrustStore() {
+        ca = CertificateUtils.createCertificateAuthority(CA_CERTIFICATE_ENTRY, 30)
+        val serverCert = CertificateUtils.createServerCertificate(ca, X500Name("CN=$SERVER_CERTIFICATE_ENTRY"), 30)
+        val clientCert = CertificateUtils.createClientCertificate(ca, X500Name("CN=$CLIENT_CERTIFICATE_ENTRY"), 30)
+
+        serverKeyStore = KeyStore.getInstance("PKCS12").apply {
+            load(null, null)
+            setEntry(CA_CERTIFICATE_ENTRY, KeyStore.TrustedCertificateEntry(ca.certificate), PasswordProtection(null))
+            setEntry(
+                SERVER_CERTIFICATE_ENTRY,
+                KeyStore.PrivateKeyEntry(
+                    serverCert.keyPair().private,
+                    arrayOf(serverCert.certificate(), ca.certificate)
+                ),
+                PasswordProtection(PASSWORD.toCharArray())
+            )
+        }
+        Files.newOutputStream(this.serverKeyStoreFile).use {
+            serverKeyStore.store(it, null)
+        }
+
+        clientKeyStore = KeyStore.getInstance("PKCS12").apply {
+            load(null, null)
+            setEntry(CA_CERTIFICATE_ENTRY, KeyStore.TrustedCertificateEntry(ca.certificate), PasswordProtection(null))
+            setEntry(
+                CLIENT_CERTIFICATE_ENTRY,
+                KeyStore.PrivateKeyEntry(
+                    clientCert.keyPair().private,
+                    arrayOf(clientCert.certificate(), ca.certificate)
+                ),
+                PasswordProtection(PASSWORD.toCharArray())
+            )
+        }
+        Files.newOutputStream(this.clientKeyStoreFile).use {
+            clientKeyStore.store(it, null)
+        }
+
+        trustStore = KeyStore.getInstance("PKCS12").apply {
+            load(null, null)
+            setEntry(CA_CERTIFICATE_ENTRY, KeyStore.TrustedCertificateEntry(ca.certificate), PasswordProtection(null))
+        }
+        Files.newOutputStream(this.trustStoreFile).use {
+            trustStore.store(it, null)
+        }
+    }
+
+    fun getClientKeyStore(ca: X509Credentials, subject: X500Name) = KeyStore.getInstance("PKCS12").apply {
+        val clientCert = CertificateUtils.createClientCertificate(ca, subject, 30)
+
+        load(null, null)
+        setEntry(CA_CERTIFICATE_ENTRY, KeyStore.TrustedCertificateEntry(ca.certificate), PasswordProtection(null))
+        setEntry(
+            CLIENT_CERTIFICATE_ENTRY,
+            KeyStore.PrivateKeyEntry(clientCert.keyPair().private, arrayOf(clientCert.certificate(), ca.certificate)),
+            PasswordProtection(PASSWORD.toCharArray())
+        )
+    }
+
+    fun getHttpClient(clientKeyStore: KeyStore?): HttpClient {
+        val kmf = clientKeyStore?.let {
+            KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()).apply {
+                init(it, PASSWORD.toCharArray())
+            }
+        }
+
+
+        // Set up trust manager factory with the truststore
+        val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
+        tmf.init(trustStore)
+
+        // Create SSL context with the key and trust managers
+        val sslContext = SSLContext.getInstance("TLS").apply {
+            init(kmf?.keyManagers ?: emptyArray(), tmf.trustManagers, null)
+        }
+        return HttpClient.newBuilder().sslContext(sslContext).build()
+    }
+
+    override fun setUp() {
+        this.clientKeyStoreFile = testDir.resolve("client-keystore.p12")
+        this.serverKeyStoreFile = testDir.resolve("server-keystore.p12")
+        this.trustStoreFile = testDir.resolve("truststore.p12")
+        this.cacheDir = testDir.resolve("cache")
+        createKeyStoreAndTrustStore()
+        cfg = Configuration(
+            "127.0.0.1",
+            NetworkUtils.getFreePort(),
+            serverPath,
+            users.asSequence().map { it.name to it }.toMap(),
+            sequenceOf(writersGroup, readersGroup).map { it.name to it }.toMap(),
+            FileSystemCacheConfiguration(this.cacheDir,
+                maxAge = Duration.ofSeconds(3600 * 24),
+                compressionEnabled = true,
+                compressionLevel = Deflater.DEFAULT_COMPRESSION,
+                digestAlgorithm = "MD5"
+            ),
+            Configuration.ClientCertificateAuthentication(
+                Configuration.TlsCertificateExtractor("CN", "(.*)"),
+                null
+            ),
+            Configuration.Tls(
+                Configuration.KeyStore(this.serverKeyStoreFile, null, SERVER_CERTIFICATE_ENTRY, PASSWORD),
+                Configuration.TrustStore(this.trustStoreFile, null, false),
+                true
+            ),
+            false,
+        )
+        Xml.write(Serializer.serialize(cfg), System.out)
+    }
+
+    override fun tearDown() {
+    }
+
+    fun newRequestBuilder(key: String) = HttpRequest.newBuilder()
+        .uri(URI.create("https://${cfg.host}:${cfg.port}/${serverPath ?: ""}/$key"))
+
+    fun buildAuthorizationHeader(user: Configuration.User, password: String): String {
+        val b64 = Base64.getEncoder().encode("${user.name}:${password}".toByteArray(Charsets.UTF_8)).let {
+            String(it, StandardCharsets.UTF_8)
+        }
+        return "Basic $b64"
+    }
+
+    fun newEntry(random: Random): Pair<String, ByteArray> {
+        val key = ByteArray(0x10).let {
+            random.nextBytes(it)
+            Base64.getUrlEncoder().encodeToString(it)
+        }
+        val value = ByteArray(0x1000).also {
+            random.nextBytes(it)
+        }
+        return key to value
+    }
+
     @Test
     @Order(1)
+    fun putWithNoClientCertificate() {
+        val client: HttpClient = getHttpClient(null)
+        val (key, value) = keyValuePair
+
+        val requestBuilder = newRequestBuilder(key)
+            .header("Content-Type", "application/octet-stream")
+            .PUT(HttpRequest.BodyPublishers.ofByteArray(value))
+
+        val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
+        Assertions.assertEquals(HttpResponseStatus.UNAUTHORIZED.code(), response.statusCode())
+    }
+
+    @Test
+    @Order(2)
     fun putAsAReaderUser() {
         val (key, value) = keyValuePair
         val user = cfg.users.values.find {
@@ -38,8 +226,9 @@ class TlsServerTest : AbstractTlsServerTest() {
     }
 
     @Test
-    @Order(2)
+    @Order(3)
     fun getAsAWriterUser() {
+
         val (key, _) = keyValuePair
         val user = cfg.users.values.find {
             Role.Writer in it.roles
@@ -47,6 +236,7 @@ class TlsServerTest : AbstractTlsServerTest() {
         val client: HttpClient = getHttpClient(getClientKeyStore(ca, X500Name("CN=${user.name}")))
 
         val requestBuilder = newRequestBuilder(key)
+            .header("Authorization", buildAuthorizationHeader(user, PASSWORD))
             .GET()
 
         val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
@@ -54,8 +244,9 @@ class TlsServerTest : AbstractTlsServerTest() {
     }
 
     @Test
-    @Order(3)
+    @Order(4)
     fun putAsAWriterUser() {
+
         val (key, value) = keyValuePair
         val user = cfg.users.values.find {
             Role.Writer in it.roles
@@ -64,6 +255,7 @@ class TlsServerTest : AbstractTlsServerTest() {
 
         val requestBuilder = newRequestBuilder(key)
             .header("Content-Type", "application/octet-stream")
+            .header("Authorization", buildAuthorizationHeader(user, PASSWORD))
             .PUT(HttpRequest.BodyPublishers.ofByteArray(value))
 
         val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
@@ -71,7 +263,7 @@ class TlsServerTest : AbstractTlsServerTest() {
     }
 
     @Test
-    @Order(4)
+    @Order(5)
     fun getAsAReaderUser() {
         val (key, value) = keyValuePair
         val user = cfg.users.values.find {
@@ -80,6 +272,7 @@ class TlsServerTest : AbstractTlsServerTest() {
         val client: HttpClient = getHttpClient(getClientKeyStore(ca, X500Name("CN=${user.name}")))
 
         val requestBuilder = newRequestBuilder(key)
+            .header("Authorization", buildAuthorizationHeader(user, PASSWORD))
             .GET()
 
         val response: HttpResponse<ByteArray> =
@@ -89,7 +282,7 @@ class TlsServerTest : AbstractTlsServerTest() {
     }
 
     @Test
-    @Order(5)
+    @Order(6)
     fun getMissingKeyAsAReaderUser() {
         val (key, _) = newEntry(random)
         val user = cfg.users.values.find {
@@ -98,39 +291,11 @@ class TlsServerTest : AbstractTlsServerTest() {
         val client: HttpClient = getHttpClient(getClientKeyStore(ca, X500Name("CN=${user.name}")))
 
         val requestBuilder = newRequestBuilder(key)
+            .header("Authorization", buildAuthorizationHeader(user, PASSWORD))
             .GET()
 
         val response: HttpResponse<ByteArray> =
             client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray())
         Assertions.assertEquals(HttpResponseStatus.NOT_FOUND.code(), response.statusCode())
     }
-
-    @Test
-    @Order(6)
-    fun getAsAnonymousUser() {
-        val (key, value) = keyValuePair
-        val client: HttpClient = getHttpClient(null)
-
-        val requestBuilder = newRequestBuilder(key)
-            .header("Content-Type", "application/octet-stream")
-            .GET()
-
-        val response: HttpResponse<ByteArray> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray())
-        Assertions.assertEquals(HttpResponseStatus.OK.code(), response.statusCode())
-        Assertions.assertArrayEquals(value, response.body())
-    }
-
-    @Test
-    @Order(7)
-    fun putAsAnonymousUser() {
-        val (key, value) = keyValuePair
-        val client: HttpClient = getHttpClient(null)
-
-        val requestBuilder = newRequestBuilder(key)
-            .header("Content-Type", "application/octet-stream")
-            .PUT(HttpRequest.BodyPublishers.ofByteArray(value))
-
-        val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
-        Assertions.assertEquals(HttpResponseStatus.FORBIDDEN.code(), response.statusCode())
-    }
 }

src/test/resources/logback.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration>
-
-<configuration>
-    <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
-    <import class="ch.qos.logback.core.ConsoleAppender"/>
-
-    <appender name="console" class="ConsoleAppender">
-        <target>System.err</target>
-        <encoder class="PatternLayoutEncoder">
-            <pattern>%d [%highlight(%-5level)] \(%thread\) %logger{36} -%kvp- %msg %n</pattern>
-        </encoder>
-    </appender>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-    <logger name="io.netty" level="debug"/>
-    <logger name="com.google.code.yanf4j" level="warn"/>
-    <logger name="net.rubyeye.xmemcached" level="warn"/>
-</configuration>

src/test/resources/net/woggioni/gbcs/test/gbcs-memcached.xml

@@ -4,7 +4,7 @@
              xmlns:gbcs-memcached="urn:net.woggioni.gbcs-memcached"
              xs:schemaLocation="urn:net.woggioni.gbcs-memcached jpms://net.woggioni.gbcs.memcached/net/woggioni/gbcs/memcached/schema/gbcs-memcached.xsd urn:net.woggioni.gbcs jpms://net.woggioni.gbcs/net/woggioni/gbcs/schema/gbcs.xsd">
     <bind host="127.0.0.1" port="11443" />
-    <cache xs:type="gbcs-memcached:memcachedCacheType" max-age="P7D" max-size="101325" digest="SHA-256">
+    <cache xs:type="gbcs-memcached:memcachedCacheType" max-age="P7D" max-size="101325" compression-mode="gzip" digest="SHA-256">
         <server host="127.0.0.1" port="11211"/>
     </cache>
     <authentication>

src/test/resources/net/woggioni/gbcs/test/gbcs-tls.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gbcs:server useVirtualThreads="false" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-             xmlns:gbcs="urn:net.woggioni.gbcs"
-             xs:schemaLocation="urn:net.woggioni.gbcs jpms://net.woggioni.gbcs/net/woggioni/gbcs/schema/gbcs.xsd">
-    <bind host="127.0.0.1" port="11443"/>
-    <cache xs:type="gbcs:fileSystemCacheType" path="/tmp/gbcs" max-age="P7D"/>
-    <authorization>
-        <users>
-            <user name="user1" password="password1"/>
-            <user name="user2" password="password2"/>
-            <user name="user3" password="password3"/>
-        </users>
-        <groups>
-            <group name="readers">
-                <users>
-                    <user ref="user1"/>
-<!--                    <user ref="user5"/>-->
-                    <anonymous/>
-                </users>
-                <roles>
-                    <reader/>
-                </roles>
-            </group>
-            <group name="writers">
-                <users>
-                    <user ref="user2"/>
-                </users>
-                <roles>
-                    <writer/>
-                </roles>
-            </group>
-            <group name="readers-writers">
-                <users>
-                    <user ref="user3"/>
-                </users>
-                <roles>
-                    <reader/>
-                    <writer/>
-                </roles>
-            </group>
-        </groups>
-    </authorization>
-    <authentication>
-        <client-certificate>
-            <group-extractor pattern="group-pattern" attribute-name="O"/>
-            <user-extractor pattern="user-pattern" attribute-name="CN"/>
-        </client-certificate>
-    </authentication>
-    <tls>
-        <keystore file="keystore.pfx" key-alias="key1" password="password" key-password="key-password"/>
-        <truststore file="truststore.pfx" password="password" check-certificate-status="true" />
-    </tls>
-</gbcs:server>