Compare commits
15 Commits
688a196a52
...
0.0.6
Author | SHA1 | Date | |
---|---|---|---|
3b7030c302
|
|||
a8670277e7
|
|||
03ee75266d
|
|||
05a265e4b4
|
|||
5af99330f8
|
|||
747168cda3
|
|||
225f156864
|
|||
696cb74740
|
|||
59f267426c
|
|||
608a9d18de
|
|||
d2c00402df
|
|||
d701157b06
|
|||
01d5b1462c
|
|||
d5a2c4a591
|
|||
0fdb37fb54
|
@@ -9,9 +9,61 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
- name: Setup Java
|
||||||
|
uses: actions/setup-java@v4
|
||||||
|
with:
|
||||||
|
distribution: graalvm
|
||||||
|
java-version: 21
|
||||||
- name: Setup Gradle
|
- name: Setup Gradle
|
||||||
uses: gradle/actions/setup-gradle@v3
|
uses: gradle/actions/setup-gradle@v3
|
||||||
- name: Execute Gradle build
|
- 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
|
||||||
|
with:
|
||||||
|
driver: docker-container
|
||||||
|
- 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
|
||||||
|
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
|
||||||
|
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:
|
env:
|
||||||
PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}
|
PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}
|
||||||
run: ./gradlew build publish
|
run: ./gradlew publish
|
||||||
|
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@@ -3,3 +3,5 @@
|
|||||||
|
|
||||||
# Ignore Gradle build output directory
|
# Ignore Gradle build output directory
|
||||||
build
|
build
|
||||||
|
|
||||||
|
gbcs-cli/native-image/*.json
|
||||||
|
2
Dockerfile
Normal file
2
Dockerfile
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
FROM gitea.woggioni.net/woggioni/gbcs:memcached
|
||||||
|
COPY --chown=luser:luser conf/gbcs-memcached.xml /home/luser/.config/gbcs/gbcs.xml
|
135
build.gradle
135
build.gradle
@@ -1,91 +1,88 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
alias catalog.plugins.kotlin.jvm
|
alias catalog.plugins.kotlin.jvm
|
||||||
alias catalog.plugins.envelope
|
|
||||||
alias catalog.plugins.sambal
|
alias catalog.plugins.sambal
|
||||||
|
alias catalog.plugins.lombok
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
}
|
}
|
||||||
|
|
||||||
import net.woggioni.gradle.envelope.EnvelopeJarTask
|
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
|
||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
|
|
||||||
group = 'net.woggioni'
|
allprojects { subproject ->
|
||||||
|
group = 'net.woggioni'
|
||||||
|
|
||||||
version = project.currentTag ?: "${getProperty('gbcs.version')}.${project.gitRevision[0..10]}"
|
if(project.currentTag.isPresent()) {
|
||||||
|
version = project.currentTag.map { it[0] }.get()
|
||||||
|
} else {
|
||||||
|
version = project.gitRevision.map { gitRevision ->
|
||||||
|
"${getProperty('gbcs.version')}.${gitRevision[0..10]}"
|
||||||
|
}.get()
|
||||||
|
}
|
||||||
|
|
||||||
envelopeJar {
|
repositories {
|
||||||
mainModule = 'net.woggioni.gbcs'
|
|
||||||
mainClass = 'net.woggioni.gbcs.GradleBuildCacheServer'
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
maven {
|
maven {
|
||||||
url = getProperty('gitea.maven.url')
|
url = getProperty('gitea.maven.url')
|
||||||
content {
|
content {
|
||||||
includeModule 'net.woggioni', 'jwo'
|
includeModule 'net.woggioni', 'jwo'
|
||||||
|
includeModule 'net.woggioni', 'xmemcached'
|
||||||
includeGroup 'com.lys'
|
includeGroup 'com.lys'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
pluginManager.withPlugin('java-library') {
|
||||||
implementation catalog.jwo
|
|
||||||
implementation catalog.slf4j.api
|
|
||||||
implementation catalog.netty.codec.http
|
|
||||||
|
|
||||||
// runtimeOnly catalog.slf4j.jdk14
|
ext {
|
||||||
runtimeOnly catalog.logback.classic
|
jpmsModuleName = subproject.group + '.' + subproject.name.replace('-', '.')
|
||||||
|
}
|
||||||
|
|
||||||
testImplementation catalog.bcprov.jdk18on
|
java {
|
||||||
testImplementation catalog.bcpkix.jdk18on
|
|
||||||
testImplementation catalog.junit.jupiter.api
|
|
||||||
testImplementation catalog.junit.jupiter.params
|
|
||||||
testRuntimeOnly catalog.junit.jupiter.engine
|
|
||||||
}
|
|
||||||
|
|
||||||
java {
|
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
modularity.inferModulePath = true
|
modularity.inferModulePath = true
|
||||||
toolchain {
|
toolchain {
|
||||||
languageVersion = JavaLanguageVersion.of(21)
|
languageVersion = JavaLanguageVersion.of(21)
|
||||||
|
vendor = JvmVendorSpec.ORACLE
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
|
tasks.withType(JavaCompile) {
|
||||||
options.compilerArgs << '--patch-module' << 'net.woggioni.gbcs=' + project.sourceSets.main.output.asPath
|
|
||||||
options.javaModuleVersion = provider { version }
|
|
||||||
options.javaModuleMainClass = envelopeJar.mainClass
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile) {
|
|
||||||
modularity.inferModulePath = true
|
modularity.inferModulePath = true
|
||||||
options.release = 21
|
options.release = 21
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
|
||||||
|
options.compilerArgumentProviders << new CommandLineArgumentProvider() {
|
||||||
|
@Override
|
||||||
|
Iterable<String> asArguments() {
|
||||||
|
return ['--patch-module', subproject.jpmsModuleName + '=' + subproject.sourceSets.main.output.asPath]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
options.javaModuleVersion = version
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tasks.named("compileKotlin", KotlinCompile.class) {
|
pluginManager.withPlugin(catalog.plugins.kotlin.jvm.get().pluginId) {
|
||||||
|
tasks.withType(KotlinCompile.class) {
|
||||||
compilerOptions.jvmTarget = JvmTarget.JVM_21
|
compilerOptions.jvmTarget = JvmTarget.JVM_21
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Provider<EnvelopeJarTask> envelopeJarTaskProvider = tasks.named('envelopeJar', EnvelopeJarTask.class) {
|
pluginManager.withPlugin(catalog.plugins.lombok.get().pluginId) {
|
||||||
// systemProperties['java.util.logging.config.class'] = 'net.woggioni.gbcs.LoggingConfig'
|
lombok {
|
||||||
// systemProperties['log.config.source'] = 'logging.properties'
|
version = catalog.versions.lombok
|
||||||
systemProperties['logback.configurationFile'] = 'classpath:logback.xml'
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pluginManager.withPlugin('maven-publish') {
|
||||||
|
|
||||||
def envelopeJarArtifact = artifacts.add('archives', envelopeJarTaskProvider.get().archiveFile.get().asFile) {
|
publishing {
|
||||||
type = 'jar'
|
|
||||||
builtBy envelopeJarTaskProvider
|
|
||||||
}
|
|
||||||
|
|
||||||
publishing {
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
name = "Gitea"
|
name = "Gitea"
|
||||||
@@ -101,9 +98,41 @@ publishing {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
publications {
|
|
||||||
maven(MavenPublication) {
|
|
||||||
artifact envelopeJarArtifact
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation catalog.jwo
|
||||||
|
implementation catalog.slf4j.api
|
||||||
|
implementation catalog.netty.codec.http
|
||||||
|
|
||||||
|
api project('gbcs-base')
|
||||||
|
api project('gbcs-api')
|
||||||
|
|
||||||
|
// runtimeOnly catalog.slf4j.jdk14
|
||||||
|
testRuntimeOnly catalog.logback.classic
|
||||||
|
|
||||||
|
testImplementation catalog.bcprov.jdk18on
|
||||||
|
testImplementation catalog.bcpkix.jdk18on
|
||||||
|
testImplementation catalog.junit.jupiter.api
|
||||||
|
testImplementation catalog.junit.jupiter.params
|
||||||
|
testRuntimeOnly catalog.junit.jupiter.engine
|
||||||
|
|
||||||
|
testRuntimeOnly project("gbcs-memcached")
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
maven(MavenPublication) {
|
||||||
|
from(components["java"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.register('version') {
|
||||||
|
doLast {
|
||||||
|
println("VERSION=$version")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
13
conf/gbcs-memcached.xml
Normal file
13
conf/gbcs-memcached.xml
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
|
<gbcs:server useVirtualThreads="true" 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">
|
||||||
|
<bind host="0.0.0.0" port="13080" />
|
||||||
|
<cache xs:type="gbcs-memcached:memcachedCacheType" max-age="P7D" max-size="16777216" compression-mode="zip">
|
||||||
|
<server host="memcached" port="11211"/>
|
||||||
|
</cache>
|
||||||
|
<authentication>
|
||||||
|
<none/>
|
||||||
|
</authentication>
|
||||||
|
</gbcs:server>
|
21
conf/logback.xml
Normal file
21
conf/logback.xml
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
<?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>
|
36
docker-compose.yml
Normal file
36
docker-compose.yml
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
networks:
|
||||||
|
default:
|
||||||
|
external: false
|
||||||
|
ipam:
|
||||||
|
driver: default
|
||||||
|
config:
|
||||||
|
- subnet: 172.118.0.0/16
|
||||||
|
ip_range: 172.118.0.0/16
|
||||||
|
gateway: 172.118.0.254
|
||||||
|
services:
|
||||||
|
gbcs:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
container_name: gbcs
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:8080:13080"
|
||||||
|
- "[::1]:8080:13080"
|
||||||
|
depends_on:
|
||||||
|
memcached:
|
||||||
|
condition: service_started
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: "2.00"
|
||||||
|
memory: 256M
|
||||||
|
memcached:
|
||||||
|
image: memcached
|
||||||
|
container_name: memcached
|
||||||
|
restart: unless-stopped
|
||||||
|
command: -I 64m -m 900m
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: "1.00"
|
||||||
|
memory: 1G
|
21
docker/Dockerfile
Normal file
21
docker/Dockerfile
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
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
|
67
docker/build.gradle
Normal file
67
docker/build.gradle
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
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 }]
|
||||||
|
}
|
||||||
|
|
||||||
|
|
16
gbcs-api/build.gradle
Normal file
16
gbcs-api/build.gradle
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
id 'maven-publish'
|
||||||
|
alias catalog.plugins.lombok
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
maven(MavenPublication) {
|
||||||
|
from(components["java"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
6
gbcs-api/src/main/java/module-info.java
Normal file
6
gbcs-api/src/main/java/module-info.java
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
module net.woggioni.gbcs.api {
|
||||||
|
requires static lombok;
|
||||||
|
requires java.xml;
|
||||||
|
exports net.woggioni.gbcs.api;
|
||||||
|
exports net.woggioni.gbcs.api.exception;
|
||||||
|
}
|
11
gbcs-api/src/main/java/net/woggioni/gbcs/api/Cache.java
Normal file
11
gbcs-api/src/main/java/net/woggioni/gbcs/api/Cache.java
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
package net.woggioni.gbcs.api;
|
||||||
|
|
||||||
|
import net.woggioni.gbcs.api.exception.ContentTooLargeException;
|
||||||
|
|
||||||
|
import java.nio.channels.ReadableByteChannel;
|
||||||
|
|
||||||
|
public interface Cache extends AutoCloseable {
|
||||||
|
ReadableByteChannel get(String key);
|
||||||
|
|
||||||
|
void put(String key, byte[] content) throws ContentTooLargeException;
|
||||||
|
}
|
@@ -0,0 +1,17 @@
|
|||||||
|
package net.woggioni.gbcs.api;
|
||||||
|
|
||||||
|
import org.w3c.dom.Document;
|
||||||
|
import org.w3c.dom.Element;
|
||||||
|
|
||||||
|
public interface CacheProvider<T extends Configuration.Cache> {
|
||||||
|
|
||||||
|
String getXmlSchemaLocation();
|
||||||
|
|
||||||
|
String getXmlNamespace();
|
||||||
|
|
||||||
|
String getXmlType();
|
||||||
|
|
||||||
|
T deserialize(Element parent);
|
||||||
|
|
||||||
|
Element serialize(Document doc, T cache);
|
||||||
|
}
|
124
gbcs-api/src/main/java/net/woggioni/gbcs/api/Configuration.java
Normal file
124
gbcs-api/src/main/java/net/woggioni/gbcs/api/Configuration.java
Normal file
@@ -0,0 +1,124 @@
|
|||||||
|
package net.woggioni.gbcs.api;
|
||||||
|
|
||||||
|
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.Value;
|
||||||
|
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.security.cert.X509Certificate;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@Value
|
||||||
|
public class Configuration {
|
||||||
|
String host;
|
||||||
|
int port;
|
||||||
|
String serverPath;
|
||||||
|
Map<String, User> users;
|
||||||
|
Map<String, Group> groups;
|
||||||
|
Cache cache;
|
||||||
|
Authentication authentication;
|
||||||
|
Tls tls;
|
||||||
|
boolean useVirtualThread;
|
||||||
|
|
||||||
|
@Value
|
||||||
|
public static class Group {
|
||||||
|
@EqualsAndHashCode.Include
|
||||||
|
String name;
|
||||||
|
Set<Role> roles;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Value
|
||||||
|
public static class User {
|
||||||
|
@EqualsAndHashCode.Include
|
||||||
|
String name;
|
||||||
|
String password;
|
||||||
|
Set<Group> groups;
|
||||||
|
|
||||||
|
|
||||||
|
public Set<Role> getRoles() {
|
||||||
|
return groups.stream()
|
||||||
|
.flatMap(group -> group.getRoles().stream())
|
||||||
|
.collect(Collectors.toSet());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
|
public interface UserExtractor {
|
||||||
|
User extract(X509Certificate cert);
|
||||||
|
}
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
|
public interface GroupExtractor {
|
||||||
|
Group extract(X509Certificate cert);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Value
|
||||||
|
public static class Tls {
|
||||||
|
KeyStore keyStore;
|
||||||
|
TrustStore trustStore;
|
||||||
|
boolean verifyClients;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Value
|
||||||
|
public static class KeyStore {
|
||||||
|
Path file;
|
||||||
|
String password;
|
||||||
|
String keyAlias;
|
||||||
|
String keyPassword;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Value
|
||||||
|
public static class TrustStore {
|
||||||
|
Path file;
|
||||||
|
String password;
|
||||||
|
boolean checkCertificateStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Value
|
||||||
|
public static class TlsCertificateExtractor {
|
||||||
|
String rdnType;
|
||||||
|
String pattern;
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface Authentication {}
|
||||||
|
|
||||||
|
public static class BasicAuthentication implements Authentication {}
|
||||||
|
|
||||||
|
@Value
|
||||||
|
public static class ClientCertificateAuthentication implements Authentication {
|
||||||
|
TlsCertificateExtractor userExtractor;
|
||||||
|
TlsCertificateExtractor groupExtractor;
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface Cache {
|
||||||
|
net.woggioni.gbcs.api.Cache materialize();
|
||||||
|
String getNamespaceURI();
|
||||||
|
String getTypeName();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Configuration of(
|
||||||
|
String host,
|
||||||
|
int port,
|
||||||
|
String serverPath,
|
||||||
|
Map<String, User> users,
|
||||||
|
Map<String, Group> groups,
|
||||||
|
Cache cache,
|
||||||
|
Authentication authentication,
|
||||||
|
Tls tls,
|
||||||
|
boolean useVirtualThread
|
||||||
|
) {
|
||||||
|
return new Configuration(
|
||||||
|
host,
|
||||||
|
port,
|
||||||
|
serverPath != null && !serverPath.isEmpty() && !serverPath.equals("/") ? serverPath : null,
|
||||||
|
users,
|
||||||
|
groups,
|
||||||
|
cache,
|
||||||
|
authentication,
|
||||||
|
tls,
|
||||||
|
useVirtualThread
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
5
gbcs-api/src/main/java/net/woggioni/gbcs/api/Role.java
Normal file
5
gbcs-api/src/main/java/net/woggioni/gbcs/api/Role.java
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
package net.woggioni.gbcs.api;
|
||||||
|
|
||||||
|
public enum Role {
|
||||||
|
Reader, Writer
|
||||||
|
}
|
@@ -0,0 +1,7 @@
|
|||||||
|
package net.woggioni.gbcs.api.exception;
|
||||||
|
|
||||||
|
public class ContentTooLargeException extends GbcsException {
|
||||||
|
public ContentTooLargeException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,7 @@
|
|||||||
|
package net.woggioni.gbcs.api.exception;
|
||||||
|
|
||||||
|
public class GbcsException extends RuntimeException {
|
||||||
|
public GbcsException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
}
|
19
gbcs-base/build.gradle
Normal file
19
gbcs-base/build.gradle
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
|
||||||
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
id 'maven-publish'
|
||||||
|
alias catalog.plugins.kotlin.jvm
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compileOnly project(':gbcs-api')
|
||||||
|
compileOnly catalog.slf4j.api
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
maven(MavenPublication) {
|
||||||
|
from(components["java"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
8
gbcs-base/src/main/java/module-info.java
Normal file
8
gbcs-base/src/main/java/module-info.java
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
module net.woggioni.gbcs.base {
|
||||||
|
requires java.xml;
|
||||||
|
requires java.logging;
|
||||||
|
requires org.slf4j;
|
||||||
|
requires kotlin.stdlib;
|
||||||
|
|
||||||
|
exports net.woggioni.gbcs.base;
|
||||||
|
}
|
12
gbcs-base/src/main/kotlin/net/woggioni/gbcs/base/GBCS.kt
Normal file
12
gbcs-base/src/main/kotlin/net/woggioni/gbcs/base/GBCS.kt
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
package net.woggioni.gbcs.base
|
||||||
|
|
||||||
|
import java.net.URI
|
||||||
|
import java.net.URL
|
||||||
|
|
||||||
|
object GBCS {
|
||||||
|
fun String.toUrl() : URL = URL.of(URI(this), null)
|
||||||
|
|
||||||
|
const val GBCS_NAMESPACE_URI: String = "urn:net.woggioni.gbcs"
|
||||||
|
const val GBCS_PREFIX: String = "gbcs"
|
||||||
|
const val XML_SCHEMA_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
}
|
@@ -0,0 +1,108 @@
|
|||||||
|
package net.woggioni.gbcs.base
|
||||||
|
|
||||||
|
import java.io.IOException
|
||||||
|
import java.io.InputStream
|
||||||
|
import java.net.URL
|
||||||
|
import java.net.URLConnection
|
||||||
|
import java.net.URLStreamHandler
|
||||||
|
import java.net.URLStreamHandlerFactory
|
||||||
|
import java.util.Optional
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean
|
||||||
|
import java.util.stream.Collectors
|
||||||
|
|
||||||
|
|
||||||
|
class GbcsUrlStreamHandlerFactory : URLStreamHandlerFactory {
|
||||||
|
|
||||||
|
private class ClasspathHandler(private val classLoader: ClassLoader = GbcsUrlStreamHandlerFactory::class.java.classLoader) :
|
||||||
|
URLStreamHandler() {
|
||||||
|
|
||||||
|
override fun openConnection(u: URL): URLConnection? {
|
||||||
|
return javaClass.module
|
||||||
|
?.takeIf { m: Module -> m.layer != null }
|
||||||
|
?.let {
|
||||||
|
val path = u.path
|
||||||
|
val i = path.lastIndexOf('/')
|
||||||
|
val packageName = path.substring(0, i).replace('/', '.')
|
||||||
|
val modules = packageMap[packageName]!!
|
||||||
|
ClasspathResourceURLConnection(
|
||||||
|
u,
|
||||||
|
modules
|
||||||
|
)
|
||||||
|
}
|
||||||
|
?: classLoader.getResource(u.path)?.let(URL::openConnection)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class JpmsHandler : URLStreamHandler() {
|
||||||
|
|
||||||
|
override fun openConnection(u: URL): URLConnection {
|
||||||
|
val thisModule = javaClass.module
|
||||||
|
val sourceModule = Optional.ofNullable(thisModule)
|
||||||
|
.map { obj: Module -> obj.layer }
|
||||||
|
.flatMap { layer: ModuleLayer ->
|
||||||
|
val moduleName = u.host
|
||||||
|
layer.findModule(moduleName)
|
||||||
|
}.orElse(thisModule)
|
||||||
|
return JpmsResourceURLConnection(u, sourceModule)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class JpmsResourceURLConnection(url: URL, private val module: Module) : URLConnection(url) {
|
||||||
|
override fun connect() {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Throws(IOException::class)
|
||||||
|
override fun getInputStream(): InputStream {
|
||||||
|
return module.getResourceAsStream(getURL().path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun createURLStreamHandler(protocol: String): URLStreamHandler? {
|
||||||
|
return when (protocol) {
|
||||||
|
"classpath" -> ClasspathHandler()
|
||||||
|
"jpms" -> JpmsHandler()
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ClasspathResourceURLConnection(url: URL?, private val modules: List<Module>) :
|
||||||
|
URLConnection(url) {
|
||||||
|
override fun connect() {}
|
||||||
|
|
||||||
|
override fun getInputStream(): InputStream? {
|
||||||
|
for (module in modules) {
|
||||||
|
val result = module.getResourceAsStream(getURL().path)
|
||||||
|
if (result != null) return result
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private val installed = AtomicBoolean(false)
|
||||||
|
fun install() {
|
||||||
|
if (!installed.getAndSet(true)) {
|
||||||
|
URL.setURLStreamHandlerFactory(GbcsUrlStreamHandlerFactory())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private val packageMap: Map<String, List<Module>> by lazy {
|
||||||
|
GbcsUrlStreamHandlerFactory::class.java.module.layer
|
||||||
|
.modules()
|
||||||
|
.stream()
|
||||||
|
.flatMap { m: Module ->
|
||||||
|
m.packages.stream()
|
||||||
|
.map { p: String -> p to m }
|
||||||
|
}
|
||||||
|
.collect(
|
||||||
|
Collectors.groupingBy(
|
||||||
|
Pair<String, Module>::first,
|
||||||
|
Collectors.mapping(
|
||||||
|
Pair<String, Module>::second,
|
||||||
|
Collectors.toUnmodifiableList<Module>()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,8 @@
|
|||||||
|
package net.woggioni.gbcs.base
|
||||||
|
|
||||||
|
|
||||||
|
data class HostAndPort(val host: String, val port: Int = 0) {
|
||||||
|
override fun toString(): String {
|
||||||
|
return "$host:$port"
|
||||||
|
}
|
||||||
|
}
|
111
gbcs-base/src/main/kotlin/net/woggioni/gbcs/base/Logging.kt
Normal file
111
gbcs-base/src/main/kotlin/net/woggioni/gbcs/base/Logging.kt
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
package net.woggioni.gbcs.base
|
||||||
|
|
||||||
|
import org.slf4j.Logger
|
||||||
|
import org.slf4j.LoggerFactory
|
||||||
|
import org.slf4j.event.Level
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Path
|
||||||
|
import java.util.logging.LogManager
|
||||||
|
|
||||||
|
inline fun <reified T> T.contextLogger() = LoggerFactory.getLogger(T::class.java)
|
||||||
|
|
||||||
|
inline fun Logger.traceParam(messageBuilder : () -> Pair<String, Array<Any>>) {
|
||||||
|
if(isTraceEnabled) {
|
||||||
|
val (format, params) = messageBuilder()
|
||||||
|
trace(format, params)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun Logger.debugParam(messageBuilder : () -> Pair<String, Array<Any>>) {
|
||||||
|
if(isDebugEnabled) {
|
||||||
|
val (format, params) = messageBuilder()
|
||||||
|
info(format, params)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun Logger.infoParam(messageBuilder : () -> Pair<String, Array<Any>>) {
|
||||||
|
if(isInfoEnabled) {
|
||||||
|
val (format, params) = messageBuilder()
|
||||||
|
info(format, params)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun Logger.warnParam(messageBuilder : () -> Pair<String, Array<Any>>) {
|
||||||
|
if(isWarnEnabled) {
|
||||||
|
val (format, params) = messageBuilder()
|
||||||
|
warn(format, params)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun Logger.errorParam(messageBuilder : () -> Pair<String, Array<Any>>) {
|
||||||
|
if(isErrorEnabled) {
|
||||||
|
val (format, params) = messageBuilder()
|
||||||
|
error(format, params)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
inline fun log(log : Logger,
|
||||||
|
filter : Logger.() -> Boolean,
|
||||||
|
loggerMethod : Logger.(String) -> Unit, messageBuilder : () -> String) {
|
||||||
|
if(log.filter()) {
|
||||||
|
log.loggerMethod(messageBuilder())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun Logger.log(level : Level, messageBuilder : () -> String) {
|
||||||
|
if(isEnabledForLevel(level)) {
|
||||||
|
makeLoggingEventBuilder(level).log(messageBuilder())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun Logger.trace(messageBuilder : () -> String) {
|
||||||
|
if(isTraceEnabled) {
|
||||||
|
trace(messageBuilder())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun Logger.debug(messageBuilder : () -> String) {
|
||||||
|
if(isDebugEnabled) {
|
||||||
|
debug(messageBuilder())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun Logger.info(messageBuilder : () -> String) {
|
||||||
|
if(isInfoEnabled) {
|
||||||
|
info(messageBuilder())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun Logger.warn(messageBuilder : () -> String) {
|
||||||
|
if(isWarnEnabled) {
|
||||||
|
warn(messageBuilder())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun Logger.error(messageBuilder : () -> String) {
|
||||||
|
if(isErrorEnabled) {
|
||||||
|
error(messageBuilder())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class LoggingConfig {
|
||||||
|
|
||||||
|
init {
|
||||||
|
val logManager = LogManager.getLogManager()
|
||||||
|
System.getProperty("log.config.source")?.let withSource@ { source ->
|
||||||
|
val urls = LoggingConfig::class.java.classLoader.getResources(source)
|
||||||
|
while(urls.hasMoreElements()) {
|
||||||
|
val url = urls.nextElement()
|
||||||
|
url.openStream().use { inputStream ->
|
||||||
|
logManager.readConfiguration(inputStream)
|
||||||
|
return@withSource
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Path.of(source).takeIf(Files::exists)
|
||||||
|
?.let(Files::newInputStream)
|
||||||
|
?.use(logManager::readConfiguration)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,46 @@
|
|||||||
|
package net.woggioni.gbcs.base
|
||||||
|
|
||||||
|
import java.security.SecureRandom
|
||||||
|
import java.security.spec.KeySpec
|
||||||
|
import java.util.Base64
|
||||||
|
import javax.crypto.SecretKeyFactory
|
||||||
|
import javax.crypto.spec.PBEKeySpec
|
||||||
|
|
||||||
|
object PasswordSecurity {
|
||||||
|
private const val KEY_LENGTH = 256
|
||||||
|
|
||||||
|
private fun concat(arr1: ByteArray, arr2: ByteArray): ByteArray {
|
||||||
|
val result = ByteArray(arr1.size + arr2.size)
|
||||||
|
var j = 0
|
||||||
|
for(element in arr1) {
|
||||||
|
result[j] = element
|
||||||
|
j += 1
|
||||||
|
}
|
||||||
|
for(element in arr2) {
|
||||||
|
result[j] = element
|
||||||
|
j += 1
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
fun hashPassword(password : String, salt : String? = null) : String {
|
||||||
|
val actualSalt = salt?.let(Base64.getDecoder()::decode) ?: SecureRandom().run {
|
||||||
|
val result = ByteArray(16)
|
||||||
|
nextBytes(result)
|
||||||
|
result
|
||||||
|
}
|
||||||
|
val spec: KeySpec = PBEKeySpec(password.toCharArray(), actualSalt, 10, KEY_LENGTH)
|
||||||
|
val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1")
|
||||||
|
val hash = factory.generateSecret(spec).encoded
|
||||||
|
return String(Base64.getEncoder().encode(concat(hash, actualSalt)))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun decodePasswordHash(passwordHash : String) : Pair<ByteArray, ByteArray> {
|
||||||
|
val decoded = Base64.getDecoder().decode(passwordHash)
|
||||||
|
val hash = ByteArray(KEY_LENGTH / 8)
|
||||||
|
val salt = ByteArray(decoded.size - KEY_LENGTH / 8)
|
||||||
|
System.arraycopy(decoded, 0, hash, 0, hash.size)
|
||||||
|
System.arraycopy(decoded, hash.size, salt, 0, salt.size)
|
||||||
|
return hash to salt
|
||||||
|
}
|
||||||
|
}
|
@@ -1,6 +1,7 @@
|
|||||||
package net.woggioni.gbcs
|
package net.woggioni.gbcs.base
|
||||||
|
|
||||||
import org.slf4j.LoggerFactory
|
import org.slf4j.LoggerFactory
|
||||||
|
import org.slf4j.event.Level
|
||||||
import org.w3c.dom.Document
|
import org.w3c.dom.Document
|
||||||
import org.w3c.dom.Element
|
import org.w3c.dom.Element
|
||||||
import org.w3c.dom.Node
|
import org.w3c.dom.Node
|
||||||
@@ -72,7 +73,7 @@ class ElementIterator(parent: Element, name: String? = null) : Iterator<Element>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class Xml(private val doc: Document, val element: Element) {
|
class Xml(val doc: Document, val element: Element) {
|
||||||
|
|
||||||
class ErrorHandler(private val fileURL: URL) : ErrHandler {
|
class ErrorHandler(private val fileURL: URL) : ErrHandler {
|
||||||
|
|
||||||
@@ -80,28 +81,17 @@ class Xml(private val doc: Document, val element: Element) {
|
|||||||
private val log = LoggerFactory.getLogger(ErrorHandler::class.java)
|
private val log = LoggerFactory.getLogger(ErrorHandler::class.java)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun warning(ex: SAXParseException) {
|
override fun warning(ex: SAXParseException)= err(ex, Level.WARN)
|
||||||
log.warn(
|
|
||||||
"Problem at {}:{}:{} parsing deployment configuration: {}",
|
|
||||||
fileURL, ex.lineNumber, ex.columnNumber, ex.message
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun error(ex: SAXParseException) {
|
private fun err(ex: SAXParseException, level: Level) {
|
||||||
log.error(
|
log.log(level) {
|
||||||
"Problem at {}:{}:{} parsing deployment configuration: {}",
|
"Problem at ${fileURL}:${ex.lineNumber}:${ex.columnNumber} parsing deployment configuration: ${ex.message}"
|
||||||
fileURL, ex.lineNumber, ex.columnNumber, ex.message
|
}
|
||||||
)
|
|
||||||
throw ex
|
throw ex
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun fatalError(ex: SAXParseException) {
|
override fun error(ex: SAXParseException) = err(ex, Level.ERROR)
|
||||||
log.error(
|
override fun fatalError(ex: SAXParseException) = err(ex, Level.ERROR)
|
||||||
"Problem at {}:{}:{} parsing deployment configuration: {}",
|
|
||||||
fileURL, ex.lineNumber, ex.columnNumber, ex.message
|
|
||||||
)
|
|
||||||
throw ex
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
@@ -127,9 +117,7 @@ class Xml(private val doc: Document, val element: Element) {
|
|||||||
|
|
||||||
fun getSchema(schema: URL): Schema {
|
fun getSchema(schema: URL): Schema {
|
||||||
val sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI)
|
val sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI)
|
||||||
sf.setFeature(FEATURE_SECURE_PROCESSING, true)
|
sf.setFeature(FEATURE_SECURE_PROCESSING, false)
|
||||||
// disableProperty(sf, ACCESS_EXTERNAL_SCHEMA)
|
|
||||||
// disableProperty(sf, ACCESS_EXTERNAL_DTD)
|
|
||||||
sf.errorHandler = ErrorHandler(schema)
|
sf.errorHandler = ErrorHandler(schema)
|
||||||
return sf.newSchema(schema)
|
return sf.newSchema(schema)
|
||||||
}
|
}
|
||||||
@@ -137,20 +125,19 @@ class Xml(private val doc: Document, val element: Element) {
|
|||||||
fun getSchema(inputStream: InputStream): Schema {
|
fun getSchema(inputStream: InputStream): Schema {
|
||||||
val sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI)
|
val sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI)
|
||||||
sf.setFeature(FEATURE_SECURE_PROCESSING, true)
|
sf.setFeature(FEATURE_SECURE_PROCESSING, true)
|
||||||
// disableProperty(sf, ACCESS_EXTERNAL_SCHEMA)
|
|
||||||
// disableProperty(sf, ACCESS_EXTERNAL_DTD)
|
|
||||||
return sf.newSchema(StreamSource(inputStream))
|
return sf.newSchema(StreamSource(inputStream))
|
||||||
}
|
}
|
||||||
|
|
||||||
fun newDocumentBuilderFactory(schemaResourceURL: URL?): DocumentBuilderFactory {
|
fun newDocumentBuilderFactory(schemaResourceURL: URL?): DocumentBuilderFactory {
|
||||||
val dbf = DocumentBuilderFactory.newInstance()
|
val dbf = DocumentBuilderFactory.newInstance()
|
||||||
dbf.setFeature(FEATURE_SECURE_PROCESSING, true)
|
dbf.setFeature(FEATURE_SECURE_PROCESSING, false)
|
||||||
disableProperty(dbf, ACCESS_EXTERNAL_SCHEMA)
|
dbf.setAttribute(ACCESS_EXTERNAL_SCHEMA, "all")
|
||||||
disableProperty(dbf, ACCESS_EXTERNAL_DTD)
|
disableProperty(dbf, ACCESS_EXTERNAL_DTD)
|
||||||
dbf.isExpandEntityReferences = false
|
dbf.isExpandEntityReferences = true
|
||||||
dbf.isIgnoringComments = true
|
dbf.isIgnoringComments = true
|
||||||
dbf.isNamespaceAware = true
|
dbf.isNamespaceAware = true
|
||||||
dbf.isValidating = false
|
dbf.isValidating = schemaResourceURL == null
|
||||||
|
dbf.setFeature("http://apache.org/xml/features/validation/schema", true)
|
||||||
schemaResourceURL?.let {
|
schemaResourceURL?.let {
|
||||||
dbf.schema = getSchema(it)
|
dbf.schema = getSchema(it)
|
||||||
}
|
}
|
||||||
@@ -168,37 +155,15 @@ class Xml(private val doc: Document, val element: Element) {
|
|||||||
return resource.openStream().use(db::parse)
|
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)
|
val db = newDocumentBuilder(sourceURL, schemaResourceURL)
|
||||||
return sourceStream?.let(db::parse) ?: sourceURL.openStream().use(db::parse)
|
return sourceStream?.let(db::parse) ?: sourceURL.openStream().use(db::parse)
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
// fun newDocumentBuilder(resource: URL): DocumentBuilder {
|
|
||||||
// val db = newDocumentBuilderFactory(null).newDocumentBuilder()
|
|
||||||
// db.setErrorHandler(XmlErrorHandler(resource))
|
|
||||||
// return db
|
|
||||||
// }
|
|
||||||
|
|
||||||
// fun parseXmlResource(resource: URL): Document {
|
|
||||||
// val db = newDocumentBuilder(resource, null)
|
|
||||||
// return resource.openStream().use(db::parse)
|
|
||||||
// }
|
|
||||||
|
|
||||||
fun write(doc: Document, output: OutputStream) {
|
fun write(doc: Document, output: OutputStream) {
|
||||||
val transformerFactory = TransformerFactory.newInstance()
|
val transformerFactory = TransformerFactory.newInstance()
|
||||||
val transformer = transformerFactory.newTransformer()
|
val transformer = transformerFactory.newTransformer()
|
||||||
transformer.setOutputProperty(OutputKeys.INDENT, "yes")
|
transformer.setOutputProperty(OutputKeys.INDENT, "yes")
|
||||||
// val domImpl = doc.getImplementation()
|
|
||||||
// val docType = domImpl.createDocumentType(
|
|
||||||
// "plist",
|
|
||||||
// "-//Apple//DTD PLIST 1.0//EN",
|
|
||||||
// "http://www.apple.com/DTDs/PropertyList-1.0.dtd"
|
|
||||||
// )
|
|
||||||
// transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, docType.getPublicId())
|
|
||||||
// transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, docType.getSystemId())
|
|
||||||
// val transformerFactory = TransformerFactory.newInstance()
|
|
||||||
// val transformer: Transformer = transformerFactory.newTransformer()
|
|
||||||
transformer.setOutputProperty(OutputKeys.INDENT, "yes")
|
transformer.setOutputProperty(OutputKeys.INDENT, "yes")
|
||||||
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4")
|
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4")
|
||||||
transformer.setOutputProperty(OutputKeys.STANDALONE, "yes")
|
transformer.setOutputProperty(OutputKeys.STANDALONE, "yes")
|
||||||
@@ -208,7 +173,12 @@ class Xml(private val doc: Document, val element: Element) {
|
|||||||
transformer.transform(source, result)
|
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 dbf = newDocumentBuilderFactory(schemaResourceURL)
|
||||||
val db = dbf.newDocumentBuilder()
|
val db = dbf.newDocumentBuilder()
|
||||||
val doc = db.newDocument()
|
val doc = db.newDocument()
|
||||||
@@ -228,15 +198,15 @@ class Xml(private val doc: Document, val element: Element) {
|
|||||||
removeChild(firstChild ?: break)
|
removeChild(firstChild ?: break)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun node(
|
fun node(
|
||||||
name: String,
|
name: String,
|
||||||
|
namespaceURI: String? = null,
|
||||||
attrs: Map<String, String> = emptyMap(),
|
attrs: Map<String, String> = emptyMap(),
|
||||||
cb: Xml.(el: Element) -> Unit = {}
|
cb: Xml.(el: Element) -> Unit = {}
|
||||||
): Element {
|
): Element {
|
||||||
val child = doc.createElement(name)
|
val child = doc.createElementNS(namespaceURI, name)
|
||||||
for ((key, value) in attrs) {
|
for ((key, value) in attrs) {
|
||||||
child.setAttribute(key, value)
|
child.setAttribute(key, value)
|
||||||
}
|
}
|
||||||
@@ -247,13 +217,8 @@ class Xml(private val doc: Document, val element: Element) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun attr(key: String, value: String, namespaceURI: String? = null) {
|
||||||
fun attrs(vararg attributes: Pair<String, String>) {
|
element.setAttributeNS(namespaceURI, key, value)
|
||||||
for (attr in attributes) element.setAttribute(attr.first, attr.second)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun attr(key: String, value: String) {
|
|
||||||
element.setAttribute(key, value)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun text(txt: String) {
|
fun text(txt: String) {
|
80
gbcs-cli/build.gradle
Normal file
80
gbcs-cli/build.gradle
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
alias catalog.plugins.kotlin.jvm
|
||||||
|
alias catalog.plugins.envelope
|
||||||
|
alias catalog.plugins.sambal
|
||||||
|
alias catalog.plugins.graalvm.native.image
|
||||||
|
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
|
||||||
|
|
||||||
|
Property<String> mainClassName = objects.property(String.class)
|
||||||
|
mainClassName.set('net.woggioni.gbcs.cli.GradleBuildCacheServerCli')
|
||||||
|
|
||||||
|
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
|
||||||
|
options.javaModuleMainClass = mainClassName
|
||||||
|
}
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
release {
|
||||||
|
transitive = false
|
||||||
|
canBeConsumed = true
|
||||||
|
canBeResolved = true
|
||||||
|
visible = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
envelopeJar {
|
||||||
|
mainModule = 'net.woggioni.gbcs.cli'
|
||||||
|
mainClass = mainClassName
|
||||||
|
|
||||||
|
extraClasspath = ["plugins"]
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation catalog.jwo
|
||||||
|
implementation catalog.slf4j.api
|
||||||
|
implementation catalog.netty.codec.http
|
||||||
|
implementation catalog.picocli
|
||||||
|
|
||||||
|
implementation project(":gbcs-client")
|
||||||
|
implementation rootProject
|
||||||
|
|
||||||
|
// runtimeOnly catalog.slf4j.jdk14
|
||||||
|
runtimeOnly catalog.logback.classic
|
||||||
|
}
|
||||||
|
|
||||||
|
Provider<EnvelopeJarTask> envelopeJarTaskProvider = tasks.named('envelopeJar', EnvelopeJarTask.class) {
|
||||||
|
// systemProperties['java.util.logging.config.class'] = 'net.woggioni.gbcs.LoggingConfig'
|
||||||
|
// systemProperties['log.config.source'] = 'logging.properties'
|
||||||
|
systemProperties['logback.configurationFile'] = 'classpath:net/woggioni/gbcs/cli/logback.xml'
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named(NativeImagePlugin.CONFIGURE_NATIVE_IMAGE_TASK_NAME, NativeImageConfigurationTask) {
|
||||||
|
mainClass = mainClassName
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named(NativeImagePlugin.NATIVE_IMAGE_TASK_NAME, NativeImageTask) {
|
||||||
|
mainClass = mainClassName
|
||||||
|
useMusl = true
|
||||||
|
buildStaticImage = true
|
||||||
|
}
|
||||||
|
|
||||||
|
artifacts {
|
||||||
|
release(envelopeJarTaskProvider)
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
maven(MavenPublication) {
|
||||||
|
artifact envelopeJar
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
2
gbcs-cli/native-image/native-image.properties
Normal file
2
gbcs-cli/native-image/native-image.properties
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
Args=-H:Optimize=3 --gc=serial
|
||||||
|
#-H:TraceClassInitialization=io.netty.handler.ssl.BouncyCastleAlpnSslUtils
|
17
gbcs-cli/src/main/java/module-info.java
Normal file
17
gbcs-cli/src/main/java/module-info.java
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
module net.woggioni.gbcs.cli {
|
||||||
|
requires org.slf4j;
|
||||||
|
requires net.woggioni.gbcs;
|
||||||
|
requires info.picocli;
|
||||||
|
requires net.woggioni.gbcs.base;
|
||||||
|
requires net.woggioni.gbcs.client;
|
||||||
|
requires kotlin.stdlib;
|
||||||
|
requires net.woggioni.jwo;
|
||||||
|
requires net.woggioni.gbcs.api;
|
||||||
|
|
||||||
|
exports net.woggioni.gbcs.cli.impl.converters to info.picocli;
|
||||||
|
opens net.woggioni.gbcs.cli.impl.commands to info.picocli;
|
||||||
|
opens net.woggioni.gbcs.cli.impl to info.picocli;
|
||||||
|
opens net.woggioni.gbcs.cli to info.picocli, net.woggioni.gbcs.base;
|
||||||
|
|
||||||
|
exports net.woggioni.gbcs.cli;
|
||||||
|
}
|
@@ -0,0 +1,59 @@
|
|||||||
|
package net.woggioni.gbcs.cli
|
||||||
|
|
||||||
|
import net.woggioni.gbcs.base.GbcsUrlStreamHandlerFactory
|
||||||
|
import net.woggioni.gbcs.base.contextLogger
|
||||||
|
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 picocli.CommandLine
|
||||||
|
import picocli.CommandLine.Model.CommandSpec
|
||||||
|
|
||||||
|
|
||||||
|
@CommandLine.Command(
|
||||||
|
name = "gbcs", versionProvider = GradleBuildCacheServerCli.VersionProvider::class
|
||||||
|
)
|
||||||
|
class GradleBuildCacheServerCli : GbcsCommand() {
|
||||||
|
|
||||||
|
class VersionProvider : AbstractVersionProvider()
|
||||||
|
companion object {
|
||||||
|
@JvmStatic
|
||||||
|
fun main(vararg args: String) {
|
||||||
|
Thread.currentThread().contextClassLoader = GradleBuildCacheServerCli::class.java.classLoader
|
||||||
|
GbcsUrlStreamHandlerFactory.install()
|
||||||
|
val log = contextLogger()
|
||||||
|
val app = Application.builder("gbcs")
|
||||||
|
.configurationDirectoryEnvVar("GBCS_CONFIGURATION_DIR")
|
||||||
|
.configurationDirectoryPropertyKey("net.woggioni.gbcs.conf.dir")
|
||||||
|
.build()
|
||||||
|
val gbcsCli = GradleBuildCacheServerCli()
|
||||||
|
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 = ["-V", "--version"], versionHelp = true)
|
||||||
|
var versionHelp = false
|
||||||
|
private set
|
||||||
|
|
||||||
|
@CommandLine.Spec
|
||||||
|
private lateinit var spec: CommandSpec
|
||||||
|
|
||||||
|
|
||||||
|
override fun run() {
|
||||||
|
spec.commandLine().usage(System.out);
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,30 @@
|
|||||||
|
package net.woggioni.gbcs.cli.impl
|
||||||
|
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.util.jar.Attributes
|
||||||
|
import java.util.jar.JarFile
|
||||||
|
import java.util.jar.Manifest
|
||||||
|
|
||||||
|
|
||||||
|
abstract class AbstractVersionProvider : CommandLine.IVersionProvider {
|
||||||
|
private val version: String
|
||||||
|
private val vcsHash: String
|
||||||
|
|
||||||
|
init {
|
||||||
|
val mf = Manifest()
|
||||||
|
javaClass.module.getResourceAsStream(JarFile.MANIFEST_NAME).use { `is` ->
|
||||||
|
mf.read(`is`)
|
||||||
|
}
|
||||||
|
val mainAttributes = mf.mainAttributes
|
||||||
|
version = mainAttributes.getValue(Attributes.Name.SPECIFICATION_VERSION) ?: throw RuntimeException("Version information not found in manifest")
|
||||||
|
vcsHash = mainAttributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION) ?: throw RuntimeException("Version information not found in manifest")
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getVersion(): Array<String?> {
|
||||||
|
return if (version.endsWith("-SNAPSHOT")) {
|
||||||
|
arrayOf(version, vcsHash)
|
||||||
|
} else {
|
||||||
|
arrayOf(version)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,19 @@
|
|||||||
|
package net.woggioni.gbcs.cli.impl
|
||||||
|
|
||||||
|
import net.woggioni.jwo.Application
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.nio.file.Path
|
||||||
|
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,132 @@
|
|||||||
|
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 java.util.concurrent.atomic.AtomicLong
|
||||||
|
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()
|
||||||
|
val totalElapsedTime = AtomicLong(0)
|
||||||
|
entryGenerator.take(numberOfEntries).forEach { entry ->
|
||||||
|
val requestStart = System.nanoTime()
|
||||||
|
val future = client.put(entry.first, entry.second).thenApply { entry }
|
||||||
|
future.whenComplete { _, _ ->
|
||||||
|
totalElapsedTime.addAndGet((System.nanoTime() - requestStart))
|
||||||
|
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"
|
||||||
|
}
|
||||||
|
log.info {
|
||||||
|
"Average time per insertion: ${totalElapsedTime.get() / numberOfEntries.toDouble() * 1000} ms"
|
||||||
|
}
|
||||||
|
inserted
|
||||||
|
}
|
||||||
|
log.info {
|
||||||
|
"Inserted ${entries.size} entries"
|
||||||
|
}
|
||||||
|
if (entries.isNotEmpty()) {
|
||||||
|
val completionQueue = LinkedBlockingQueue<Future<Unit>>(entries.size)
|
||||||
|
val start = Instant.now()
|
||||||
|
val totalElapsedTime = AtomicLong(0)
|
||||||
|
entries.forEach { entry ->
|
||||||
|
val requestStart = System.nanoTime()
|
||||||
|
val future = client.get(entry.first).thenApply {
|
||||||
|
totalElapsedTime.addAndGet((System.nanoTime() - requestStart))
|
||||||
|
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"
|
||||||
|
}
|
||||||
|
log.info {
|
||||||
|
"Average time per retrieval: ${totalElapsedTime.get() / numberOfEntries.toDouble() * 1e6} ms"
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
log.error("Skipping retrieval benchmark as it was not possible to insert any entry in the cache")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,41 @@
|
|||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,37 @@
|
|||||||
|
package net.woggioni.gbcs.cli.impl.commands
|
||||||
|
|
||||||
|
import net.woggioni.gbcs.base.PasswordSecurity.hashPassword
|
||||||
|
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.OutputStream
|
||||||
|
import java.io.OutputStreamWriter
|
||||||
|
import java.io.PrintWriter
|
||||||
|
|
||||||
|
|
||||||
|
@CommandLine.Command(
|
||||||
|
name = "password",
|
||||||
|
description = ["Generate a password hash to add to GBCS configuration file"],
|
||||||
|
showDefaultValues = true
|
||||||
|
)
|
||||||
|
class PasswordHashCommand : GbcsCommand() {
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ["-o", "--output-file"],
|
||||||
|
description = ["Write the output to a file instead of stdout"],
|
||||||
|
converter = [OutputStreamConverter::class],
|
||||||
|
showDefaultValue = CommandLine.Help.Visibility.NEVER,
|
||||||
|
paramLabel = "OUTPUT_FILE"
|
||||||
|
)
|
||||||
|
private var outputStream: OutputStream = UncloseableOutputStream(System.out)
|
||||||
|
|
||||||
|
override fun run() {
|
||||||
|
val password1 = String(System.console().readPassword("Type your password:"))
|
||||||
|
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))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,67 @@
|
|||||||
|
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.api.Configuration
|
||||||
|
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.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 : Configuration by lazy {
|
||||||
|
GradleBuildCacheServer.loadConfiguration(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 {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,13 @@
|
|||||||
|
package net.woggioni.gbcs.cli.impl.converters
|
||||||
|
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.io.OutputStream
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Paths
|
||||||
|
|
||||||
|
|
||||||
|
class OutputStreamConverter : CommandLine.ITypeConverter<OutputStream> {
|
||||||
|
override fun convert(value: String): OutputStream {
|
||||||
|
return Files.newOutputStream(Paths.get(value))
|
||||||
|
}
|
||||||
|
}
|
@@ -6,14 +6,15 @@
|
|||||||
<import class="ch.qos.logback.core.ConsoleAppender"/>
|
<import class="ch.qos.logback.core.ConsoleAppender"/>
|
||||||
|
|
||||||
<appender name="console" class="ConsoleAppender">
|
<appender name="console" class="ConsoleAppender">
|
||||||
<target>System.out</target>
|
<target>System.err</target>
|
||||||
<encoder class="PatternLayoutEncoder">
|
<encoder class="PatternLayoutEncoder">
|
||||||
<pattern>%d [%highlight(%-5level)] \(%thread\) %logger{36} -%kvp- %msg %n</pattern>
|
<pattern>%d [%highlight(%-5level)] \(%thread\) %logger{36} -%kvp- %msg %n</pattern>
|
||||||
</encoder>
|
</encoder>
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<root level="debug">
|
<root level="info">
|
||||||
<appender-ref ref="console"/>
|
<appender-ref ref="console"/>
|
||||||
</root>
|
</root>
|
||||||
<logger name="io.netty" level="info"/>
|
<logger name="com.google.code.yanf4j" level="warn"/>
|
||||||
|
<logger name="net.rubyeye.xmemcached" level="warn"/>
|
||||||
</configuration>
|
</configuration>
|
14
gbcs-client/build.gradle
Normal file
14
gbcs-client/build.gradle
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
|
16
gbcs-client/src/main/java/module-info.java
Normal file
16
gbcs-client/src/main/java/module-info.java
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
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;
|
||||||
|
}
|
254
gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Client.kt
Normal file
254
gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Client.kt
Normal file
@@ -0,0 +1,254 @@
|
|||||||
|
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()
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,9 @@
|
|||||||
|
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()}"
|
||||||
|
}
|
@@ -0,0 +1,68 @@
|
|||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,37 @@
|
|||||||
|
<?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>
|
@@ -0,0 +1,16 @@
|
|||||||
|
<?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>
|
58
gbcs-memcached/build.gradle
Normal file
58
gbcs-memcached/build.gradle
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
id 'maven-publish'
|
||||||
|
alias catalog.plugins.kotlin.jvm
|
||||||
|
}
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
bundle {
|
||||||
|
extendsFrom runtimeClasspath
|
||||||
|
canBeResolved = true
|
||||||
|
canBeConsumed = false
|
||||||
|
visible = false
|
||||||
|
|
||||||
|
resolutionStrategy {
|
||||||
|
dependencies {
|
||||||
|
exclude group: 'org.slf4j', module: 'slf4j-api'
|
||||||
|
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
|
||||||
|
exclude group: 'org.jetbrains', module: 'annotations'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
release {
|
||||||
|
transitive = false
|
||||||
|
canBeConsumed = true
|
||||||
|
canBeResolved = true
|
||||||
|
visible = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compileOnly project(':gbcs-base')
|
||||||
|
compileOnly project(':gbcs-api')
|
||||||
|
compileOnly catalog.jwo
|
||||||
|
implementation catalog.xmemcached
|
||||||
|
}
|
||||||
|
|
||||||
|
Provider<Tar> bundleTask = tasks.register("bundle", Tar) {
|
||||||
|
from(tasks.named(JavaPlugin.JAR_TASK_NAME))
|
||||||
|
from(configurations.bundle)
|
||||||
|
group = BasePlugin.BUILD_GROUP
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named(BasePlugin.ASSEMBLE_TASK_NAME) {
|
||||||
|
dependsOn(bundleTask)
|
||||||
|
}
|
||||||
|
|
||||||
|
artifacts {
|
||||||
|
release(bundleTask)
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
maven(MavenPublication) {
|
||||||
|
artifact bundleTask
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
14
gbcs-memcached/src/main/java/module-info.java
Normal file
14
gbcs-memcached/src/main/java/module-info.java
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
import net.woggioni.gbcs.api.CacheProvider;
|
||||||
|
|
||||||
|
module net.woggioni.gbcs.memcached {
|
||||||
|
requires net.woggioni.gbcs.base;
|
||||||
|
requires net.woggioni.gbcs.api;
|
||||||
|
requires com.googlecode.xmemcached;
|
||||||
|
requires net.woggioni.jwo;
|
||||||
|
requires java.xml;
|
||||||
|
requires kotlin.stdlib;
|
||||||
|
|
||||||
|
provides CacheProvider with net.woggioni.gbcs.memcached.MemcachedCacheProvider;
|
||||||
|
|
||||||
|
opens net.woggioni.gbcs.memcached.schema;
|
||||||
|
}
|
@@ -0,0 +1,59 @@
|
|||||||
|
package net.woggioni.gbcs.memcached
|
||||||
|
|
||||||
|
import net.rubyeye.xmemcached.XMemcachedClientBuilder
|
||||||
|
import net.rubyeye.xmemcached.command.BinaryCommandFactory
|
||||||
|
import net.rubyeye.xmemcached.transcoders.CompressionMode
|
||||||
|
import net.rubyeye.xmemcached.transcoders.SerializingTranscoder
|
||||||
|
import net.woggioni.gbcs.api.Cache
|
||||||
|
import net.woggioni.gbcs.api.exception.ContentTooLargeException
|
||||||
|
import net.woggioni.gbcs.base.HostAndPort
|
||||||
|
import net.woggioni.jwo.JWO
|
||||||
|
import java.io.ByteArrayInputStream
|
||||||
|
import java.net.InetSocketAddress
|
||||||
|
import java.nio.channels.Channels
|
||||||
|
import java.nio.channels.ReadableByteChannel
|
||||||
|
import java.nio.charset.StandardCharsets
|
||||||
|
import java.security.MessageDigest
|
||||||
|
import java.time.Duration
|
||||||
|
|
||||||
|
class MemcachedCache(
|
||||||
|
servers: List<HostAndPort>,
|
||||||
|
private val maxAge: Duration,
|
||||||
|
maxSize : Int,
|
||||||
|
digestAlgorithm: String?,
|
||||||
|
compressionMode: CompressionMode,
|
||||||
|
) : Cache {
|
||||||
|
private val memcachedClient = XMemcachedClientBuilder(
|
||||||
|
servers.stream().map { addr: HostAndPort -> InetSocketAddress(addr.host, addr.port) }.toList()
|
||||||
|
).apply {
|
||||||
|
commandFactory = BinaryCommandFactory()
|
||||||
|
digestAlgorithm?.let { dAlg ->
|
||||||
|
setKeyProvider { key ->
|
||||||
|
val md = MessageDigest.getInstance(dAlg)
|
||||||
|
md.update(key.toByteArray(StandardCharsets.UTF_8))
|
||||||
|
JWO.bytesToHex(md.digest())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
transcoder = SerializingTranscoder(maxSize).apply {
|
||||||
|
setCompressionMode(compressionMode)
|
||||||
|
}
|
||||||
|
}.build()
|
||||||
|
|
||||||
|
override fun get(key: String): ReadableByteChannel? {
|
||||||
|
return memcachedClient.get<ByteArray>(key)
|
||||||
|
?.let(::ByteArrayInputStream)
|
||||||
|
?.let(Channels::newChannel)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun put(key: String, content: ByteArray) {
|
||||||
|
try {
|
||||||
|
memcachedClient[key, maxAge.toSeconds().toInt()] = content
|
||||||
|
} catch (e: IllegalArgumentException) {
|
||||||
|
throw ContentTooLargeException(e.message, e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun close() {
|
||||||
|
memcachedClient.shutdown()
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,26 @@
|
|||||||
|
package net.woggioni.gbcs.memcached
|
||||||
|
|
||||||
|
import net.rubyeye.xmemcached.transcoders.CompressionMode
|
||||||
|
import net.woggioni.gbcs.api.Configuration
|
||||||
|
import net.woggioni.gbcs.base.HostAndPort
|
||||||
|
import java.time.Duration
|
||||||
|
|
||||||
|
data class MemcachedCacheConfiguration(
|
||||||
|
var servers: List<HostAndPort>,
|
||||||
|
var maxAge: Duration = Duration.ofDays(1),
|
||||||
|
var maxSize: Int = 0x100000,
|
||||||
|
var digestAlgorithm: String? = null,
|
||||||
|
var compressionMode: CompressionMode = CompressionMode.ZIP,
|
||||||
|
) : Configuration.Cache {
|
||||||
|
override fun materialize() = MemcachedCache(
|
||||||
|
servers,
|
||||||
|
maxAge,
|
||||||
|
maxSize,
|
||||||
|
digestAlgorithm,
|
||||||
|
compressionMode
|
||||||
|
)
|
||||||
|
|
||||||
|
override fun getNamespaceURI() = "urn:net.woggioni.gbcs-memcached"
|
||||||
|
|
||||||
|
override fun getTypeName() = "memcachedCacheType"
|
||||||
|
}
|
@@ -0,0 +1,91 @@
|
|||||||
|
package net.woggioni.gbcs.memcached
|
||||||
|
|
||||||
|
import net.rubyeye.xmemcached.transcoders.CompressionMode
|
||||||
|
import net.woggioni.gbcs.api.CacheProvider
|
||||||
|
import net.woggioni.gbcs.base.GBCS
|
||||||
|
import net.woggioni.gbcs.base.HostAndPort
|
||||||
|
import net.woggioni.gbcs.base.Xml
|
||||||
|
import net.woggioni.gbcs.base.Xml.Companion.asIterable
|
||||||
|
import org.w3c.dom.Document
|
||||||
|
import org.w3c.dom.Element
|
||||||
|
import java.time.Duration
|
||||||
|
|
||||||
|
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 deserialize(el: Element): MemcachedCacheConfiguration {
|
||||||
|
val servers = mutableListOf<HostAndPort>()
|
||||||
|
val maxAge = el.getAttribute("max-age")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
?.let(Duration::parse)
|
||||||
|
?: Duration.ofDays(1)
|
||||||
|
val maxSize = el.getAttribute("max-size")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
?.let(String::toInt)
|
||||||
|
?: 0x100000
|
||||||
|
val enableCompression = el.getAttribute("enable-compression")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
?.let(String::toBoolean)
|
||||||
|
?: false
|
||||||
|
val compressionMode = el.getAttribute("compression-mode")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
?.let {
|
||||||
|
when (it) {
|
||||||
|
"gzip" -> CompressionMode.GZIP
|
||||||
|
"zip" -> CompressionMode.ZIP
|
||||||
|
else -> CompressionMode.ZIP
|
||||||
|
}
|
||||||
|
}
|
||||||
|
?: CompressionMode.ZIP
|
||||||
|
val digestAlgorithm = el.getAttribute("digest").takeIf(String::isNotEmpty)
|
||||||
|
for (child in el.asIterable()) {
|
||||||
|
when (child.nodeName) {
|
||||||
|
"server" -> {
|
||||||
|
servers.add(HostAndPort(child.getAttribute("host"), child.getAttribute("port").toInt()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return MemcachedCacheConfiguration(
|
||||||
|
servers,
|
||||||
|
maxAge,
|
||||||
|
maxSize,
|
||||||
|
digestAlgorithm,
|
||||||
|
compressionMode,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun serialize(doc: Document, cache: MemcachedCacheConfiguration) = cache.run {
|
||||||
|
val result = doc.createElement("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)
|
||||||
|
for (server in servers) {
|
||||||
|
node("server") {
|
||||||
|
attr("host", server.host)
|
||||||
|
attr("port", server.port.toString())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
attr("max-age", maxAge.toString())
|
||||||
|
attr("max-size", maxSize.toString())
|
||||||
|
digestAlgorithm?.let { digestAlgorithm ->
|
||||||
|
attr("digest", digestAlgorithm)
|
||||||
|
}
|
||||||
|
attr(
|
||||||
|
"compression-mode", when (compressionMode) {
|
||||||
|
CompressionMode.GZIP -> "gzip"
|
||||||
|
CompressionMode.ZIP -> "zip"
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1 @@
|
|||||||
|
net.woggioni.gbcs.memcached.MemcachedCacheProvider
|
@@ -0,0 +1,35 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
|
<xs:schema targetNamespace="urn:net.woggioni.gbcs-memcached"
|
||||||
|
xmlns:gbcs-memcached="urn:net.woggioni.gbcs-memcached"
|
||||||
|
xmlns:gbcs="urn:net.woggioni.gbcs"
|
||||||
|
xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
||||||
|
|
||||||
|
<xs:import schemaLocation="classpath:net/woggioni/gbcs/schema/gbcs.xsd" namespace="urn:net.woggioni.gbcs"/>
|
||||||
|
|
||||||
|
<xs:complexType name="memcachedServerType">
|
||||||
|
<xs:attribute name="host" type="xs:string" use="required"/>
|
||||||
|
<xs:attribute name="port" type="xs:positiveInteger" use="required"/>
|
||||||
|
</xs:complexType>
|
||||||
|
|
||||||
|
<xs:complexType name="memcachedCacheType">
|
||||||
|
<xs:complexContent>
|
||||||
|
<xs:extension base="gbcs:cacheType">
|
||||||
|
<xs:sequence maxOccurs="unbounded">
|
||||||
|
<xs:element name="server" type="gbcs-memcached:memcachedServerType"/>
|
||||||
|
</xs:sequence>
|
||||||
|
<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:extension>
|
||||||
|
</xs:complexContent>
|
||||||
|
</xs:complexType>
|
||||||
|
|
||||||
|
<xs:simpleType name="compressionType">
|
||||||
|
<xs:restriction base="xs:token">
|
||||||
|
<xs:enumeration value="zip"/>
|
||||||
|
<xs:enumeration value="gzip"/>
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
|
||||||
|
</xs:schema>
|
@@ -1,5 +1,10 @@
|
|||||||
gbcs.version = 1.0.0
|
org.gradle.configuration-cache=false
|
||||||
|
org.gradle.parallel=true
|
||||||
|
org.gradle.caching=true
|
||||||
|
|
||||||
lys.version = 2024.12.21
|
gbcs.version = 0.0.1
|
||||||
|
|
||||||
|
lys.version = 2025.01.10
|
||||||
|
|
||||||
gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven
|
gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven
|
||||||
|
docker.registry.url=gitea.woggioni.net
|
||||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
7
gradlew
vendored
7
gradlew
vendored
@@ -15,6 +15,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@@ -55,7 +57,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -84,7 +86,8 @@ done
|
|||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||||
|
' "$PWD" ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
|
2
gradlew.bat
vendored
2
gradlew.bat
vendored
@@ -13,6 +13,8 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
Args=-H:Optimize=3 --gc=serial --libc=musl --static -H:TraceClassInitialization=io.netty.handler.ssl.BouncyCastleAlpnSslUtils
|
|
@@ -20,10 +20,16 @@ dependencyResolutionManagement {
|
|||||||
versionCatalogs {
|
versionCatalogs {
|
||||||
catalog {
|
catalog {
|
||||||
from group: 'com.lys', name: 'lys-catalog', version: getProperty('lys.version')
|
from group: 'com.lys', name: 'lys-catalog', version: getProperty('lys.version')
|
||||||
version('envelope', '2024.12.15')
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
rootProject.name = 'gbcs'
|
rootProject.name = 'gbcs'
|
||||||
|
|
||||||
|
include 'gbcs-api'
|
||||||
|
include 'gbcs-base'
|
||||||
|
include 'gbcs-memcached'
|
||||||
|
include 'gbcs-cli'
|
||||||
|
include 'docker'
|
||||||
|
include 'gbcs-client'
|
||||||
|
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
import net.woggioni.gbcs.url.ClasspathUrlStreamHandlerFactoryProvider;
|
import net.woggioni.gbcs.api.CacheProvider;
|
||||||
|
import net.woggioni.gbcs.cache.FileSystemCacheProvider;
|
||||||
|
|
||||||
open module net.woggioni.gbcs {
|
module net.woggioni.gbcs {
|
||||||
requires java.sql;
|
requires java.sql;
|
||||||
requires java.xml;
|
requires java.xml;
|
||||||
requires java.logging;
|
requires java.logging;
|
||||||
@@ -14,10 +15,14 @@ open module net.woggioni.gbcs {
|
|||||||
requires io.netty.codec;
|
requires io.netty.codec;
|
||||||
requires org.slf4j;
|
requires org.slf4j;
|
||||||
requires net.woggioni.jwo;
|
requires net.woggioni.jwo;
|
||||||
|
requires net.woggioni.gbcs.base;
|
||||||
|
requires net.woggioni.gbcs.api;
|
||||||
|
|
||||||
exports net.woggioni.gbcs;
|
exports net.woggioni.gbcs;
|
||||||
exports net.woggioni.gbcs.url;
|
|
||||||
// opens net.woggioni.gbcs to net.woggioni.envelope;
|
opens net.woggioni.gbcs;
|
||||||
provides java.net.URLStreamHandlerFactory with ClasspathUrlStreamHandlerFactoryProvider;
|
opens net.woggioni.gbcs.schema;
|
||||||
uses java.net.URLStreamHandlerFactory;
|
|
||||||
|
uses CacheProvider;
|
||||||
|
provides CacheProvider with FileSystemCacheProvider;
|
||||||
}
|
}
|
@@ -1,88 +0,0 @@
|
|||||||
package net.woggioni.gbcs;
|
|
||||||
|
|
||||||
import io.netty.bootstrap.ServerBootstrap;
|
|
||||||
import io.netty.channel.*;
|
|
||||||
import io.netty.channel.nio.NioEventLoopGroup;
|
|
||||||
import io.netty.channel.socket.SocketChannel;
|
|
||||||
import io.netty.channel.socket.nio.NioServerSocketChannel;
|
|
||||||
import io.netty.handler.codec.string.StringDecoder;
|
|
||||||
import io.netty.handler.codec.string.StringEncoder;
|
|
||||||
import io.netty.util.CharsetUtil;
|
|
||||||
|
|
||||||
public class NettyPingServer {
|
|
||||||
private final int port;
|
|
||||||
|
|
||||||
public NettyPingServer(int port) {
|
|
||||||
this.port = port;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void start() throws Exception {
|
|
||||||
// Create event loop groups for handling incoming connections and processing
|
|
||||||
EventLoopGroup bossGroup = new NioEventLoopGroup();
|
|
||||||
EventLoopGroup workerGroup = new NioEventLoopGroup();
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Create server bootstrap configuration
|
|
||||||
ServerBootstrap bootstrap = new ServerBootstrap()
|
|
||||||
.group(bossGroup, workerGroup)
|
|
||||||
.channel(NioServerSocketChannel.class)
|
|
||||||
.childHandler(new ChannelInitializer<SocketChannel>() {
|
|
||||||
@Override
|
|
||||||
protected void initChannel(SocketChannel ch) throws Exception {
|
|
||||||
ch.pipeline().addLast(
|
|
||||||
new StringDecoder(CharsetUtil.UTF_8),
|
|
||||||
new StringEncoder(CharsetUtil.UTF_8),
|
|
||||||
new PingServerHandler()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.option(ChannelOption.SO_BACKLOG, 128)
|
|
||||||
.childOption(ChannelOption.SO_KEEPALIVE, true);
|
|
||||||
|
|
||||||
// Bind and start the server
|
|
||||||
ChannelFuture future = bootstrap.bind(port).sync();
|
|
||||||
System.out.println("Ping Server started on port: " + port);
|
|
||||||
try(final var handle = new GradleBuildCacheServer.ServerHandle(future, bossGroup, workerGroup)) {
|
|
||||||
Thread.sleep(5000);
|
|
||||||
future.channel().close();
|
|
||||||
// Wait until the server socket is closed
|
|
||||||
future.channel().closeFuture().sync();
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
// Shutdown event loop groups
|
|
||||||
// workerGroup.shutdownGracefully();
|
|
||||||
// bossGroup.shutdownGracefully();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Custom handler for processing ping requests
|
|
||||||
private static class PingServerHandler extends SimpleChannelInboundHandler<String> {
|
|
||||||
@Override
|
|
||||||
protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception {
|
|
||||||
// Check if the received message is a ping request
|
|
||||||
if ("ping".equalsIgnoreCase(msg.trim())) {
|
|
||||||
// Respond with "pong"
|
|
||||||
ctx.writeAndFlush("pong\n");
|
|
||||||
System.out.println("Received ping, sent pong");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
|
|
||||||
// Log and close the connection in case of any errors
|
|
||||||
cause.printStackTrace();
|
|
||||||
ctx.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Main method to start the server
|
|
||||||
public static void main(String[] args) throws Exception {
|
|
||||||
int port = 8080; // Default port
|
|
||||||
if (args.length > 0) {
|
|
||||||
port = Integer.parseInt(args[0]);
|
|
||||||
}
|
|
||||||
|
|
||||||
new NettyPingServer(port).start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@@ -1,46 +0,0 @@
|
|||||||
package net.woggioni.gbcs.url;
|
|
||||||
|
|
||||||
import net.woggioni.jwo.Fun;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.net.URLConnection;
|
|
||||||
import java.net.URLStreamHandler;
|
|
||||||
import java.net.URLStreamHandlerFactory;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
public class ClasspathUrlStreamHandlerFactoryProvider implements URLStreamHandlerFactory {
|
|
||||||
|
|
||||||
private static class Handler extends URLStreamHandler {
|
|
||||||
private final ClassLoader classLoader;
|
|
||||||
|
|
||||||
public Handler() {
|
|
||||||
this.classLoader = getClass().getClassLoader();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Handler(ClassLoader classLoader) {
|
|
||||||
this.classLoader = classLoader;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected URLConnection openConnection(URL u) throws IOException {
|
|
||||||
final URL resourceUrl = classLoader.getResource(u.getPath());
|
|
||||||
return Optional.ofNullable(resourceUrl)
|
|
||||||
.map((Fun<URL, URLConnection>) URL::openConnection)
|
|
||||||
.orElseThrow(IOException::new);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public URLStreamHandler createURLStreamHandler(String protocol) {
|
|
||||||
URLStreamHandler result;
|
|
||||||
switch (protocol) {
|
|
||||||
case "classpath":
|
|
||||||
result = new Handler();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
result = null;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
@@ -12,7 +12,6 @@ import io.netty.channel.ChannelInitializer
|
|||||||
import io.netty.channel.ChannelOption
|
import io.netty.channel.ChannelOption
|
||||||
import io.netty.channel.ChannelPromise
|
import io.netty.channel.ChannelPromise
|
||||||
import io.netty.channel.DefaultFileRegion
|
import io.netty.channel.DefaultFileRegion
|
||||||
import io.netty.channel.EventLoopGroup
|
|
||||||
import io.netty.channel.SimpleChannelInboundHandler
|
import io.netty.channel.SimpleChannelInboundHandler
|
||||||
import io.netty.channel.nio.NioEventLoopGroup
|
import io.netty.channel.nio.NioEventLoopGroup
|
||||||
import io.netty.channel.socket.nio.NioServerSocketChannel
|
import io.netty.channel.socket.nio.NioServerSocketChannel
|
||||||
@@ -42,27 +41,34 @@ import io.netty.handler.stream.ChunkedNioStream
|
|||||||
import io.netty.handler.stream.ChunkedWriteHandler
|
import io.netty.handler.stream.ChunkedWriteHandler
|
||||||
import io.netty.util.concurrent.DefaultEventExecutorGroup
|
import io.netty.util.concurrent.DefaultEventExecutorGroup
|
||||||
import io.netty.util.concurrent.EventExecutorGroup
|
import io.netty.util.concurrent.EventExecutorGroup
|
||||||
import net.woggioni.gbcs.cache.Cache
|
import net.woggioni.gbcs.api.Cache
|
||||||
import net.woggioni.gbcs.cache.FileSystemCache
|
import net.woggioni.gbcs.api.Configuration
|
||||||
import net.woggioni.gbcs.configuration.Configuration
|
import net.woggioni.gbcs.api.Role
|
||||||
import net.woggioni.gbcs.url.ClasspathUrlStreamHandlerFactoryProvider
|
import net.woggioni.gbcs.api.exception.ContentTooLargeException
|
||||||
import net.woggioni.jwo.Application
|
import net.woggioni.gbcs.auth.AbstractNettyHttpAuthenticator
|
||||||
|
import net.woggioni.gbcs.auth.Authorizer
|
||||||
|
import net.woggioni.gbcs.auth.ClientCertificateValidator
|
||||||
|
import net.woggioni.gbcs.auth.RoleAuthorizer
|
||||||
|
import net.woggioni.gbcs.base.GBCS.toUrl
|
||||||
|
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
|
import net.woggioni.jwo.JWO
|
||||||
import net.woggioni.jwo.Tuple2
|
import net.woggioni.jwo.Tuple2
|
||||||
|
import java.io.OutputStream
|
||||||
import java.net.InetSocketAddress
|
import java.net.InetSocketAddress
|
||||||
import java.net.URI
|
|
||||||
import java.net.URL
|
|
||||||
import java.net.URLStreamHandlerFactory
|
|
||||||
import java.nio.channels.FileChannel
|
import java.nio.channels.FileChannel
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import java.security.KeyStore
|
import java.security.KeyStore
|
||||||
import java.security.MessageDigest
|
|
||||||
import java.security.PrivateKey
|
import java.security.PrivateKey
|
||||||
import java.security.cert.X509Certificate
|
import java.security.cert.X509Certificate
|
||||||
import java.util.Arrays
|
import java.util.Arrays
|
||||||
import java.util.Base64
|
import java.util.Base64
|
||||||
import java.util.concurrent.Executors
|
|
||||||
import java.util.regex.Matcher
|
import java.util.regex.Matcher
|
||||||
import java.util.regex.Pattern
|
import java.util.regex.Pattern
|
||||||
import javax.naming.ldap.LdapName
|
import javax.naming.ldap.LdapName
|
||||||
@@ -96,6 +102,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
private class ClientCertificateAuthenticator(
|
private class ClientCertificateAuthenticator(
|
||||||
authorizer: Authorizer,
|
authorizer: Authorizer,
|
||||||
private val sslEngine: SSLEngine,
|
private val sslEngine: SSLEngine,
|
||||||
|
private val anonymousUserRoles: Set<Role>?,
|
||||||
private val userExtractor: Configuration.UserExtractor?,
|
private val userExtractor: Configuration.UserExtractor?,
|
||||||
private val groupExtractor: Configuration.GroupExtractor?,
|
private val groupExtractor: Configuration.GroupExtractor?,
|
||||||
) : AbstractNettyHttpAuthenticator(authorizer) {
|
) : AbstractNettyHttpAuthenticator(authorizer) {
|
||||||
@@ -106,16 +113,16 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
|
|
||||||
override fun authenticate(ctx: ChannelHandlerContext, req: HttpRequest): Set<Role>? {
|
override fun authenticate(ctx: ChannelHandlerContext, req: HttpRequest): Set<Role>? {
|
||||||
return try {
|
return try {
|
||||||
sslEngine.session.peerCertificates
|
sslEngine.session.peerCertificates.takeIf {
|
||||||
} catch (es : SSLPeerUnverifiedException) {
|
|
||||||
null
|
|
||||||
}?.takeIf {
|
|
||||||
it.isNotEmpty()
|
it.isNotEmpty()
|
||||||
}?.let { peerCertificates ->
|
}?.let { peerCertificates ->
|
||||||
val clientCertificate = peerCertificates.first() as X509Certificate
|
val clientCertificate = peerCertificates.first() as X509Certificate
|
||||||
val user = userExtractor?.extract(clientCertificate)
|
val user = userExtractor?.extract(clientCertificate)
|
||||||
val group = groupExtractor?.extract(clientCertificate)
|
val group = groupExtractor?.extract(clientCertificate)
|
||||||
(group?.roles ?: emptySet()) + (user?.roles ?: emptySet())
|
(group?.roles ?: emptySet()) + (user?.roles ?: emptySet())
|
||||||
|
} ?: anonymousUserRoles
|
||||||
|
} catch (es: SSLPeerUnverifiedException) {
|
||||||
|
anonymousUserRoles
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -133,21 +140,21 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
log.debug(ctx) {
|
log.debug(ctx) {
|
||||||
"Missing Authorization header"
|
"Missing Authorization header"
|
||||||
}
|
}
|
||||||
return null
|
return users[""]?.roles
|
||||||
}
|
}
|
||||||
val cursor = authorizationHeader.indexOf(' ')
|
val cursor = authorizationHeader.indexOf(' ')
|
||||||
if (cursor < 0) {
|
if (cursor < 0) {
|
||||||
log.debug(ctx) {
|
log.debug(ctx) {
|
||||||
"Invalid Authorization header: '$authorizationHeader'"
|
"Invalid Authorization header: '$authorizationHeader'"
|
||||||
}
|
}
|
||||||
return null
|
return users[""]?.roles
|
||||||
}
|
}
|
||||||
val authenticationType = authorizationHeader.substring(0, cursor)
|
val authenticationType = authorizationHeader.substring(0, cursor)
|
||||||
if ("Basic" != authenticationType) {
|
if ("Basic" != authenticationType) {
|
||||||
log.debug(ctx) {
|
log.debug(ctx) {
|
||||||
"Invalid authentication type header: '$authenticationType'"
|
"Invalid authentication type header: '$authenticationType'"
|
||||||
}
|
}
|
||||||
return null
|
return users[""]?.roles
|
||||||
}
|
}
|
||||||
val (username, password) = Base64.getDecoder().decode(authorizationHeader.substring(cursor + 1))
|
val (username, password) = Base64.getDecoder().decode(authorizationHeader.substring(cursor + 1))
|
||||||
.let(::String)
|
.let(::String)
|
||||||
@@ -171,8 +178,12 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private class ServerInitializer(private val cfg: Configuration) : ChannelInitializer<Channel>() {
|
private class ServerInitializer(
|
||||||
|
private val cfg: Configuration,
|
||||||
|
private val eventExecutorGroup: EventExecutorGroup
|
||||||
|
) : ChannelInitializer<Channel>() {
|
||||||
|
|
||||||
|
companion object {
|
||||||
private fun createSslCtx(tls: Configuration.Tls): SslContext {
|
private fun createSslCtx(tls: Configuration.Tls): SslContext {
|
||||||
val keyStore = tls.keyStore
|
val keyStore = tls.keyStore
|
||||||
return if (keyStore == null) {
|
return if (keyStore == null) {
|
||||||
@@ -180,20 +191,19 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
} else {
|
} else {
|
||||||
val javaKeyStore = loadKeystore(keyStore.file, keyStore.password)
|
val javaKeyStore = loadKeystore(keyStore.file, keyStore.password)
|
||||||
val serverKey = javaKeyStore.getKey(
|
val serverKey = javaKeyStore.getKey(
|
||||||
keyStore.keyAlias, keyStore.keyPassword?.let(String::toCharArray)
|
keyStore.keyAlias, (keyStore.keyPassword ?: "").let(String::toCharArray)
|
||||||
) as PrivateKey
|
) as PrivateKey
|
||||||
val serverCert: Array<X509Certificate> =
|
val serverCert: Array<X509Certificate> =
|
||||||
Arrays.stream(javaKeyStore.getCertificateChain(keyStore.keyAlias))
|
Arrays.stream(javaKeyStore.getCertificateChain(keyStore.keyAlias))
|
||||||
.map { it as X509Certificate }
|
.map { it as X509Certificate }
|
||||||
.toArray { size -> Array<X509Certificate?>(size) { null } }
|
.toArray { size -> Array<X509Certificate?>(size) { null } }
|
||||||
SslContextBuilder.forServer(serverKey, *serverCert).apply {
|
SslContextBuilder.forServer(serverKey, *serverCert).apply {
|
||||||
if (tls.verifyClients) {
|
if (tls.isVerifyClients) {
|
||||||
clientAuth(ClientAuth.OPTIONAL)
|
clientAuth(ClientAuth.OPTIONAL)
|
||||||
val trustStore = tls.trustStore
|
tls.trustStore?.let { trustStore ->
|
||||||
if (trustStore != null) {
|
|
||||||
val ts = loadKeystore(trustStore.file, trustStore.password)
|
val ts = loadKeystore(trustStore.file, trustStore.password)
|
||||||
trustManager(
|
trustManager(
|
||||||
ClientCertificateValidator.getTrustManager(ts, trustStore.checkCertificateStatus)
|
ClientCertificateValidator.getTrustManager(ts, trustStore.isCheckCertificateStatus)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -201,11 +211,6 @@ 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 {
|
fun loadKeystore(file: Path, password: String?): KeyStore {
|
||||||
val ext = JWO.splitExtension(file)
|
val ext = JWO.splitExtension(file)
|
||||||
.map(Tuple2<String, String>::get_2)
|
.map(Tuple2<String, String>::get_2)
|
||||||
@@ -228,6 +233,8 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private val sslContext: SslContext? = cfg.tls?.let(Companion::createSslCtx)
|
||||||
|
|
||||||
private fun userExtractor(authentication: Configuration.ClientCertificateAuthentication) =
|
private fun userExtractor(authentication: Configuration.ClientCertificateAuthentication) =
|
||||||
authentication.userExtractor?.let { extractor ->
|
authentication.userExtractor?.let { extractor ->
|
||||||
val pattern = Pattern.compile(extractor.pattern)
|
val pattern = Pattern.compile(extractor.pattern)
|
||||||
@@ -259,20 +266,19 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
override fun initChannel(ch: Channel) {
|
override fun initChannel(ch: Channel) {
|
||||||
val pipeline = ch.pipeline()
|
val pipeline = ch.pipeline()
|
||||||
val auth = cfg.authentication
|
val auth = cfg.authentication
|
||||||
var authenticator : AbstractNettyHttpAuthenticator? = null
|
var authenticator: AbstractNettyHttpAuthenticator? = null
|
||||||
if (auth is Configuration.BasicAuthentication) {
|
if (auth is Configuration.BasicAuthentication) {
|
||||||
val roleAuthorizer = RoleAuthorizer()
|
authenticator = (NettyHttpBasicAuthenticator(cfg.users, RoleAuthorizer()))
|
||||||
authenticator = (NettyHttpBasicAuthenticator(cfg.users, roleAuthorizer))
|
|
||||||
}
|
}
|
||||||
if (sslContext != null) {
|
if (sslContext != null) {
|
||||||
val sslHandler = sslContext.newHandler(ch.alloc())
|
val sslHandler = sslContext.newHandler(ch.alloc())
|
||||||
pipeline.addLast(sslHandler)
|
pipeline.addLast(sslHandler)
|
||||||
|
|
||||||
if(auth is Configuration.ClientCertificateAuthentication) {
|
if (auth is Configuration.ClientCertificateAuthentication) {
|
||||||
val roleAuthorizer = RoleAuthorizer()
|
|
||||||
authenticator = ClientCertificateAuthenticator(
|
authenticator = ClientCertificateAuthenticator(
|
||||||
roleAuthorizer,
|
RoleAuthorizer(),
|
||||||
sslHandler.engine(),
|
sslHandler.engine(),
|
||||||
|
cfg.users[""]?.roles,
|
||||||
userExtractor(auth),
|
userExtractor(auth),
|
||||||
groupExtractor(auth)
|
groupExtractor(auth)
|
||||||
)
|
)
|
||||||
@@ -282,16 +288,12 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
pipeline.addLast(HttpChunkContentCompressor(1024))
|
pipeline.addLast(HttpChunkContentCompressor(1024))
|
||||||
pipeline.addLast(ChunkedWriteHandler())
|
pipeline.addLast(ChunkedWriteHandler())
|
||||||
pipeline.addLast(HttpObjectAggregator(Int.MAX_VALUE))
|
pipeline.addLast(HttpObjectAggregator(Int.MAX_VALUE))
|
||||||
authenticator?.let{
|
authenticator?.let {
|
||||||
pipeline.addLast(it)
|
pipeline.addLast(it)
|
||||||
}
|
}
|
||||||
val cacheImplementation = when(val cache = cfg.cache) {
|
val cacheImplementation = cfg.cache.materialize()
|
||||||
is Configuration.FileSystemCache -> {
|
val prefix = Path.of("/").resolve(Path.of(cfg.serverPath ?: "/"))
|
||||||
FileSystemCache(cache.root, cache.maxAge)
|
pipeline.addLast(eventExecutorGroup, ServerHandler(cacheImplementation, prefix))
|
||||||
}
|
|
||||||
else -> throw NotImplementedError()
|
|
||||||
}
|
|
||||||
pipeline.addLast(group, ServerHandler(cacheImplementation, cfg.serverPath))
|
|
||||||
pipeline.addLast(ExceptionHandler())
|
pipeline.addLast(ExceptionHandler())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -305,6 +307,12 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
headers()[HttpHeaderNames.CONTENT_LENGTH] = "0"
|
headers()[HttpHeaderNames.CONTENT_LENGTH] = "0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private val TOO_BIG: FullHttpResponse = DefaultFullHttpResponse(
|
||||||
|
HttpVersion.HTTP_1_1, HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE, Unpooled.EMPTY_BUFFER
|
||||||
|
).apply {
|
||||||
|
headers()[HttpHeaderNames.CONTENT_LENGTH] = "0"
|
||||||
|
}
|
||||||
|
|
||||||
override fun exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable) {
|
override fun exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable) {
|
||||||
when (cause) {
|
when (cause) {
|
||||||
is DecoderException -> {
|
is DecoderException -> {
|
||||||
@@ -317,6 +325,11 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
.addListener(ChannelFutureListener.CLOSE_ON_FAILURE)
|
.addListener(ChannelFutureListener.CLOSE_ON_FAILURE)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is ContentTooLargeException -> {
|
||||||
|
ctx.writeAndFlush(TOO_BIG.retainedDuplicate())
|
||||||
|
.addListener(ChannelFutureListener.CLOSE_ON_FAILURE)
|
||||||
|
}
|
||||||
|
|
||||||
else -> {
|
else -> {
|
||||||
log.error(cause.message, cause)
|
log.error(cause.message, cause)
|
||||||
ctx.close()
|
ctx.close()
|
||||||
@@ -325,27 +338,22 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private class ServerHandler(private val cache: Cache, private val serverPrefix: String?) :
|
private class ServerHandler(private val cache: Cache, private val serverPrefix: Path) :
|
||||||
SimpleChannelInboundHandler<FullHttpRequest>() {
|
SimpleChannelInboundHandler<FullHttpRequest>() {
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private val log = contextLogger()
|
private val log = contextLogger()
|
||||||
|
|
||||||
private fun splitPath(req: HttpRequest): Pair<String?, String> {
|
|
||||||
val uri = req.uri()
|
|
||||||
val i = uri.lastIndexOf('/')
|
|
||||||
if (i < 0) throw RuntimeException(String.format("Malformed request URI: '%s'", uri))
|
|
||||||
return uri.substring(0, i).takeIf(String::isNotEmpty) to uri.substring(i + 1)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun channelRead0(ctx: ChannelHandlerContext, msg: FullHttpRequest) {
|
override fun channelRead0(ctx: ChannelHandlerContext, msg: FullHttpRequest) {
|
||||||
val keepAlive: Boolean = HttpUtil.isKeepAlive(msg)
|
val keepAlive: Boolean = HttpUtil.isKeepAlive(msg)
|
||||||
val method = msg.method()
|
val method = msg.method()
|
||||||
if (method === HttpMethod.GET) {
|
if (method === HttpMethod.GET) {
|
||||||
val (prefix, key) = splitPath(msg)
|
val path = Path.of(msg.uri())
|
||||||
|
val prefix = path.parent
|
||||||
|
val key = path.fileName.toString()
|
||||||
if (serverPrefix == prefix) {
|
if (serverPrefix == prefix) {
|
||||||
cache.get(digestString(key.toByteArray()))?.let { channel ->
|
cache.get(key)?.let { channel ->
|
||||||
log.debug(ctx) {
|
log.debug(ctx) {
|
||||||
"Cache hit for key '$key'"
|
"Cache hit for key '$key'"
|
||||||
}
|
}
|
||||||
@@ -369,6 +377,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
.addListener(ChannelFutureListener.CLOSE)
|
.addListener(ChannelFutureListener.CLOSE)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
else -> {
|
else -> {
|
||||||
ctx.write(ChunkedNioStream(channel))
|
ctx.write(ChunkedNioStream(channel))
|
||||||
ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT)
|
ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT)
|
||||||
@@ -391,13 +400,24 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
ctx.writeAndFlush(response)
|
ctx.writeAndFlush(response)
|
||||||
}
|
}
|
||||||
} else if (method === HttpMethod.PUT) {
|
} else if (method === HttpMethod.PUT) {
|
||||||
val (prefix, key) = splitPath(msg)
|
val path = Path.of(msg.uri())
|
||||||
|
val prefix = path.parent
|
||||||
|
val key = path.fileName.toString()
|
||||||
|
|
||||||
if (serverPrefix == prefix) {
|
if (serverPrefix == prefix) {
|
||||||
log.debug(ctx) {
|
log.debug(ctx) {
|
||||||
"Added value for key '$key' to build cache"
|
"Added value for key '$key' to build cache"
|
||||||
}
|
}
|
||||||
val content = msg.content()
|
val bodyBytes = msg.content().run {
|
||||||
cache.put(digestString(key.toByteArray()), content)
|
if (isDirect) {
|
||||||
|
ByteArray(readableBytes()).also {
|
||||||
|
readBytes(it)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
array()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cache.put(key, bodyBytes)
|
||||||
val response = DefaultFullHttpResponse(
|
val response = DefaultFullHttpResponse(
|
||||||
msg.protocolVersion(), HttpResponseStatus.CREATED,
|
msg.protocolVersion(), HttpResponseStatus.CREATED,
|
||||||
Unpooled.copiedBuffer(key.toByteArray())
|
Unpooled.copiedBuffer(key.toByteArray())
|
||||||
@@ -424,46 +444,50 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class ServerHandle(
|
class ServerHandle(
|
||||||
private val httpChannel: ChannelFuture,
|
httpChannelFuture: ChannelFuture,
|
||||||
private val bossGroup: EventLoopGroup,
|
private val executorGroups: Iterable<EventExecutorGroup>
|
||||||
private val workerGroup: EventLoopGroup
|
|
||||||
) : AutoCloseable {
|
) : AutoCloseable {
|
||||||
|
private val httpChannel: Channel = httpChannelFuture.channel()
|
||||||
|
|
||||||
private val closeFuture: ChannelFuture = httpChannel.channel().closeFuture()
|
private val closeFuture: ChannelFuture = httpChannel.closeFuture()
|
||||||
|
|
||||||
fun shutdown(): ChannelFuture {
|
fun shutdown(): ChannelFuture {
|
||||||
return httpChannel.channel().close()
|
return httpChannel.close()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun close() {
|
override fun close() {
|
||||||
try {
|
try {
|
||||||
closeFuture.sync()
|
closeFuture.sync()
|
||||||
} finally {
|
} finally {
|
||||||
val fut1 = workerGroup.shutdownGracefully()
|
executorGroups.forEach {
|
||||||
val fut2 = if (bossGroup !== workerGroup) {
|
it.shutdownGracefully().sync()
|
||||||
bossGroup.shutdownGracefully()
|
}
|
||||||
} else null
|
}
|
||||||
fut1.sync()
|
log.info {
|
||||||
fut2?.sync()
|
"GradleBuildCacheServer has been gracefully shut down"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun run(): ServerHandle {
|
fun run(): ServerHandle {
|
||||||
// Create the multithreaded event loops for the server
|
// Create the multithreaded event loops for the server
|
||||||
val bossGroup = NioEventLoopGroup()
|
val bossGroup = NioEventLoopGroup(0)
|
||||||
val serverSocketChannel = NioServerSocketChannel::class.java
|
val serverSocketChannel = NioServerSocketChannel::class.java
|
||||||
val workerGroup = if (cfg.useVirtualThread) {
|
val workerGroup = bossGroup
|
||||||
NioEventLoopGroup(0, Executors.newVirtualThreadPerTaskExecutor())
|
val eventExecutorGroup = run {
|
||||||
|
val threadFactory = if (cfg.isUseVirtualThread) {
|
||||||
|
Thread.ofVirtual().factory()
|
||||||
} else {
|
} else {
|
||||||
NioEventLoopGroup(0, Executors.newWorkStealingPool())
|
null
|
||||||
|
}
|
||||||
|
DefaultEventExecutorGroup(Runtime.getRuntime().availableProcessors(), threadFactory)
|
||||||
}
|
}
|
||||||
// A helper class that simplifies server configuration
|
// A helper class that simplifies server configuration
|
||||||
val bootstrap = ServerBootstrap().apply {
|
val bootstrap = ServerBootstrap().apply {
|
||||||
// Configure the server
|
// Configure the server
|
||||||
group(bossGroup, workerGroup)
|
group(bossGroup, workerGroup)
|
||||||
channel(serverSocketChannel)
|
channel(serverSocketChannel)
|
||||||
childHandler(ServerInitializer(cfg))
|
childHandler(ServerInitializer(cfg, eventExecutorGroup))
|
||||||
option(ChannelOption.SO_BACKLOG, 128)
|
option(ChannelOption.SO_BACKLOG, 128)
|
||||||
childOption(ChannelOption.SO_KEEPALIVE, true)
|
childOption(ChannelOption.SO_KEEPALIVE, true)
|
||||||
}
|
}
|
||||||
@@ -472,109 +496,27 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
// Bind and start to accept incoming connections.
|
// Bind and start to accept incoming connections.
|
||||||
val bindAddress = InetSocketAddress(cfg.host, cfg.port)
|
val bindAddress = InetSocketAddress(cfg.host, cfg.port)
|
||||||
val httpChannel = bootstrap.bind(bindAddress).sync()
|
val httpChannel = bootstrap.bind(bindAddress).sync()
|
||||||
return ServerHandle(httpChannel, bossGroup, workerGroup)
|
log.info {
|
||||||
|
"GradleBuildCacheServer is listening on ${cfg.host}:${cfg.port}"
|
||||||
|
}
|
||||||
|
return ServerHandle(httpChannel, setOf(bossGroup, workerGroup, eventExecutorGroup))
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|
||||||
private fun String.toUrl() : URL = URL.of(URI(this), null)
|
|
||||||
|
|
||||||
private val log by lazy {
|
|
||||||
contextLogger()
|
|
||||||
}
|
|
||||||
|
|
||||||
private const val PROTOCOL_HANDLER = "java.protocol.handler.pkgs"
|
|
||||||
private const val HANDLERS_PACKAGE = "net.woggioni.gbcs.url"
|
|
||||||
|
|
||||||
val CONFIGURATION_SCHEMA_URL by lazy {
|
|
||||||
"classpath:net/woggioni/gbcs/gbcs.xsd".toUrl()
|
|
||||||
}
|
|
||||||
val DEFAULT_CONFIGURATION_URL by lazy { "classpath:net/woggioni/gbcs/gbcs-default.xml".toUrl() }
|
val DEFAULT_CONFIGURATION_URL by lazy { "classpath:net/woggioni/gbcs/gbcs-default.xml".toUrl() }
|
||||||
|
|
||||||
/**
|
fun loadConfiguration(configurationFile: Path): Configuration {
|
||||||
* Reset any cached handlers just in case a jar protocol has already been used. We
|
val doc = Files.newInputStream(configurationFile).use {
|
||||||
* reset the handler by trying to set a null [URLStreamHandlerFactory] which
|
Xml.parseXml(configurationFile.toUri().toURL(), it)
|
||||||
* should have no effect other than clearing the handlers cache.
|
|
||||||
*/
|
|
||||||
private fun resetCachedUrlHandlers() {
|
|
||||||
try {
|
|
||||||
URL.setURLStreamHandlerFactory(null)
|
|
||||||
} catch (ex: Error) {
|
|
||||||
// Ignore
|
|
||||||
}
|
}
|
||||||
|
return Parser.parse(doc)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun registerUrlProtocolHandler() {
|
fun dumpConfiguration(conf: Configuration, outputStream: OutputStream) {
|
||||||
val handlers = System.getProperty(PROTOCOL_HANDLER, "")
|
Xml.write(Serializer.serialize(conf), outputStream)
|
||||||
System.setProperty(
|
|
||||||
PROTOCOL_HANDLER,
|
|
||||||
if (handlers == null || handlers.isEmpty()) HANDLERS_PACKAGE else "$handlers|$HANDLERS_PACKAGE"
|
|
||||||
)
|
|
||||||
resetCachedUrlHandlers()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun loadConfiguration(args: Array<String>): Configuration {
|
private val log = contextLogger()
|
||||||
// registerUrlProtocolHandler()
|
|
||||||
URL.setURLStreamHandlerFactory(ClasspathUrlStreamHandlerFactoryProvider())
|
|
||||||
// Thread.currentThread().contextClassLoader = GradleBuildCacheServer::class.java.classLoader
|
|
||||||
val app = Application.builder("gbcs")
|
|
||||||
.configurationDirectoryEnvVar("GBCS_CONFIGURATION_DIR")
|
|
||||||
.configurationDirectoryPropertyKey("net.woggioni.gbcs.conf.dir")
|
|
||||||
.build()
|
|
||||||
val confDir = app.computeConfigurationDirectory()
|
|
||||||
val configurationFile = confDir.resolve("gbcs.xml")
|
|
||||||
if (!Files.exists(configurationFile)) {
|
|
||||||
Files.createDirectories(confDir)
|
|
||||||
val defaultConfigurationFileResource = DEFAULT_CONFIGURATION_URL
|
|
||||||
Files.newOutputStream(configurationFile).use { outputStream ->
|
|
||||||
defaultConfigurationFileResource.openStream().use { inputStream ->
|
|
||||||
JWO.copy(inputStream, outputStream)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// val schemaUrl = javaClass.getResource("/net/woggioni/gbcs/gbcs.xsd")
|
|
||||||
val schemaUrl = CONFIGURATION_SCHEMA_URL
|
|
||||||
val dbf = Xml.newDocumentBuilderFactory(schemaUrl)
|
|
||||||
// dbf.schema = Xml.getSchema(this::class.java.module.getResourceAsStream("/net/woggioni/gbcs/gbcs.xsd"))
|
|
||||||
dbf.schema = Xml.getSchema(schemaUrl)
|
|
||||||
val db = dbf.newDocumentBuilder().apply {
|
|
||||||
setErrorHandler(Xml.ErrorHandler(schemaUrl))
|
|
||||||
}
|
|
||||||
val doc = Files.newInputStream(configurationFile).use(db::parse)
|
|
||||||
return Configuration.parse(doc)
|
|
||||||
}
|
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
fun main(args: Array<String>) {
|
|
||||||
val configuration = loadConfiguration(args)
|
|
||||||
GradleBuildCacheServer(configuration).run().use {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun digest(
|
|
||||||
data: ByteArray,
|
|
||||||
md: MessageDigest = MessageDigest.getInstance("MD5")
|
|
||||||
): ByteArray {
|
|
||||||
md.update(data)
|
|
||||||
return md.digest()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun digestString(
|
|
||||||
data: ByteArray,
|
|
||||||
md: MessageDigest = MessageDigest.getInstance("MD5")
|
|
||||||
): String {
|
|
||||||
return JWO.bytesToHex(digest(data, md))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
object GraalNativeImageConfiguration {
|
|
||||||
@JvmStatic
|
|
||||||
fun main(args: Array<String>) {
|
|
||||||
val conf = GradleBuildCacheServer.loadConfiguration(args)
|
|
||||||
GradleBuildCacheServer(conf).run().use {
|
|
||||||
Thread.sleep(3000)
|
|
||||||
it.shutdown()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -2,87 +2,7 @@ package net.woggioni.gbcs
|
|||||||
|
|
||||||
import io.netty.channel.ChannelHandlerContext
|
import io.netty.channel.ChannelHandlerContext
|
||||||
import org.slf4j.Logger
|
import org.slf4j.Logger
|
||||||
import org.slf4j.LoggerFactory
|
|
||||||
import java.net.InetSocketAddress
|
import java.net.InetSocketAddress
|
||||||
import java.nio.file.Files
|
|
||||||
import java.nio.file.Path
|
|
||||||
import java.util.logging.LogManager
|
|
||||||
|
|
||||||
inline fun <reified T> T.contextLogger() = LoggerFactory.getLogger(T::class.java)
|
|
||||||
|
|
||||||
inline fun Logger.traceParam(messageBuilder : () -> Pair<String, Array<Any>>) {
|
|
||||||
if(isTraceEnabled) {
|
|
||||||
val (format, params) = messageBuilder()
|
|
||||||
trace(format, params)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun Logger.debugParam(messageBuilder : () -> Pair<String, Array<Any>>) {
|
|
||||||
if(isDebugEnabled) {
|
|
||||||
val (format, params) = messageBuilder()
|
|
||||||
info(format, params)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun Logger.infoParam(messageBuilder : () -> Pair<String, Array<Any>>) {
|
|
||||||
if(isInfoEnabled) {
|
|
||||||
val (format, params) = messageBuilder()
|
|
||||||
info(format, params)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun Logger.warnParam(messageBuilder : () -> Pair<String, Array<Any>>) {
|
|
||||||
if(isWarnEnabled) {
|
|
||||||
val (format, params) = messageBuilder()
|
|
||||||
warn(format, params)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun Logger.errorParam(messageBuilder : () -> Pair<String, Array<Any>>) {
|
|
||||||
if(isErrorEnabled) {
|
|
||||||
val (format, params) = messageBuilder()
|
|
||||||
error(format, params)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
inline fun log(log : Logger,
|
|
||||||
filter : Logger.() -> Boolean,
|
|
||||||
loggerMethod : Logger.(String) -> Unit, messageBuilder : () -> String) {
|
|
||||||
if(log.filter()) {
|
|
||||||
log.loggerMethod(messageBuilder())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun Logger.trace(messageBuilder : () -> String) {
|
|
||||||
if(isTraceEnabled) {
|
|
||||||
trace(messageBuilder())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun Logger.debug(messageBuilder : () -> String) {
|
|
||||||
if(isDebugEnabled) {
|
|
||||||
debug(messageBuilder())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun Logger.info(messageBuilder : () -> String) {
|
|
||||||
if(isInfoEnabled) {
|
|
||||||
info(messageBuilder())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun Logger.warn(messageBuilder : () -> String) {
|
|
||||||
if(isWarnEnabled) {
|
|
||||||
warn(messageBuilder())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun Logger.error(messageBuilder : () -> String) {
|
|
||||||
if(isErrorEnabled) {
|
|
||||||
error(messageBuilder())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun Logger.trace(ctx : ChannelHandlerContext, messageBuilder : () -> String) {
|
inline fun Logger.trace(ctx : ChannelHandlerContext, messageBuilder : () -> String) {
|
||||||
log(this, ctx, { isTraceEnabled }, { trace(it) } , messageBuilder)
|
log(this, ctx, { isTraceEnabled }, { trace(it) } , messageBuilder)
|
||||||
@@ -108,24 +28,3 @@ inline fun log(log : Logger, ctx : ChannelHandlerContext,
|
|||||||
log.loggerMethod(clientAddress + " - " + messageBuilder())
|
log.loggerMethod(clientAddress + " - " + messageBuilder())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class LoggingConfig {
|
|
||||||
|
|
||||||
init {
|
|
||||||
val logManager = LogManager.getLogManager()
|
|
||||||
System.getProperty("log.config.source")?.let withSource@ { source ->
|
|
||||||
val urls = LoggingConfig::class.java.classLoader.getResources(source)
|
|
||||||
while(urls.hasMoreElements()) {
|
|
||||||
val url = urls.nextElement()
|
|
||||||
url.openStream().use { inputStream ->
|
|
||||||
logManager.readConfiguration(inputStream)
|
|
||||||
return@withSource
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Path.of(source).takeIf(Files::exists)
|
|
||||||
?.let(Files::newInputStream)
|
|
||||||
?.use(logManager::readConfiguration)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,5 +0,0 @@
|
|||||||
package net.woggioni.gbcs
|
|
||||||
|
|
||||||
enum class Role {
|
|
||||||
Reader, Writer
|
|
||||||
}
|
|
@@ -1,4 +1,4 @@
|
|||||||
package net.woggioni.gbcs
|
package net.woggioni.gbcs.auth
|
||||||
|
|
||||||
import io.netty.buffer.Unpooled
|
import io.netty.buffer.Unpooled
|
||||||
import io.netty.channel.ChannelFutureListener
|
import io.netty.channel.ChannelFutureListener
|
||||||
@@ -11,18 +11,13 @@ import io.netty.handler.codec.http.HttpRequest
|
|||||||
import io.netty.handler.codec.http.HttpResponseStatus
|
import io.netty.handler.codec.http.HttpResponseStatus
|
||||||
import io.netty.handler.codec.http.HttpVersion
|
import io.netty.handler.codec.http.HttpVersion
|
||||||
import io.netty.util.ReferenceCountUtil
|
import io.netty.util.ReferenceCountUtil
|
||||||
import java.security.SecureRandom
|
import net.woggioni.gbcs.api.Role
|
||||||
import java.security.spec.KeySpec
|
|
||||||
import java.util.Base64
|
|
||||||
import javax.crypto.SecretKeyFactory
|
|
||||||
import javax.crypto.spec.PBEKeySpec
|
|
||||||
|
|
||||||
|
|
||||||
abstract class AbstractNettyHttpAuthenticator(private val authorizer : Authorizer)
|
abstract class AbstractNettyHttpAuthenticator(private val authorizer : Authorizer)
|
||||||
: ChannelInboundHandlerAdapter() {
|
: ChannelInboundHandlerAdapter() {
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private const val KEY_LENGTH = 256
|
|
||||||
private val AUTHENTICATION_FAILED: FullHttpResponse = DefaultFullHttpResponse(
|
private val AUTHENTICATION_FAILED: FullHttpResponse = DefaultFullHttpResponse(
|
||||||
HttpVersion.HTTP_1_1, HttpResponseStatus.UNAUTHORIZED, Unpooled.EMPTY_BUFFER).apply {
|
HttpVersion.HTTP_1_1, HttpResponseStatus.UNAUTHORIZED, Unpooled.EMPTY_BUFFER).apply {
|
||||||
headers()[HttpHeaderNames.CONTENT_LENGTH] = "0"
|
headers()[HttpHeaderNames.CONTENT_LENGTH] = "0"
|
||||||
@@ -32,50 +27,6 @@ abstract class AbstractNettyHttpAuthenticator(private val authorizer : Authorize
|
|||||||
HttpVersion.HTTP_1_1, HttpResponseStatus.FORBIDDEN, Unpooled.EMPTY_BUFFER).apply {
|
HttpVersion.HTTP_1_1, HttpResponseStatus.FORBIDDEN, Unpooled.EMPTY_BUFFER).apply {
|
||||||
headers()[HttpHeaderNames.CONTENT_LENGTH] = "0"
|
headers()[HttpHeaderNames.CONTENT_LENGTH] = "0"
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun concat(arr1: ByteArray, arr2: ByteArray): ByteArray {
|
|
||||||
val result = ByteArray(arr1.size + arr2.size)
|
|
||||||
var j = 0
|
|
||||||
for(element in arr1) {
|
|
||||||
result[j] = element
|
|
||||||
j += 1
|
|
||||||
}
|
|
||||||
for(element in arr2) {
|
|
||||||
result[j] = element
|
|
||||||
j += 1
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
fun hashPassword(password : String, salt : String? = null) : String {
|
|
||||||
val actualSalt = salt?.let(Base64.getDecoder()::decode) ?: SecureRandom().run {
|
|
||||||
val result = ByteArray(16)
|
|
||||||
nextBytes(result)
|
|
||||||
result
|
|
||||||
}
|
|
||||||
val spec: KeySpec = PBEKeySpec(password.toCharArray(), actualSalt, 10, KEY_LENGTH)
|
|
||||||
val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1")
|
|
||||||
val hash = factory.generateSecret(spec).encoded
|
|
||||||
return String(Base64.getEncoder().encode(concat(hash, actualSalt)))
|
|
||||||
}
|
|
||||||
|
|
||||||
// fun decodePasswordHash(passwordHash : String) : Pair<String, String> {
|
|
||||||
// return passwordHash.indexOf(':')
|
|
||||||
// .takeIf { it > 0 }
|
|
||||||
// ?.let { sep ->
|
|
||||||
// passwordHash.substring(0, sep) to passwordHash.substring(sep)
|
|
||||||
// } ?: throw IllegalArgumentException("Failed to decode password hash")
|
|
||||||
// }
|
|
||||||
|
|
||||||
fun decodePasswordHash(passwordHash : String) : Pair<ByteArray, ByteArray> {
|
|
||||||
val decoded = Base64.getDecoder().decode(passwordHash)
|
|
||||||
val hash = ByteArray(KEY_LENGTH / 8)
|
|
||||||
val salt = ByteArray(decoded.size - KEY_LENGTH / 8)
|
|
||||||
System.arraycopy(decoded, 0, hash, 0, hash.size)
|
|
||||||
System.arraycopy(decoded, hash.size, salt, 0, salt.size)
|
|
||||||
return hash to salt
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@@ -1,6 +1,7 @@
|
|||||||
package net.woggioni.gbcs
|
package net.woggioni.gbcs.auth
|
||||||
|
|
||||||
import io.netty.handler.codec.http.HttpRequest
|
import io.netty.handler.codec.http.HttpRequest
|
||||||
|
import net.woggioni.gbcs.api.Role
|
||||||
|
|
||||||
fun interface Authorizer {
|
fun interface Authorizer {
|
||||||
fun authorize(roles : Set<Role>, request: HttpRequest) : Boolean
|
fun authorize(roles : Set<Role>, request: HttpRequest) : Boolean
|
@@ -1,16 +1,18 @@
|
|||||||
package net.woggioni.gbcs
|
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.KeyStore
|
||||||
import java.security.cert.CertPathValidator
|
import java.security.cert.CertPathValidator
|
||||||
|
import java.security.cert.CertPathValidatorException
|
||||||
|
import java.security.cert.CertificateException
|
||||||
import java.security.cert.CertificateFactory
|
import java.security.cert.CertificateFactory
|
||||||
import java.security.cert.PKIXParameters
|
import java.security.cert.PKIXParameters
|
||||||
import java.security.cert.PKIXRevocationChecker
|
import java.security.cert.PKIXRevocationChecker
|
||||||
import java.security.cert.X509Certificate
|
import java.security.cert.X509Certificate
|
||||||
import java.util.EnumSet
|
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.SSLSession
|
||||||
import javax.net.ssl.TrustManagerFactory
|
import javax.net.ssl.TrustManagerFactory
|
||||||
import javax.net.ssl.X509TrustManager
|
import javax.net.ssl.X509TrustManager
|
||||||
@@ -48,7 +50,11 @@ class ClientCertificateValidator private constructor(
|
|||||||
object : X509TrustManager {
|
object : X509TrustManager {
|
||||||
override fun checkClientTrusted(chain: Array<out X509Certificate>, authType: String) {
|
override fun checkClientTrusted(chain: Array<out X509Certificate>, authType: String) {
|
||||||
val clientCertificateChain = certificateFactory.generateCertPath(chain.toList())
|
val clientCertificateChain = certificateFactory.generateCertPath(chain.toList())
|
||||||
|
try {
|
||||||
validator.validate(clientCertificateChain, params)
|
validator.validate(clientCertificateChain, params)
|
||||||
|
} catch (ex : CertPathValidatorException) {
|
||||||
|
throw CertificateException(ex)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun checkServerTrusted(chain: Array<out X509Certificate>, authType: String) {
|
override fun checkServerTrusted(chain: Array<out X509Certificate>, authType: String) {
|
@@ -1,7 +1,8 @@
|
|||||||
package net.woggioni.gbcs
|
package net.woggioni.gbcs.auth
|
||||||
|
|
||||||
import io.netty.handler.codec.http.HttpMethod
|
import io.netty.handler.codec.http.HttpMethod
|
||||||
import io.netty.handler.codec.http.HttpRequest
|
import io.netty.handler.codec.http.HttpRequest
|
||||||
|
import net.woggioni.gbcs.api.Role
|
||||||
|
|
||||||
class RoleAuthorizer : Authorizer {
|
class RoleAuthorizer : Authorizer {
|
||||||
|
|
10
src/main/kotlin/net/woggioni/gbcs/cache/Cache.kt
vendored
10
src/main/kotlin/net/woggioni/gbcs/cache/Cache.kt
vendored
@@ -1,10 +0,0 @@
|
|||||||
package net.woggioni.gbcs.cache
|
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf
|
|
||||||
import java.nio.channels.ByteChannel
|
|
||||||
|
|
||||||
interface Cache {
|
|
||||||
fun get(key : String) : ByteChannel?
|
|
||||||
|
|
||||||
fun put(key : String, content : ByteBuf) : Unit
|
|
||||||
}
|
|
@@ -1,20 +1,32 @@
|
|||||||
package net.woggioni.gbcs.cache
|
package net.woggioni.gbcs.cache
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf
|
import net.woggioni.gbcs.api.Cache
|
||||||
import net.woggioni.gbcs.GradleBuildCacheServer.Companion.digestString
|
import net.woggioni.jwo.JWO
|
||||||
import net.woggioni.jwo.LockFile
|
import net.woggioni.jwo.LockFile
|
||||||
|
import java.nio.channels.Channels
|
||||||
import java.nio.channels.FileChannel
|
import java.nio.channels.FileChannel
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import java.nio.file.StandardCopyOption
|
import java.nio.file.StandardCopyOption
|
||||||
import java.nio.file.StandardOpenOption
|
import java.nio.file.StandardOpenOption
|
||||||
import java.nio.file.attribute.BasicFileAttributes
|
import java.nio.file.attribute.BasicFileAttributes
|
||||||
|
import java.security.MessageDigest
|
||||||
import java.time.Duration
|
import java.time.Duration
|
||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
import java.util.concurrent.atomic.AtomicReference
|
import java.util.concurrent.atomic.AtomicReference
|
||||||
|
import java.util.zip.Deflater
|
||||||
|
import java.util.zip.DeflaterOutputStream
|
||||||
|
import java.util.zip.Inflater
|
||||||
|
import java.util.zip.InflaterInputStream
|
||||||
|
|
||||||
|
|
||||||
class FileSystemCache(val root: Path, val maxAge: Duration) : Cache {
|
class FileSystemCache(
|
||||||
|
val root: Path,
|
||||||
|
val maxAge: Duration,
|
||||||
|
val digestAlgorithm: String?,
|
||||||
|
val compressionEnabled: Boolean,
|
||||||
|
val compressionLevel: Int
|
||||||
|
) : Cache {
|
||||||
|
|
||||||
private fun lockFilePath(key: String): Path = root.resolve("$key.lock")
|
private fun lockFilePath(key: String): Path = root.resolve("$key.lock")
|
||||||
|
|
||||||
@@ -22,41 +34,53 @@ class FileSystemCache(val root: Path, val maxAge: Duration) : Cache {
|
|||||||
Files.createDirectories(root)
|
Files.createDirectories(root)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun equals(other: Any?): Boolean {
|
|
||||||
return when (other) {
|
|
||||||
is FileSystemCache -> {
|
|
||||||
other.root == root && other.maxAge == maxAge
|
|
||||||
}
|
|
||||||
|
|
||||||
else -> false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun hashCode(): Int {
|
|
||||||
return root.hashCode() xor maxAge.hashCode()
|
|
||||||
}
|
|
||||||
|
|
||||||
private var nextGc = AtomicReference(Instant.now().plus(maxAge))
|
private var nextGc = AtomicReference(Instant.now().plus(maxAge))
|
||||||
|
|
||||||
override fun get(key: String) = LockFile.acquire(lockFilePath(key), true).use {
|
override fun get(key: String) = (digestAlgorithm
|
||||||
root.resolve(key).takeIf(Files::exists)?.let { FileChannel.open(it, StandardOpenOption.READ) }
|
?.let(MessageDigest::getInstance)
|
||||||
|
?.let { md ->
|
||||||
|
digestString(key.toByteArray(), md)
|
||||||
|
} ?: key).let { digest ->
|
||||||
|
LockFile.acquire(lockFilePath(digest), true).use {
|
||||||
|
root.resolve(digest).takeIf(Files::exists)?.let { file ->
|
||||||
|
if (compressionEnabled) {
|
||||||
|
val inflater = Inflater()
|
||||||
|
Channels.newChannel(InflaterInputStream(Files.newInputStream(file), inflater))
|
||||||
|
} else {
|
||||||
|
FileChannel.open(file, StandardOpenOption.READ)
|
||||||
|
}
|
||||||
|
}
|
||||||
}.also {
|
}.also {
|
||||||
gc()
|
gc()
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override fun put(key: String, content: ByteBuf) {
|
override fun put(key: String, content: ByteArray) {
|
||||||
LockFile.acquire(lockFilePath(key), false).use {
|
(digestAlgorithm
|
||||||
val file = root.resolve(key)
|
?.let(MessageDigest::getInstance)
|
||||||
|
?.let { md ->
|
||||||
|
digestString(key.toByteArray(), md)
|
||||||
|
} ?: key).let { digest ->
|
||||||
|
LockFile.acquire(lockFilePath(digest), false).use {
|
||||||
|
val file = root.resolve(digest)
|
||||||
val tmpFile = Files.createTempFile(root, null, ".tmp")
|
val tmpFile = Files.createTempFile(root, null, ".tmp")
|
||||||
try {
|
try {
|
||||||
Files.newOutputStream(tmpFile).use {
|
Files.newOutputStream(tmpFile).let {
|
||||||
content.readBytes(it, content.readableBytes())
|
if (compressionEnabled) {
|
||||||
|
val deflater = Deflater(compressionLevel)
|
||||||
|
DeflaterOutputStream(it, deflater)
|
||||||
|
} else {
|
||||||
|
it
|
||||||
|
}
|
||||||
|
}.use {
|
||||||
|
it.write(content)
|
||||||
}
|
}
|
||||||
Files.move(tmpFile, file, StandardCopyOption.ATOMIC_MOVE)
|
Files.move(tmpFile, file, StandardCopyOption.ATOMIC_MOVE)
|
||||||
} catch (t: Throwable) {
|
} catch (t: Throwable) {
|
||||||
Files.delete(tmpFile)
|
Files.delete(tmpFile)
|
||||||
throw t
|
throw t
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}.also {
|
}.also {
|
||||||
gc()
|
gc()
|
||||||
}
|
}
|
||||||
@@ -87,4 +111,23 @@ class FileSystemCache(val root: Path, val maxAge: Duration) : Cache {
|
|||||||
Files.delete(lockFile)
|
Files.delete(lockFile)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun close() {}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
fun digest(
|
||||||
|
data: ByteArray,
|
||||||
|
md: MessageDigest = MessageDigest.getInstance("MD5")
|
||||||
|
): ByteArray {
|
||||||
|
md.update(data)
|
||||||
|
return md.digest()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun digestString(
|
||||||
|
data: ByteArray,
|
||||||
|
md: MessageDigest = MessageDigest.getInstance("MD5")
|
||||||
|
): String {
|
||||||
|
return JWO.bytesToHex(digest(data, md))
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
27
src/main/kotlin/net/woggioni/gbcs/cache/FileSystemCacheConfiguration.kt
vendored
Normal file
27
src/main/kotlin/net/woggioni/gbcs/cache/FileSystemCacheConfiguration.kt
vendored
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
package net.woggioni.gbcs.cache
|
||||||
|
|
||||||
|
import net.woggioni.gbcs.api.Configuration
|
||||||
|
import net.woggioni.gbcs.base.GBCS
|
||||||
|
import net.woggioni.jwo.Application
|
||||||
|
import java.nio.file.Path
|
||||||
|
import java.time.Duration
|
||||||
|
|
||||||
|
data class FileSystemCacheConfiguration(
|
||||||
|
val root: Path?,
|
||||||
|
val maxAge: Duration,
|
||||||
|
val digestAlgorithm : String?,
|
||||||
|
val compressionEnabled: Boolean,
|
||||||
|
val compressionLevel: Int,
|
||||||
|
) : Configuration.Cache {
|
||||||
|
override fun materialize() = FileSystemCache(
|
||||||
|
root ?: Application.builder("gbcs").build().computeCacheDirectory(),
|
||||||
|
maxAge,
|
||||||
|
digestAlgorithm,
|
||||||
|
compressionEnabled,
|
||||||
|
compressionLevel
|
||||||
|
)
|
||||||
|
|
||||||
|
override fun getNamespaceURI() = GBCS.GBCS_NAMESPACE_URI
|
||||||
|
|
||||||
|
override fun getTypeName() = "fileSystemCacheType"
|
||||||
|
}
|
66
src/main/kotlin/net/woggioni/gbcs/cache/FileSystemCacheProvider.kt
vendored
Normal file
66
src/main/kotlin/net/woggioni/gbcs/cache/FileSystemCacheProvider.kt
vendored
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
package net.woggioni.gbcs.cache
|
||||||
|
|
||||||
|
import net.woggioni.gbcs.api.CacheProvider
|
||||||
|
import net.woggioni.gbcs.base.GBCS
|
||||||
|
import net.woggioni.gbcs.base.Xml
|
||||||
|
import org.w3c.dom.Document
|
||||||
|
import org.w3c.dom.Element
|
||||||
|
import java.nio.file.Path
|
||||||
|
import java.time.Duration
|
||||||
|
import java.util.zip.Deflater
|
||||||
|
|
||||||
|
class FileSystemCacheProvider : CacheProvider<FileSystemCacheConfiguration> {
|
||||||
|
|
||||||
|
override fun getXmlSchemaLocation() = "classpath:net/woggioni/gbcs/schema/gbcs.xsd"
|
||||||
|
|
||||||
|
override fun getXmlType() = "fileSystemCacheType"
|
||||||
|
|
||||||
|
override fun getXmlNamespace() = "urn:net.woggioni.gbcs"
|
||||||
|
|
||||||
|
override fun deserialize(el: Element): FileSystemCacheConfiguration {
|
||||||
|
val path = el.getAttribute("path")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
?.let(Path::of)
|
||||||
|
val maxAge = el.getAttribute("max-age")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
?.let(Duration::parse)
|
||||||
|
?: Duration.ofDays(1)
|
||||||
|
val enableCompression = el.getAttribute("enable-compression")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
?.let(String::toBoolean)
|
||||||
|
?: true
|
||||||
|
val compressionLevel = el.getAttribute("compression-level")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
?.let(String::toInt)
|
||||||
|
?: Deflater.DEFAULT_COMPRESSION
|
||||||
|
val digestAlgorithm = el.getAttribute("digest").takeIf(String::isNotEmpty) ?: "MD5"
|
||||||
|
|
||||||
|
return FileSystemCacheConfiguration(
|
||||||
|
path,
|
||||||
|
maxAge,
|
||||||
|
digestAlgorithm,
|
||||||
|
enableCompression,
|
||||||
|
compressionLevel
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun serialize(doc: Document, cache : FileSystemCacheConfiguration) = cache.run {
|
||||||
|
val result = doc.createElement("cache")
|
||||||
|
Xml.of(doc, result) {
|
||||||
|
val prefix = doc.lookupPrefix(GBCS.GBCS_NAMESPACE_URI)
|
||||||
|
attr("xs:type", "${prefix}:fileSystemCacheType", GBCS.XML_SCHEMA_NAMESPACE_URI)
|
||||||
|
attr("path", root.toString())
|
||||||
|
attr("max-age", maxAge.toString())
|
||||||
|
digestAlgorithm?.let { digestAlgorithm ->
|
||||||
|
attr("digest", digestAlgorithm)
|
||||||
|
}
|
||||||
|
attr("enable-compression", compressionEnabled.toString())
|
||||||
|
compressionLevel.takeIf {
|
||||||
|
it != Deflater.DEFAULT_COMPRESSION
|
||||||
|
}?.let {
|
||||||
|
attr("compression-level", it.toString())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,15 @@
|
|||||||
|
package net.woggioni.gbcs.configuration
|
||||||
|
|
||||||
|
import net.woggioni.gbcs.api.CacheProvider
|
||||||
|
import net.woggioni.gbcs.api.Configuration
|
||||||
|
import java.util.ServiceLoader
|
||||||
|
|
||||||
|
object CacheSerializers {
|
||||||
|
val index = (Configuration::class.java.module.layer?.let { layer ->
|
||||||
|
ServiceLoader.load(layer, CacheProvider::class.java)
|
||||||
|
} ?: ServiceLoader.load(CacheProvider::class.java))
|
||||||
|
.asSequence()
|
||||||
|
.map {
|
||||||
|
(it.xmlNamespace to it.xmlType) to it
|
||||||
|
}.toMap()
|
||||||
|
}
|
@@ -1,294 +0,0 @@
|
|||||||
package net.woggioni.gbcs.configuration
|
|
||||||
|
|
||||||
import net.woggioni.gbcs.Role
|
|
||||||
import net.woggioni.gbcs.Xml.Companion.asIterable
|
|
||||||
import org.w3c.dom.Document
|
|
||||||
import org.w3c.dom.Element
|
|
||||||
import java.nio.file.Path
|
|
||||||
import java.nio.file.Paths
|
|
||||||
import java.security.cert.X509Certificate
|
|
||||||
import java.time.Duration
|
|
||||||
|
|
||||||
data class Configuration private constructor(
|
|
||||||
val host: String,
|
|
||||||
val port: Int,
|
|
||||||
val serverPath: String?,
|
|
||||||
val users: Map<String, User>,
|
|
||||||
val groups: Map<String, Group>,
|
|
||||||
val cache: Cache,
|
|
||||||
val authentication : Authentication?,
|
|
||||||
val tls: Tls?,
|
|
||||||
val useVirtualThread: Boolean
|
|
||||||
) {
|
|
||||||
|
|
||||||
data class Group(val name: String, val roles: Set<Role>) {
|
|
||||||
override fun hashCode(): Int {
|
|
||||||
return name.hashCode()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data class User(val name: String, val password: String?, val groups: Set<Group>) {
|
|
||||||
override fun hashCode(): Int {
|
|
||||||
return name.hashCode()
|
|
||||||
}
|
|
||||||
|
|
||||||
val roles : Set<Role>
|
|
||||||
get() = groups.asSequence().flatMap { it.roles }.toSet()
|
|
||||||
}
|
|
||||||
|
|
||||||
data class HostAndPort(val host: String, val port: Int) {
|
|
||||||
override fun toString() = "$host:$port"
|
|
||||||
}
|
|
||||||
|
|
||||||
fun interface UserExtractor {
|
|
||||||
fun extract(cert :X509Certificate) : User
|
|
||||||
}
|
|
||||||
|
|
||||||
fun interface GroupExtractor {
|
|
||||||
fun extract(cert :X509Certificate) : Group
|
|
||||||
}
|
|
||||||
|
|
||||||
data class Tls(
|
|
||||||
val keyStore: KeyStore?,
|
|
||||||
val trustStore: TrustStore?,
|
|
||||||
val verifyClients: Boolean,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class KeyStore(
|
|
||||||
val file: Path,
|
|
||||||
val password: String?,
|
|
||||||
val keyAlias: String,
|
|
||||||
val keyPassword: String?
|
|
||||||
)
|
|
||||||
|
|
||||||
data class TrustStore(
|
|
||||||
val file: Path,
|
|
||||||
val password: String?,
|
|
||||||
val checkCertificateStatus: Boolean
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
data class TlsCertificateExtractor(val rdnType : String, val pattern : String)
|
|
||||||
|
|
||||||
interface Authentication
|
|
||||||
|
|
||||||
class BasicAuthentication : Authentication
|
|
||||||
|
|
||||||
data class ClientCertificateAuthentication(
|
|
||||||
val userExtractor: TlsCertificateExtractor?,
|
|
||||||
val groupExtractor: TlsCertificateExtractor?) : Authentication
|
|
||||||
|
|
||||||
|
|
||||||
interface Cache
|
|
||||||
|
|
||||||
data class FileSystemCache(val root: Path, val maxAge: Duration) : Cache
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
|
|
||||||
fun of(
|
|
||||||
host: String,
|
|
||||||
port: Int,
|
|
||||||
serverPath: String?,
|
|
||||||
users: Map<String, User>,
|
|
||||||
groups: Map<String, Group>,
|
|
||||||
cache: Cache,
|
|
||||||
authentication : Authentication?,
|
|
||||||
tls: Tls?,
|
|
||||||
useVirtualThread: Boolean
|
|
||||||
) = Configuration(
|
|
||||||
host,
|
|
||||||
port,
|
|
||||||
serverPath?.takeIf { it.isNotEmpty() && it != "/" },
|
|
||||||
users,
|
|
||||||
groups,
|
|
||||||
cache,
|
|
||||||
authentication,
|
|
||||||
tls,
|
|
||||||
useVirtualThread
|
|
||||||
)
|
|
||||||
|
|
||||||
fun parse(document: Document): Configuration {
|
|
||||||
val root = document.documentElement
|
|
||||||
var cache: Cache? = null
|
|
||||||
var host = "127.0.0.1"
|
|
||||||
var port = 11080
|
|
||||||
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) ?: false
|
|
||||||
var authentication : Authentication? = null
|
|
||||||
for (child in root.asIterable()) {
|
|
||||||
when (child.nodeName) {
|
|
||||||
"authorization" -> {
|
|
||||||
for (gchild in child.asIterable()) {
|
|
||||||
when (child.nodeName) {
|
|
||||||
"users" -> {
|
|
||||||
users = parseUsers(child)
|
|
||||||
}
|
|
||||||
|
|
||||||
"groups" -> {
|
|
||||||
val pair = parseGroups(child, users)
|
|
||||||
users = pair.first
|
|
||||||
groups = pair.second
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
"bind" -> {
|
|
||||||
host = child.getAttribute("host")
|
|
||||||
port = Integer.parseInt(child.getAttribute("port"))
|
|
||||||
}
|
|
||||||
|
|
||||||
"cache" -> {
|
|
||||||
for (gchild in child.asIterable()) {
|
|
||||||
when (gchild.nodeName) {
|
|
||||||
"file-system-cache" -> {
|
|
||||||
val cacheFolder = gchild.getAttribute("path")
|
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
?.let(Paths::get)
|
|
||||||
?: Paths.get(System.getProperty("user.home")).resolve(".gbcs")
|
|
||||||
val maxAge = gchild.getAttribute("max-age")
|
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
?.let(Duration::parse)
|
|
||||||
?: Duration.ofDays(1)
|
|
||||||
cache = FileSystemCache(cacheFolder, maxAge)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
"authentication" -> {
|
|
||||||
for (gchild in child.asIterable()) {
|
|
||||||
when (gchild.nodeName) {
|
|
||||||
"basic" -> {
|
|
||||||
authentication = BasicAuthentication()
|
|
||||||
}
|
|
||||||
|
|
||||||
"client-certificate" -> {
|
|
||||||
var tlsExtractorUser : TlsCertificateExtractor? = null
|
|
||||||
var tlsExtractorGroup : TlsCertificateExtractor? = null
|
|
||||||
for (gchild in child.asIterable()) {
|
|
||||||
when (gchild.nodeName) {
|
|
||||||
"group-extractor" -> {
|
|
||||||
val attrName = gchild.getAttribute("attribute-name")
|
|
||||||
val pattern = gchild.getAttribute("pattern")
|
|
||||||
tlsExtractorGroup = TlsCertificateExtractor(attrName, pattern)
|
|
||||||
}
|
|
||||||
|
|
||||||
"user-extractor" -> {
|
|
||||||
val attrName = gchild.getAttribute("attribute-name")
|
|
||||||
val pattern = gchild.getAttribute("pattern")
|
|
||||||
tlsExtractorUser = TlsCertificateExtractor(attrName, pattern)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
authentication = ClientCertificateAuthentication(tlsExtractorUser, tlsExtractorGroup)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
"tls" -> {
|
|
||||||
val verifyClients = child.getAttribute("verify-clients")
|
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
?.let(String::toBoolean) ?: false
|
|
||||||
var keyStore: KeyStore? = null
|
|
||||||
var trustStore: TrustStore? = null
|
|
||||||
for (granChild in child.asIterable()) {
|
|
||||||
when (granChild.nodeName) {
|
|
||||||
"keystore" -> {
|
|
||||||
val keyStoreFile = Paths.get(granChild.getAttribute("file"))
|
|
||||||
val keyStorePassword = granChild.getAttribute("password")
|
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
val keyAlias = granChild.getAttribute("key-alias")
|
|
||||||
val keyPassword = granChild.getAttribute("key-password")
|
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
keyStore = KeyStore(
|
|
||||||
keyStoreFile,
|
|
||||||
keyStorePassword,
|
|
||||||
keyAlias,
|
|
||||||
keyPassword
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
"truststore" -> {
|
|
||||||
val trustStoreFile = Paths.get(granChild.getAttribute("file"))
|
|
||||||
val trustStorePassword = granChild.getAttribute("password")
|
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
val checkCertificateStatus = granChild.getAttribute("check-certificate-status")
|
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
?.let(String::toBoolean)
|
|
||||||
?: false
|
|
||||||
trustStore = TrustStore(
|
|
||||||
trustStoreFile,
|
|
||||||
trustStorePassword,
|
|
||||||
checkCertificateStatus
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tls = Tls(keyStore, trustStore, verifyClients)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return of(host, port, serverPath, users, groups, cache!!, authentication, tls, useVirtualThread)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun parseRoles(root: Element) = root.asIterable().asSequence().map {
|
|
||||||
when (it.nodeName) {
|
|
||||||
"reader" -> Role.Reader
|
|
||||||
"writer" -> Role.Writer
|
|
||||||
else -> throw UnsupportedOperationException("Illegal node '${it.nodeName}'")
|
|
||||||
}
|
|
||||||
}.toSet()
|
|
||||||
|
|
||||||
private fun parseUserRefs(root: Element) = root.asIterable().asSequence().filter {
|
|
||||||
it.nodeName == "user"
|
|
||||||
}.map {
|
|
||||||
it.getAttribute("ref")
|
|
||||||
}.toSet()
|
|
||||||
|
|
||||||
private fun parseUsers(root: Element): Map<String, User> {
|
|
||||||
return root.asIterable().asSequence().filter {
|
|
||||||
it.nodeName == "user"
|
|
||||||
}.map { el ->
|
|
||||||
val username = el.getAttribute("name")
|
|
||||||
val password = el.getAttribute("password").takeIf(String::isNotEmpty)
|
|
||||||
username to User(username, password, emptySet())
|
|
||||||
}.toMap()
|
|
||||||
}
|
|
||||||
|
|
||||||
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.nodeName == "group"
|
|
||||||
}.map { el ->
|
|
||||||
val groupName = el.getAttribute("name")
|
|
||||||
var roles = emptySet<Role>()
|
|
||||||
for (child in el.asIterable()) {
|
|
||||||
when (child.nodeName) {
|
|
||||||
"users" -> {
|
|
||||||
parseUserRefs(child).mapNotNull(knownUsers::get).forEach { user ->
|
|
||||||
userGroups.computeIfAbsent(user.name) {
|
|
||||||
mutableSetOf()
|
|
||||||
}.add(groupName)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"roles" -> {
|
|
||||||
roles = parseRoles(child)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
groupName to Group(groupName, roles)
|
|
||||||
}.toMap()
|
|
||||||
val users = knownUsers.map { (name, user) ->
|
|
||||||
name to User(name, user.password, userGroups[name]?.mapNotNull { groups[it] }?.toSet() ?: emptySet())
|
|
||||||
}.toMap()
|
|
||||||
return users to groups
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
198
src/main/kotlin/net/woggioni/gbcs/configuration/Parser.kt
Normal file
198
src/main/kotlin/net/woggioni/gbcs/configuration/Parser.kt
Normal file
@@ -0,0 +1,198 @@
|
|||||||
|
package net.woggioni.gbcs.configuration
|
||||||
|
|
||||||
|
import net.woggioni.gbcs.api.Configuration
|
||||||
|
import net.woggioni.gbcs.api.Configuration.Authentication
|
||||||
|
import net.woggioni.gbcs.api.Configuration.BasicAuthentication
|
||||||
|
import net.woggioni.gbcs.api.Configuration.Cache
|
||||||
|
import net.woggioni.gbcs.api.Configuration.ClientCertificateAuthentication
|
||||||
|
import net.woggioni.gbcs.api.Configuration.Group
|
||||||
|
import net.woggioni.gbcs.api.Configuration.KeyStore
|
||||||
|
import net.woggioni.gbcs.api.Configuration.Tls
|
||||||
|
import net.woggioni.gbcs.api.Configuration.TlsCertificateExtractor
|
||||||
|
import net.woggioni.gbcs.api.Configuration.TrustStore
|
||||||
|
import net.woggioni.gbcs.api.Configuration.User
|
||||||
|
import net.woggioni.gbcs.api.Role
|
||||||
|
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.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 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
|
||||||
|
var authentication: Authentication? = null
|
||||||
|
for (child in root.asIterable()) {
|
||||||
|
val tagName = child.localName
|
||||||
|
when (tagName) {
|
||||||
|
"authorization" -> {
|
||||||
|
var knownUsers = sequenceOf(anonymousUser)
|
||||||
|
for (gchild in child.asIterable()) {
|
||||||
|
when (gchild.localName) {
|
||||||
|
"users" -> {
|
||||||
|
knownUsers += parseUsers(gchild)
|
||||||
|
}
|
||||||
|
"groups" -> {
|
||||||
|
val pair = parseGroups(gchild, knownUsers)
|
||||||
|
users = pair.first
|
||||||
|
groups = pair.second
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
"bind" -> {
|
||||||
|
host = child.getAttribute("host")
|
||||||
|
port = Integer.parseInt(child.getAttribute("port"))
|
||||||
|
}
|
||||||
|
|
||||||
|
"cache" -> {
|
||||||
|
cache = (child as TypeInfo).let { tf ->
|
||||||
|
val typeNamespace = tf.typeNamespace
|
||||||
|
val typeName = tf.typeName
|
||||||
|
CacheSerializers.index[typeNamespace to typeName]
|
||||||
|
?: throw IllegalArgumentException("Cache provider for namespace '$typeNamespace' not found")
|
||||||
|
}.deserialize(child)
|
||||||
|
}
|
||||||
|
|
||||||
|
"authentication" -> {
|
||||||
|
for (gchild in child.asIterable()) {
|
||||||
|
when (gchild.localName) {
|
||||||
|
"basic" -> {
|
||||||
|
authentication = BasicAuthentication()
|
||||||
|
}
|
||||||
|
|
||||||
|
"client-certificate" -> {
|
||||||
|
var tlsExtractorUser: TlsCertificateExtractor? = null
|
||||||
|
var tlsExtractorGroup: TlsCertificateExtractor? = null
|
||||||
|
for (ggchild in gchild.asIterable()) {
|
||||||
|
when (ggchild.localName) {
|
||||||
|
"group-extractor" -> {
|
||||||
|
val attrName = ggchild.getAttribute("attribute-name")
|
||||||
|
val pattern = ggchild.getAttribute("pattern")
|
||||||
|
tlsExtractorGroup = TlsCertificateExtractor(attrName, pattern)
|
||||||
|
}
|
||||||
|
|
||||||
|
"user-extractor" -> {
|
||||||
|
val attrName = ggchild.getAttribute("attribute-name")
|
||||||
|
val pattern = ggchild.getAttribute("pattern")
|
||||||
|
tlsExtractorUser = TlsCertificateExtractor(attrName, pattern)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
authentication = ClientCertificateAuthentication(tlsExtractorUser, tlsExtractorGroup)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
"tls" -> {
|
||||||
|
val verifyClients = child.getAttribute("verify-clients")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
?.let(String::toBoolean) ?: false
|
||||||
|
var keyStore: KeyStore? = null
|
||||||
|
var trustStore: TrustStore? = null
|
||||||
|
for (granChild in child.asIterable()) {
|
||||||
|
when (granChild.localName) {
|
||||||
|
"keystore" -> {
|
||||||
|
val keyStoreFile = Paths.get(granChild.getAttribute("file"))
|
||||||
|
val keyStorePassword = granChild.getAttribute("password")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
val keyAlias = granChild.getAttribute("key-alias")
|
||||||
|
val keyPassword = granChild.getAttribute("key-password")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
keyStore = KeyStore(
|
||||||
|
keyStoreFile,
|
||||||
|
keyStorePassword,
|
||||||
|
keyAlias,
|
||||||
|
keyPassword
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
"truststore" -> {
|
||||||
|
val trustStoreFile = Paths.get(granChild.getAttribute("file"))
|
||||||
|
val trustStorePassword = granChild.getAttribute("password")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
val checkCertificateStatus = granChild.getAttribute("check-certificate-status")
|
||||||
|
.takeIf(String::isNotEmpty)
|
||||||
|
?.let(String::toBoolean)
|
||||||
|
?: false
|
||||||
|
trustStore = TrustStore(
|
||||||
|
trustStoreFile,
|
||||||
|
trustStorePassword,
|
||||||
|
checkCertificateStatus
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tls = Tls(keyStore, trustStore, verifyClients)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Configuration(host, port, serverPath, users, groups, cache!!, authentication, tls, useVirtualThread)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun parseRoles(root: Element) = root.asIterable().asSequence().map {
|
||||||
|
when (it.localName) {
|
||||||
|
"reader" -> Role.Reader
|
||||||
|
"writer" -> Role.Writer
|
||||||
|
else -> throw UnsupportedOperationException("Illegal node '${it.localName}'")
|
||||||
|
}
|
||||||
|
}.toSet()
|
||||||
|
|
||||||
|
private fun parseUserRefs(root: Element) = root.asIterable().asSequence().map {
|
||||||
|
it.getAttribute("ref")
|
||||||
|
}.toSet()
|
||||||
|
|
||||||
|
private fun parseUsers(root: Element): Sequence<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())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun parseGroups(root: Element, knownUsers: Sequence<User>): Pair<Map<String, User>, Map<String, Group>> {
|
||||||
|
val knownUsersMap = knownUsers.associateBy(User::getName)
|
||||||
|
val userGroups = mutableMapOf<String, MutableSet<String>>()
|
||||||
|
val groups = root.asIterable().asSequence().filter {
|
||||||
|
it.localName == "group"
|
||||||
|
}.map { el ->
|
||||||
|
val groupName = el.getAttribute("name")
|
||||||
|
var roles = emptySet<Role>()
|
||||||
|
for (child in el.asIterable()) {
|
||||||
|
when (child.localName) {
|
||||||
|
"users" -> {
|
||||||
|
parseUserRefs(child).mapNotNull(knownUsersMap::get).forEach { user ->
|
||||||
|
userGroups.computeIfAbsent(user.name) {
|
||||||
|
mutableSetOf()
|
||||||
|
}.add(groupName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
"roles" -> {
|
||||||
|
roles = parseRoles(child)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
groupName to Group(groupName, roles)
|
||||||
|
}.toMap()
|
||||||
|
val users = knownUsersMap.map { (name, user) ->
|
||||||
|
name to User(name, user.password, userGroups[name]?.mapNotNull { groups[it] }?.toSet() ?: emptySet())
|
||||||
|
}.toMap()
|
||||||
|
return users to groups
|
||||||
|
}
|
||||||
|
}
|
@@ -1,37 +1,41 @@
|
|||||||
package net.woggioni.gbcs.configuration
|
package net.woggioni.gbcs.configuration
|
||||||
|
|
||||||
import net.woggioni.gbcs.Xml
|
import net.woggioni.gbcs.api.CacheProvider
|
||||||
|
import net.woggioni.gbcs.api.Configuration
|
||||||
|
import net.woggioni.gbcs.base.GBCS
|
||||||
|
import net.woggioni.gbcs.base.Xml
|
||||||
import org.w3c.dom.Document
|
import org.w3c.dom.Document
|
||||||
|
|
||||||
object Serializer {
|
object Serializer {
|
||||||
|
|
||||||
private const val GBCS_NAMESPACE: String = "urn:net.woggioni.gbcs"
|
|
||||||
private const val GBCS_PREFIX: String = "gbcs"
|
|
||||||
|
|
||||||
fun serialize(conf : Configuration) : Document {
|
fun serialize(conf : Configuration) : Document {
|
||||||
return Xml.of(GBCS_NAMESPACE, GBCS_PREFIX + ":server") {
|
|
||||||
attr("userVirtualThreads", conf.useVirtualThread.toString())
|
val schemaLocations = CacheSerializers.index.values.asSequence().map {
|
||||||
conf.serverPath?.let { serverPath ->
|
it.xmlNamespace to it.xmlSchemaLocation
|
||||||
|
}.toMap()
|
||||||
|
return Xml.of(GBCS.GBCS_NAMESPACE_URI, GBCS.GBCS_PREFIX + ":server") {
|
||||||
|
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)
|
||||||
|
|
||||||
|
conf.serverPath
|
||||||
|
?.takeIf(String::isNotEmpty)
|
||||||
|
?.let { serverPath ->
|
||||||
attr("path", serverPath)
|
attr("path", serverPath)
|
||||||
}
|
}
|
||||||
node("bind") {
|
node("bind") {
|
||||||
attr("host", conf.host)
|
attr("host", conf.host)
|
||||||
attr("port", conf.port.toString())
|
attr("port", conf.port.toString())
|
||||||
}
|
}
|
||||||
node("cache") {
|
val cache = conf.cache
|
||||||
when(val cache = conf.cache) {
|
val serializer : CacheProvider<Configuration.Cache> =
|
||||||
is Configuration.FileSystemCache -> {
|
(CacheSerializers.index[cache.namespaceURI to cache.typeName] as? CacheProvider<Configuration.Cache>) ?: throw NotImplementedError()
|
||||||
node("file-system-cache") {
|
element.appendChild(serializer.serialize(doc, cache))
|
||||||
attr("path", cache.root.toString())
|
|
||||||
attr("max-age", cache.maxAge.toString())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else -> throw NotImplementedError()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
node("authorization") {
|
node("authorization") {
|
||||||
node("users") {
|
node("users") {
|
||||||
for(user in conf.users.values) {
|
for(user in conf.users.values) {
|
||||||
|
if(user.name.isNotEmpty()) {
|
||||||
node("user") {
|
node("user") {
|
||||||
attr("name", user.name)
|
attr("name", user.name)
|
||||||
user.password?.let { password ->
|
user.password?.let { password ->
|
||||||
@@ -40,6 +44,7 @@ object Serializer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
node("groups") {
|
node("groups") {
|
||||||
val groups = conf.users.values.asSequence()
|
val groups = conf.users.values.asSequence()
|
||||||
.flatMap {
|
.flatMap {
|
||||||
@@ -52,10 +57,18 @@ object Serializer {
|
|||||||
attr("name", group.name)
|
attr("name", group.name)
|
||||||
if(users.isNotEmpty()) {
|
if(users.isNotEmpty()) {
|
||||||
node("users") {
|
node("users") {
|
||||||
|
var anonymousUser : Configuration.User? = null
|
||||||
for(user in users) {
|
for(user in users) {
|
||||||
|
if(user.name.isNotEmpty()) {
|
||||||
node("user") {
|
node("user") {
|
||||||
attr("ref", user.name)
|
attr("ref", user.name)
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
anonymousUser = user
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(anonymousUser != null) {
|
||||||
|
node("anonymous")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -79,6 +92,12 @@ object Serializer {
|
|||||||
}
|
}
|
||||||
is Configuration.ClientCertificateAuthentication -> {
|
is Configuration.ClientCertificateAuthentication -> {
|
||||||
node("client-certificate") {
|
node("client-certificate") {
|
||||||
|
authentication.groupExtractor?.let { extractor ->
|
||||||
|
node("group-extractor") {
|
||||||
|
attr("attribute-name", extractor.rdnType)
|
||||||
|
attr("pattern", extractor.pattern)
|
||||||
|
}
|
||||||
|
}
|
||||||
authentication.userExtractor?.let { extractor ->
|
authentication.userExtractor?.let { extractor ->
|
||||||
node("user-extractor") {
|
node("user-extractor") {
|
||||||
attr("attribute-name", extractor.rdnType)
|
attr("attribute-name", extractor.rdnType)
|
||||||
@@ -112,7 +131,7 @@ object Serializer {
|
|||||||
trustStore.password?.let { password ->
|
trustStore.password?.let { password ->
|
||||||
attr("password", password)
|
attr("password", password)
|
||||||
}
|
}
|
||||||
attr("check-certificate-status", trustStore.checkCertificateStatus.toString())
|
attr("check-certificate-status", trustStore.isCheckCertificateStatus.toString())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1 @@
|
|||||||
|
net.woggioni.gbcs.cache.FileSystemCacheProvider
|
@@ -1,9 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<gbcs:server xmlns:gbcs="urn:net.woggioni.gbcs" useVirtualThreads="false">
|
<gbcs:server useVirtualThreads="false" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
<bind host="127.0.0.1" port="11443"/>
|
xmlns:gbcs="urn:net.woggioni.gbcs"
|
||||||
<cache>
|
xs:schemaLocation="urn:net.woggioni.gbcs jpms://net.woggioni.gbcs/net/woggioni/gbcs/schema/gbcs.xsd">
|
||||||
<file-system-cache path="/tmp/gbcs" max-age="P7D"/>
|
<bind host="127.0.0.1" port="8080"/>
|
||||||
</cache>
|
<cache xs:type="gbcs:fileSystemCacheType" path="/tmp/gbcs" max-age="P7D"/>
|
||||||
<authentication>
|
<authentication>
|
||||||
<none/>
|
<none/>
|
||||||
</authentication>
|
</authentication>
|
||||||
|
@@ -1,16 +1,15 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<xs:schema targetNamespace="urn:net.woggioni.gbcs"
|
<xs:schema targetNamespace="urn:net.woggioni.gbcs"
|
||||||
xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
||||||
xmlns:gbcs="urn:net.woggioni.gbcs">
|
xmlns:gbcs="urn:net.woggioni.gbcs"
|
||||||
|
elementFormDefault="unqualified"
|
||||||
|
>
|
||||||
<xs:element name="server" type="gbcs:serverType"/>
|
<xs:element name="server" type="gbcs:serverType"/>
|
||||||
|
|
||||||
<xs:complexType name="serverType">
|
<xs:complexType name="serverType">
|
||||||
<xs:sequence minOccurs="0">
|
<xs:sequence minOccurs="0">
|
||||||
<xs:element name="bind" type="gbcs:bindType" maxOccurs="1"/>
|
<xs:element name="bind" type="gbcs:bindType" maxOccurs="1"/>
|
||||||
<xs:element name="cache" type="gbcs:cacheType" 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:element name="authorization" type="gbcs:authorizationType" minOccurs="0">
|
||||||
<xs:key name="userId">
|
<xs:key name="userId">
|
||||||
<xs:selector xpath="users/user"/>
|
<xs:selector xpath="users/user"/>
|
||||||
@@ -21,12 +20,11 @@
|
|||||||
<xs:field xpath="@ref"/>
|
<xs:field xpath="@ref"/>
|
||||||
</xs:keyref>
|
</xs:keyref>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
<xs:element name="authentication" type="gbcs:authenticationType" maxOccurs="1"/>
|
<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:element name="tls" type="gbcs:tlsType" minOccurs="0" maxOccurs="1"/>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
<xs:attribute name="path" type="xs:string" use="optional"/>
|
<xs:attribute name="path" type="xs:string" use="optional"/>
|
||||||
<xs:attribute name="useVirtualThreads" type="xs:boolean" use="optional"/>
|
<xs:attribute name="useVirtualThreads" type="xs:boolean" use="optional" default="true"/>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
|
||||||
<xs:complexType name="bindType">
|
<xs:complexType name="bindType">
|
||||||
@@ -34,21 +32,24 @@
|
|||||||
<xs:attribute name="port" type="xs:unsignedShort" use="required"/>
|
<xs:attribute name="port" type="xs:unsignedShort" use="required"/>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
|
||||||
<xs:complexType name="cacheType">
|
<xs:complexType name="cacheType" abstract="true"/>
|
||||||
<xs:choice>
|
|
||||||
<xs:element name="file-system-cache" type="gbcs:fileSystemCacheType"/>
|
|
||||||
</xs:choice>
|
|
||||||
</xs:complexType>
|
|
||||||
|
|
||||||
<xs:complexType name="fileSystemCacheType">
|
<xs:complexType name="fileSystemCacheType">
|
||||||
|
<xs:complexContent>
|
||||||
|
<xs:extension base="gbcs:cacheType">
|
||||||
<xs:attribute name="path" type="xs:string" use="required"/>
|
<xs:attribute name="path" type="xs:string" use="required"/>
|
||||||
<xs:attribute name="max-age" type="xs:string" default="P1D"/>
|
<xs:attribute name="max-age" type="xs:duration" default="P1D"/>
|
||||||
|
<xs:attribute name="digest" type="xs:token" default="MD5"/>
|
||||||
|
<xs:attribute name="enable-compression" type="xs:boolean" default="true"/>
|
||||||
|
<xs:attribute name="compression-level" type="xs:byte" default="-1"/>
|
||||||
|
</xs:extension>
|
||||||
|
</xs:complexContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
|
||||||
<xs:complexType name="tlsCertificateAuthorizationType">
|
<xs:complexType name="tlsCertificateAuthorizationType">
|
||||||
<xs:sequence>
|
<xs:sequence>
|
||||||
<xs:element name="group-extractor" type="gbcs:X500NameExtractorType"/>
|
<xs:element name="group-extractor" type="gbcs:X500NameExtractorType" minOccurs="0"/>
|
||||||
<xs:element name="user-extractor" type="gbcs:X500NameExtractorType"/>
|
<xs:element name="user-extractor" type="gbcs:X500NameExtractorType" minOccurs="0"/>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
|
||||||
@@ -126,6 +127,7 @@
|
|||||||
<xs:complexType name="userRefsType">
|
<xs:complexType name="userRefsType">
|
||||||
<xs:sequence>
|
<xs:sequence>
|
||||||
<xs:element name="user" type="gbcs:userRefType" maxOccurs="unbounded" minOccurs="0"/>
|
<xs:element name="user" type="gbcs:userRefType" maxOccurs="unbounded" minOccurs="0"/>
|
||||||
|
<xs:element name="anonymous" minOccurs="0" maxOccurs="1"/>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
|
@@ -1,7 +0,0 @@
|
|||||||
module net.woggioni.gbcs.test {
|
|
||||||
requires org.junit.jupiter.api;
|
|
||||||
requires net.woggioni.gbcs;
|
|
||||||
requires kotlin.stdlib;
|
|
||||||
requires java.xml;
|
|
||||||
requires java.naming;
|
|
||||||
}
|
|
@@ -9,16 +9,13 @@ import org.bouncycastle.asn1.x509.GeneralName;
|
|||||||
import org.bouncycastle.asn1.x509.GeneralNames;
|
import org.bouncycastle.asn1.x509.GeneralNames;
|
||||||
import org.bouncycastle.asn1.x509.KeyPurposeId;
|
import org.bouncycastle.asn1.x509.KeyPurposeId;
|
||||||
import org.bouncycastle.asn1.x509.KeyUsage;
|
import org.bouncycastle.asn1.x509.KeyUsage;
|
||||||
import org.bouncycastle.asn1.x509.SubjectAltPublicKeyInfo;
|
|
||||||
import org.bouncycastle.cert.X509v3CertificateBuilder;
|
import org.bouncycastle.cert.X509v3CertificateBuilder;
|
||||||
import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
|
import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
|
||||||
import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
|
import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
|
||||||
import org.bouncycastle.operator.ContentSigner;
|
import org.bouncycastle.operator.ContentSigner;
|
||||||
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
|
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
|
||||||
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.math.BigInteger;
|
import java.math.BigInteger;
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.security.KeyPair;
|
import java.security.KeyPair;
|
||||||
import java.security.KeyPairGenerator;
|
import java.security.KeyPairGenerator;
|
||||||
import java.security.PrivateKey;
|
import java.security.PrivateKey;
|
||||||
|
30
src/test/java/net/woggioni/gbcs/utils/NetworkUtils.java
Normal file
30
src/test/java/net/woggioni/gbcs/utils/NetworkUtils.java
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
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())) {
|
||||||
|
final var candidate = serverSocket.getLocalPort();
|
||||||
|
if (candidate > 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");
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,76 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
@@ -1,10 +1,9 @@
|
|||||||
package net.woggioni.gbcs.test
|
package net.woggioni.gbcs.test
|
||||||
|
|
||||||
import net.woggioni.gbcs.GradleBuildCacheServer
|
import net.woggioni.gbcs.GradleBuildCacheServer
|
||||||
import net.woggioni.gbcs.configuration.Configuration
|
import net.woggioni.gbcs.api.Configuration
|
||||||
import org.junit.jupiter.api.AfterAll
|
import org.junit.jupiter.api.AfterAll
|
||||||
import org.junit.jupiter.api.BeforeAll
|
import org.junit.jupiter.api.BeforeAll
|
||||||
import org.junit.jupiter.api.ClassOrderer
|
|
||||||
import org.junit.jupiter.api.MethodOrderer
|
import org.junit.jupiter.api.MethodOrderer
|
||||||
import org.junit.jupiter.api.TestInstance
|
import org.junit.jupiter.api.TestInstance
|
||||||
import org.junit.jupiter.api.TestMethodOrder
|
import org.junit.jupiter.api.TestMethodOrder
|
||||||
|
187
src/test/kotlin/net/woggioni/gbcs/test/AbstractTlsServerTest.kt
Normal file
187
src/test/kotlin/net/woggioni/gbcs/test/AbstractTlsServerTest.kt
Normal file
@@ -0,0 +1,187 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
@@ -1,85 +1,29 @@
|
|||||||
package net.woggioni.gbcs.test
|
package net.woggioni.gbcs.test
|
||||||
|
|
||||||
import io.netty.handler.codec.Headers
|
|
||||||
import io.netty.handler.codec.http.HttpResponseStatus
|
import io.netty.handler.codec.http.HttpResponseStatus
|
||||||
import net.woggioni.gbcs.AbstractNettyHttpAuthenticator.Companion.hashPassword
|
import net.woggioni.gbcs.api.Configuration
|
||||||
import net.woggioni.gbcs.Authorizer
|
import net.woggioni.gbcs.api.Role
|
||||||
import net.woggioni.gbcs.Role
|
import net.woggioni.gbcs.base.PasswordSecurity.hashPassword
|
||||||
import net.woggioni.gbcs.Xml
|
|
||||||
import net.woggioni.gbcs.configuration.Configuration
|
|
||||||
import net.woggioni.gbcs.configuration.Serializer
|
|
||||||
import org.junit.jupiter.api.Assertions
|
import org.junit.jupiter.api.Assertions
|
||||||
import org.junit.jupiter.api.Order
|
import org.junit.jupiter.api.Order
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
import java.net.ServerSocket
|
|
||||||
import java.net.URI
|
|
||||||
import java.net.http.HttpClient
|
import java.net.http.HttpClient
|
||||||
import java.net.http.HttpRequest
|
import java.net.http.HttpRequest
|
||||||
import java.net.http.HttpResponse
|
import java.net.http.HttpResponse
|
||||||
import java.nio.charset.StandardCharsets
|
|
||||||
import java.nio.file.Path
|
|
||||||
import java.time.Duration
|
|
||||||
import java.util.Base64
|
|
||||||
import kotlin.random.Random
|
|
||||||
|
|
||||||
|
|
||||||
class BasicAuthServerTest : AbstractServerTest() {
|
class BasicAuthServerTest : AbstractBasicAuthServerTest() {
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private const val PASSWORD = "password"
|
private const val PASSWORD = "password"
|
||||||
}
|
}
|
||||||
|
|
||||||
private lateinit var cacheDir : Path
|
override val users = listOf(
|
||||||
|
|
||||||
private val random = Random(101325)
|
|
||||||
private val keyValuePair = newEntry(random)
|
|
||||||
|
|
||||||
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.of(
|
|
||||||
cache = Configuration.FileSystemCache(this.cacheDir, maxAge = Duration.ofSeconds(3600 * 24)),
|
|
||||||
host = "127.0.0.1",
|
|
||||||
port = ServerSocket(0).localPort + 1,
|
|
||||||
users = listOf(
|
|
||||||
Configuration.User("user1", hashPassword(PASSWORD), setOf(readersGroup)),
|
Configuration.User("user1", hashPassword(PASSWORD), setOf(readersGroup)),
|
||||||
Configuration.User("user2", hashPassword(PASSWORD), setOf(writersGroup)),
|
Configuration.User("user2", hashPassword(PASSWORD), setOf(writersGroup)),
|
||||||
Configuration.User("user3", hashPassword(PASSWORD), setOf(readersGroup, writersGroup))
|
Configuration.User("user3", hashPassword(PASSWORD), setOf(readersGroup, writersGroup)),
|
||||||
).asSequence().map { it.name to it}.toMap(),
|
Configuration.User("", null, setOf(readersGroup))
|
||||||
groups = sequenceOf(writersGroup, readersGroup).map { it.name to it}.toMap(),
|
|
||||||
authentication = Configuration.BasicAuthentication(),
|
|
||||||
useVirtualThread = true,
|
|
||||||
tls = null,
|
|
||||||
serverPath = "/"
|
|
||||||
)
|
)
|
||||||
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}/$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
|
@Test
|
||||||
@Order(1)
|
@Order(1)
|
||||||
@@ -92,7 +36,7 @@ class BasicAuthServerTest : AbstractServerTest() {
|
|||||||
.PUT(HttpRequest.BodyPublishers.ofByteArray(value))
|
.PUT(HttpRequest.BodyPublishers.ofByteArray(value))
|
||||||
|
|
||||||
val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
|
val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
|
||||||
Assertions.assertEquals(HttpResponseStatus.UNAUTHORIZED.code(), response.statusCode())
|
Assertions.assertEquals(HttpResponseStatus.FORBIDDEN.code(), response.statusCode())
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -171,6 +115,20 @@ class BasicAuthServerTest : AbstractServerTest() {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Order(6)
|
@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() {
|
fun getMissingKeyAsAReaderUser() {
|
||||||
val client: HttpClient = HttpClient.newHttpClient()
|
val client: HttpClient = HttpClient.newHttpClient()
|
||||||
|
|
||||||
|
@@ -1,32 +1,38 @@
|
|||||||
package net.woggioni.gbcs.test
|
package net.woggioni.gbcs.test
|
||||||
|
|
||||||
import net.woggioni.gbcs.configuration.Configuration
|
import net.woggioni.gbcs.base.GBCS.toUrl
|
||||||
import net.woggioni.gbcs.GradleBuildCacheServer
|
import net.woggioni.gbcs.base.GbcsUrlStreamHandlerFactory
|
||||||
import net.woggioni.gbcs.Xml
|
import net.woggioni.gbcs.base.Xml
|
||||||
|
import net.woggioni.gbcs.configuration.Parser
|
||||||
import net.woggioni.gbcs.configuration.Serializer
|
import net.woggioni.gbcs.configuration.Serializer
|
||||||
import net.woggioni.gbcs.url.ClasspathUrlStreamHandlerFactoryProvider
|
|
||||||
import org.junit.jupiter.api.Assertions
|
import org.junit.jupiter.api.Assertions
|
||||||
import org.junit.jupiter.api.Test
|
|
||||||
import org.junit.jupiter.api.io.TempDir
|
import org.junit.jupiter.api.io.TempDir
|
||||||
import java.net.URL
|
import org.junit.jupiter.params.ParameterizedTest
|
||||||
|
import org.junit.jupiter.params.provider.ValueSource
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
|
|
||||||
class ConfigurationTest {
|
class ConfigurationTest {
|
||||||
|
|
||||||
@Test
|
@ValueSource(
|
||||||
fun test(@TempDir testDir : Path) {
|
strings = [
|
||||||
URL.setURLStreamHandlerFactory(ClasspathUrlStreamHandlerFactoryProvider())
|
"classpath:net/woggioni/gbcs/test/gbcs-default.xml",
|
||||||
val dbf = Xml.newDocumentBuilderFactory(GradleBuildCacheServer.CONFIGURATION_SCHEMA_URL)
|
"classpath:net/woggioni/gbcs/test/gbcs-memcached.xml",
|
||||||
val db = dbf.newDocumentBuilder()
|
"classpath:net/woggioni/gbcs/test/gbcs-tls.xml",
|
||||||
val configurationUrl = GradleBuildCacheServer.DEFAULT_CONFIGURATION_URL
|
]
|
||||||
val doc = configurationUrl.openStream().use(db::parse)
|
)
|
||||||
val cfg = Configuration.parse(doc)
|
@ParameterizedTest
|
||||||
|
fun test(configurationUrl: String, @TempDir testDir: Path) {
|
||||||
|
GbcsUrlStreamHandlerFactory.install()
|
||||||
|
val doc = Xml.parseXml(configurationUrl.toUrl())
|
||||||
|
val cfg = Parser.parse(doc)
|
||||||
val configFile = testDir.resolve("gbcs.xml")
|
val configFile = testDir.resolve("gbcs.xml")
|
||||||
Files.newOutputStream(configFile).use {
|
Files.newOutputStream(configFile).use {
|
||||||
Xml.write(Serializer.serialize(cfg), it)
|
Xml.write(Serializer.serialize(cfg), it)
|
||||||
}
|
}
|
||||||
val parsed = Configuration.parse(Xml.parseXml(configFile.toUri().toURL()))
|
Xml.write(Serializer.serialize(cfg), System.out)
|
||||||
|
|
||||||
|
val parsed = Parser.parse(Xml.parseXml(configFile.toUri().toURL()))
|
||||||
Assertions.assertEquals(cfg, parsed)
|
Assertions.assertEquals(cfg, parsed)
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -0,0 +1,52 @@
|
|||||||
|
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())
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,47 @@
|
|||||||
|
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())
|
||||||
|
}
|
||||||
|
}
|
@@ -1,13 +1,14 @@
|
|||||||
package net.woggioni.gbcs.test
|
package net.woggioni.gbcs.test
|
||||||
|
|
||||||
import io.netty.handler.codec.http.HttpResponseStatus
|
import io.netty.handler.codec.http.HttpResponseStatus
|
||||||
import net.woggioni.gbcs.Xml
|
import net.woggioni.gbcs.api.Configuration
|
||||||
import net.woggioni.gbcs.configuration.Configuration
|
import net.woggioni.gbcs.base.Xml
|
||||||
|
import net.woggioni.gbcs.cache.FileSystemCacheConfiguration
|
||||||
import net.woggioni.gbcs.configuration.Serializer
|
import net.woggioni.gbcs.configuration.Serializer
|
||||||
|
import net.woggioni.gbcs.utils.NetworkUtils
|
||||||
import org.junit.jupiter.api.Assertions
|
import org.junit.jupiter.api.Assertions
|
||||||
import org.junit.jupiter.api.Order
|
import org.junit.jupiter.api.Order
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
import java.net.ServerSocket
|
|
||||||
import java.net.URI
|
import java.net.URI
|
||||||
import java.net.http.HttpClient
|
import java.net.http.HttpClient
|
||||||
import java.net.http.HttpRequest
|
import java.net.http.HttpRequest
|
||||||
@@ -15,6 +16,7 @@ import java.net.http.HttpResponse
|
|||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import java.time.Duration
|
import java.time.Duration
|
||||||
import java.util.Base64
|
import java.util.Base64
|
||||||
|
import java.util.zip.Deflater
|
||||||
import kotlin.random.Random
|
import kotlin.random.Random
|
||||||
|
|
||||||
|
|
||||||
@@ -24,19 +26,26 @@ class NoAuthServerTest : AbstractServerTest() {
|
|||||||
|
|
||||||
private val random = Random(101325)
|
private val random = Random(101325)
|
||||||
private val keyValuePair = newEntry(random)
|
private val keyValuePair = newEntry(random)
|
||||||
|
private val serverPath = "/some/nested/path"
|
||||||
|
|
||||||
override fun setUp() {
|
override fun setUp() {
|
||||||
this.cacheDir = testDir.resolve("cache")
|
this.cacheDir = testDir.resolve("cache")
|
||||||
cfg = Configuration.of(
|
cfg = Configuration(
|
||||||
cache = Configuration.FileSystemCache(this.cacheDir, maxAge = Duration.ofSeconds(3600 * 24)),
|
"127.0.0.1",
|
||||||
host = "127.0.0.1",
|
NetworkUtils.getFreePort(),
|
||||||
port = ServerSocket(0).localPort + 1,
|
serverPath,
|
||||||
users = emptyMap(),
|
emptyMap(),
|
||||||
groups = emptyMap(),
|
emptyMap(),
|
||||||
authentication = null,
|
FileSystemCacheConfiguration(
|
||||||
useVirtualThread = true,
|
this.cacheDir,
|
||||||
tls = null,
|
maxAge = Duration.ofSeconds(3600 * 24),
|
||||||
serverPath = "/"
|
compressionEnabled = true,
|
||||||
|
digestAlgorithm = "MD5",
|
||||||
|
compressionLevel = Deflater.DEFAULT_COMPRESSION
|
||||||
|
),
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
true,
|
||||||
)
|
)
|
||||||
Xml.write(Serializer.serialize(cfg), System.out)
|
Xml.write(Serializer.serialize(cfg), System.out)
|
||||||
}
|
}
|
||||||
@@ -45,7 +54,7 @@ class NoAuthServerTest : AbstractServerTest() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun newRequestBuilder(key : String) = HttpRequest.newBuilder()
|
fun newRequestBuilder(key : String) = HttpRequest.newBuilder()
|
||||||
.uri(URI.create("http://${cfg.host}:${cfg.port}/$key"))
|
.uri(URI.create("http://${cfg.host}:${cfg.port}/$serverPath/$key"))
|
||||||
|
|
||||||
fun newEntry(random : Random) : Pair<String, ByteArray> {
|
fun newEntry(random : Random) : Pair<String, ByteArray> {
|
||||||
val key = ByteArray(0x10).let {
|
val key = ByteArray(0x10).let {
|
||||||
@@ -95,4 +104,28 @@ class NoAuthServerTest : AbstractServerTest() {
|
|||||||
val response: HttpResponse<ByteArray> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray())
|
val response: HttpResponse<ByteArray> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray())
|
||||||
Assertions.assertEquals(HttpResponseStatus.NOT_FOUND.code(), response.statusCode())
|
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())
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
}
|
}
|
@@ -1,207 +1,28 @@
|
|||||||
package net.woggioni.gbcs.test
|
package net.woggioni.gbcs.test
|
||||||
|
|
||||||
import io.netty.handler.codec.http.HttpResponseStatus
|
import io.netty.handler.codec.http.HttpResponseStatus
|
||||||
import net.woggioni.gbcs.Role
|
import net.woggioni.gbcs.api.Configuration
|
||||||
import net.woggioni.gbcs.Xml
|
import net.woggioni.gbcs.api.Role
|
||||||
import net.woggioni.gbcs.configuration.Configuration
|
|
||||||
import net.woggioni.gbcs.configuration.Serializer
|
|
||||||
import net.woggioni.gbcs.utils.CertificateUtils
|
|
||||||
import net.woggioni.gbcs.utils.CertificateUtils.X509Credentials
|
|
||||||
import org.bouncycastle.asn1.x500.X500Name
|
import org.bouncycastle.asn1.x500.X500Name
|
||||||
import org.junit.jupiter.api.Assertions
|
import org.junit.jupiter.api.Assertions
|
||||||
import org.junit.jupiter.api.Order
|
import org.junit.jupiter.api.Order
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
import java.net.ServerSocket
|
|
||||||
import java.net.URI
|
|
||||||
import java.net.http.HttpClient
|
import java.net.http.HttpClient
|
||||||
import java.net.http.HttpRequest
|
import java.net.http.HttpRequest
|
||||||
import java.net.http.HttpResponse
|
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 javax.net.ssl.KeyManagerFactory
|
|
||||||
import javax.net.ssl.SSLContext
|
|
||||||
import javax.net.ssl.TrustManagerFactory
|
|
||||||
import kotlin.random.Random
|
|
||||||
|
|
||||||
|
|
||||||
class TlsServerTest : AbstractServerTest() {
|
class TlsServerTest : AbstractTlsServerTest() {
|
||||||
|
|
||||||
companion object {
|
override val users = listOf(
|
||||||
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 users = listOf(
|
|
||||||
Configuration.User("user1", null, setOf(readersGroup)),
|
Configuration.User("user1", null, setOf(readersGroup)),
|
||||||
Configuration.User("user2", null, setOf(writersGroup)),
|
Configuration.User("user2", null, setOf(writersGroup)),
|
||||||
Configuration.User("user3", null, setOf(readersGroup, writersGroup))
|
Configuration.User("user3", null, setOf(readersGroup, writersGroup)),
|
||||||
|
Configuration.User("", null, setOf(readersGroup))
|
||||||
)
|
)
|
||||||
|
|
||||||
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.of(
|
|
||||||
cache = Configuration.FileSystemCache(this.cacheDir, maxAge = Duration.ofSeconds(3600 * 24)),
|
|
||||||
host = "127.0.0.1",
|
|
||||||
port = ServerSocket(0).localPort + 1,
|
|
||||||
users = users.asSequence().map { it.name to it }.toMap(),
|
|
||||||
groups = sequenceOf(writersGroup, readersGroup).map { it.name to it }.toMap(),
|
|
||||||
authentication = Configuration.ClientCertificateAuthentication(
|
|
||||||
userExtractor = Configuration.TlsCertificateExtractor("CN", "(.*)"),
|
|
||||||
groupExtractor = null
|
|
||||||
),
|
|
||||||
useVirtualThread = true,
|
|
||||||
tls = Configuration.Tls(
|
|
||||||
Configuration.KeyStore(this.serverKeyStoreFile, null, SERVER_CERTIFICATE_ENTRY, PASSWORD),
|
|
||||||
Configuration.TrustStore(this.trustStoreFile, null, false),
|
|
||||||
true
|
|
||||||
),
|
|
||||||
serverPath = "/"
|
|
||||||
)
|
|
||||||
Xml.write(Serializer.serialize(cfg), System.out)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun tearDown() {
|
|
||||||
}
|
|
||||||
|
|
||||||
fun newRequestBuilder(key: String) = HttpRequest.newBuilder()
|
|
||||||
.uri(URI.create("https://${cfg.host}:${cfg.port}/$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
|
@Test
|
||||||
@Order(1)
|
@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() {
|
fun putAsAReaderUser() {
|
||||||
val (key, value) = keyValuePair
|
val (key, value) = keyValuePair
|
||||||
val user = cfg.users.values.find {
|
val user = cfg.users.values.find {
|
||||||
@@ -217,9 +38,8 @@ class TlsServerTest : AbstractServerTest() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Order(3)
|
@Order(2)
|
||||||
fun getAsAWriterUser() {
|
fun getAsAWriterUser() {
|
||||||
|
|
||||||
val (key, _) = keyValuePair
|
val (key, _) = keyValuePair
|
||||||
val user = cfg.users.values.find {
|
val user = cfg.users.values.find {
|
||||||
Role.Writer in it.roles
|
Role.Writer in it.roles
|
||||||
@@ -227,7 +47,6 @@ class TlsServerTest : AbstractServerTest() {
|
|||||||
val client: HttpClient = getHttpClient(getClientKeyStore(ca, X500Name("CN=${user.name}")))
|
val client: HttpClient = getHttpClient(getClientKeyStore(ca, X500Name("CN=${user.name}")))
|
||||||
|
|
||||||
val requestBuilder = newRequestBuilder(key)
|
val requestBuilder = newRequestBuilder(key)
|
||||||
.header("Authorization", buildAuthorizationHeader(user, PASSWORD))
|
|
||||||
.GET()
|
.GET()
|
||||||
|
|
||||||
val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
|
val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
|
||||||
@@ -235,9 +54,8 @@ class TlsServerTest : AbstractServerTest() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Order(4)
|
@Order(3)
|
||||||
fun putAsAWriterUser() {
|
fun putAsAWriterUser() {
|
||||||
|
|
||||||
val (key, value) = keyValuePair
|
val (key, value) = keyValuePair
|
||||||
val user = cfg.users.values.find {
|
val user = cfg.users.values.find {
|
||||||
Role.Writer in it.roles
|
Role.Writer in it.roles
|
||||||
@@ -246,7 +64,6 @@ class TlsServerTest : AbstractServerTest() {
|
|||||||
|
|
||||||
val requestBuilder = newRequestBuilder(key)
|
val requestBuilder = newRequestBuilder(key)
|
||||||
.header("Content-Type", "application/octet-stream")
|
.header("Content-Type", "application/octet-stream")
|
||||||
.header("Authorization", buildAuthorizationHeader(user, PASSWORD))
|
|
||||||
.PUT(HttpRequest.BodyPublishers.ofByteArray(value))
|
.PUT(HttpRequest.BodyPublishers.ofByteArray(value))
|
||||||
|
|
||||||
val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
|
val response: HttpResponse<String> = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString())
|
||||||
@@ -254,7 +71,7 @@ class TlsServerTest : AbstractServerTest() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Order(5)
|
@Order(4)
|
||||||
fun getAsAReaderUser() {
|
fun getAsAReaderUser() {
|
||||||
val (key, value) = keyValuePair
|
val (key, value) = keyValuePair
|
||||||
val user = cfg.users.values.find {
|
val user = cfg.users.values.find {
|
||||||
@@ -263,7 +80,6 @@ class TlsServerTest : AbstractServerTest() {
|
|||||||
val client: HttpClient = getHttpClient(getClientKeyStore(ca, X500Name("CN=${user.name}")))
|
val client: HttpClient = getHttpClient(getClientKeyStore(ca, X500Name("CN=${user.name}")))
|
||||||
|
|
||||||
val requestBuilder = newRequestBuilder(key)
|
val requestBuilder = newRequestBuilder(key)
|
||||||
.header("Authorization", buildAuthorizationHeader(user, PASSWORD))
|
|
||||||
.GET()
|
.GET()
|
||||||
|
|
||||||
val response: HttpResponse<ByteArray> =
|
val response: HttpResponse<ByteArray> =
|
||||||
@@ -273,7 +89,7 @@ class TlsServerTest : AbstractServerTest() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Order(6)
|
@Order(5)
|
||||||
fun getMissingKeyAsAReaderUser() {
|
fun getMissingKeyAsAReaderUser() {
|
||||||
val (key, _) = newEntry(random)
|
val (key, _) = newEntry(random)
|
||||||
val user = cfg.users.values.find {
|
val user = cfg.users.values.find {
|
||||||
@@ -282,11 +98,39 @@ class TlsServerTest : AbstractServerTest() {
|
|||||||
val client: HttpClient = getHttpClient(getClientKeyStore(ca, X500Name("CN=${user.name}")))
|
val client: HttpClient = getHttpClient(getClientKeyStore(ca, X500Name("CN=${user.name}")))
|
||||||
|
|
||||||
val requestBuilder = newRequestBuilder(key)
|
val requestBuilder = newRequestBuilder(key)
|
||||||
.header("Authorization", buildAuthorizationHeader(user, PASSWORD))
|
|
||||||
.GET()
|
.GET()
|
||||||
|
|
||||||
val response: HttpResponse<ByteArray> =
|
val response: HttpResponse<ByteArray> =
|
||||||
client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray())
|
client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray())
|
||||||
Assertions.assertEquals(HttpResponseStatus.NOT_FOUND.code(), response.statusCode())
|
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())
|
||||||
|
}
|
||||||
}
|
}
|
21
src/test/resources/logback.xml
Normal file
21
src/test/resources/logback.xml
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
<?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>
|
10
src/test/resources/net/woggioni/gbcs/test/gbcs-default.xml
Normal file
10
src/test/resources/net/woggioni/gbcs/test/gbcs-default.xml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
<?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"/>
|
||||||
|
<authentication>
|
||||||
|
<none/>
|
||||||
|
</authentication>
|
||||||
|
</gbcs:server>
|
13
src/test/resources/net/woggioni/gbcs/test/gbcs-memcached.xml
Normal file
13
src/test/resources/net/woggioni/gbcs/test/gbcs-memcached.xml
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<?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"
|
||||||
|
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">
|
||||||
|
<server host="127.0.0.1" port="11211"/>
|
||||||
|
</cache>
|
||||||
|
<authentication>
|
||||||
|
<none/>
|
||||||
|
</authentication>
|
||||||
|
</gbcs:server>
|
53
src/test/resources/net/woggioni/gbcs/test/gbcs-tls.xml
Normal file
53
src/test/resources/net/woggioni/gbcs/test/gbcs-tls.xml
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
<?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>
|
Reference in New Issue
Block a user