Compare commits
6 Commits
d5a2c4a591
...
0.0.3
Author | SHA1 | Date | |
---|---|---|---|
696cb74740
|
|||
59f267426c
|
|||
608a9d18de
|
|||
d2c00402df
|
|||
d701157b06
|
|||
01d5b1462c
|
@@ -17,45 +17,53 @@ jobs:
|
|||||||
- 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
|
||||||
env:
|
run: ./gradlew build
|
||||||
PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}
|
- name: Prepare Docker image build
|
||||||
run: ./gradlew build publish
|
run: ./gradlew prepareDockerBuild
|
||||||
build-docker:
|
- name: Get project version
|
||||||
name: "Build Docker images"
|
id: retrieve-version
|
||||||
runs-on: hostinger
|
run: ./gradlew -q version >> "$GITHUB_OUTPUT"
|
||||||
steps:
|
- name: Set up QEMU
|
||||||
-
|
uses: docker/setup-qemu-action@v3
|
||||||
name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3.4.0
|
uses: docker/setup-buildx-action@v3
|
||||||
with:
|
with:
|
||||||
driver: docker-container
|
driver: docker-container
|
||||||
-
|
- name: Login to Gitea container registry
|
||||||
name: Login to Gitea container registry
|
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: gitea.woggioni.net
|
registry: gitea.woggioni.net
|
||||||
username: woggioni
|
username: woggioni
|
||||||
password: ${{ secrets.PUBLISHER_TOKEN }}
|
password: ${{ secrets.PUBLISHER_TOKEN }}
|
||||||
-
|
-
|
||||||
name: Build and push gbcs images
|
name: Build gbcs Docker image
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v5.3.0
|
||||||
with:
|
with:
|
||||||
|
context: "docker/build/docker"
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
push: true
|
push: true
|
||||||
pull: true
|
pull: true
|
||||||
tags: |
|
tags: |
|
||||||
"gitea.woggioni.net/woggioni/gbcs:slim"
|
gitea.woggioni.net/woggioni/gbcs:latest
|
||||||
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/gbcs:buildx
|
gitea.woggioni.net/woggioni/gbcs:${{ steps.retrieve-version.outputs.VERSION }}
|
||||||
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/gbcs:buildx
|
|
||||||
target: release
|
target: release
|
||||||
|
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/gbcs:buildx
|
||||||
-
|
-
|
||||||
name: Build and push gbcs memcached image
|
name: Build gbcs memcached Docker image
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v5.3.0
|
||||||
with:
|
with:
|
||||||
|
context: "docker/build/docker"
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
push: true
|
push: true
|
||||||
pull: true
|
pull: true
|
||||||
tags: |
|
tags: |
|
||||||
"gitea.woggioni.net/woggioni/gbcs:latest"
|
gitea.woggioni.net/woggioni/gbcs:memcached
|
||||||
"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-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
|
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/gbcs:buildx
|
||||||
target: release-memcached
|
- name: Publish artifacts
|
||||||
|
env:
|
||||||
|
PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}
|
||||||
|
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
|
||||||
|
46
Dockerfile
46
Dockerfile
@@ -1,46 +1,2 @@
|
|||||||
FROM container-registry.oracle.com/graalvm/native-image:21 AS oracle
|
FROM gitea.woggioni.net/woggioni/gbcs:memcached
|
||||||
|
|
||||||
FROM ubuntu:24.04 AS build
|
|
||||||
COPY --from=oracle /usr/lib64/graalvm/ /usr/lib64/graalvm/
|
|
||||||
ENV JAVA_HOME=/usr/lib64/graalvm/graalvm-java21
|
|
||||||
USER ubuntu
|
|
||||||
WORKDIR /home/ubuntu
|
|
||||||
|
|
||||||
RUN mkdir gbcs
|
|
||||||
WORKDIR /home/ubuntu/gbcs
|
|
||||||
|
|
||||||
COPY --chown=ubuntu:users native-image native-image
|
|
||||||
COPY --chown=ubuntu:users .git .git
|
|
||||||
COPY --chown=ubuntu:users gbcs-base gbcs-base
|
|
||||||
COPY --chown=ubuntu:users gbcs-api gbcs-api
|
|
||||||
COPY --chown=ubuntu:users gbcs-memcached gbcs-memcached
|
|
||||||
COPY --chown=ubuntu:users src src
|
|
||||||
COPY --chown=ubuntu:users settings.gradle settings.gradle
|
|
||||||
COPY --chown=ubuntu:users build.gradle build.gradle
|
|
||||||
COPY --chown=ubuntu:users gradle.properties gradle.properties
|
|
||||||
COPY --chown=ubuntu:users gradle gradle
|
|
||||||
COPY --chown=ubuntu:users gradlew gradlew
|
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/home/ubuntu/.gradle,uid=1000,gid=1000 ./gradlew --no-daemon assemble
|
|
||||||
|
|
||||||
FROM alpine:latest AS base-release
|
|
||||||
RUN --mount=type=cache,target=/var/cache/apk apk update
|
|
||||||
RUN --mount=type=cache,target=/var/cache/apk apk add openjdk21-jre
|
|
||||||
RUN adduser -D luser
|
|
||||||
USER luser
|
|
||||||
WORKDIR /home/luser
|
|
||||||
|
|
||||||
FROM base-release AS release
|
|
||||||
RUN --mount=type=bind,from=build,source=/home/ubuntu/gbcs/build,target=/home/luser/build cp build/libs/gbcs-envelope*.jar gbcs.jar
|
|
||||||
ENTRYPOINT ["java", "-jar", "/home/luser/gbcs.jar"]
|
|
||||||
|
|
||||||
FROM base-release AS release-memcached
|
|
||||||
RUN --mount=type=bind,from=build,source=/home/ubuntu/gbcs/build,target=/home/luser/build cp build/libs/gbcs-envelope*.jar gbcs.jar
|
|
||||||
RUN mkdir plugins
|
|
||||||
WORKDIR /home/luser/plugins
|
|
||||||
RUN --mount=type=bind,from=build,source=/home/ubuntu/gbcs/gbcs-memcached/build/distributions,target=/build/distributions tar -xf /build/distributions/gbcs-memcached*.tar
|
|
||||||
WORKDIR /home/luser
|
|
||||||
ENTRYPOINT ["java", "-jar", "/home/luser/gbcs.jar"]
|
|
||||||
|
|
||||||
FROM release-memcached as compose
|
|
||||||
COPY --chown=luser:luser conf/gbcs-memcached.xml /home/luser/.config/gbcs/gbcs.xml
|
COPY --chown=luser:luser conf/gbcs-memcached.xml /home/luser/.config/gbcs/gbcs.xml
|
26
benchmark/build.gradle
Normal file
26
benchmark/build.gradle
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
plugins {
|
||||||
|
alias catalog.plugins.gradle.jmh
|
||||||
|
alias catalog.plugins.lombok
|
||||||
|
}
|
||||||
|
|
||||||
|
import me.champeau.jmh.JMHTask
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation rootProject
|
||||||
|
|
||||||
|
implementation catalog.jwo
|
||||||
|
implementation catalog.xz
|
||||||
|
implementation catalog.jackson.databind
|
||||||
|
|
||||||
|
jmhAnnotationProcessor catalog.lombok
|
||||||
|
}
|
||||||
|
|
||||||
|
jmh {
|
||||||
|
threads = 4
|
||||||
|
iterations = 2
|
||||||
|
fork = 1
|
||||||
|
warmupIterations = 1
|
||||||
|
warmupForks = 0
|
||||||
|
resultFormat = 'JSON'
|
||||||
|
}
|
||||||
|
|
170
benchmark/src/jmh/java/net/woggioni/gbcs/benchmark/Main.java
Normal file
170
benchmark/src/jmh/java/net/woggioni/gbcs/benchmark/Main.java
Normal file
@@ -0,0 +1,170 @@
|
|||||||
|
package net.woggioni.gbcs.benchmark;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.SneakyThrows;
|
||||||
|
import org.openjdk.jmh.annotations.Benchmark;
|
||||||
|
import org.openjdk.jmh.annotations.BenchmarkMode;
|
||||||
|
import org.openjdk.jmh.annotations.Level;
|
||||||
|
import org.openjdk.jmh.annotations.Mode;
|
||||||
|
import org.openjdk.jmh.annotations.OutputTimeUnit;
|
||||||
|
import org.openjdk.jmh.annotations.Scope;
|
||||||
|
import org.openjdk.jmh.annotations.Setup;
|
||||||
|
import org.openjdk.jmh.annotations.State;
|
||||||
|
|
||||||
|
import java.net.URI;
|
||||||
|
import java.net.http.HttpClient;
|
||||||
|
import java.net.http.HttpRequest;
|
||||||
|
import java.net.http.HttpResponse;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Base64;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.Properties;
|
||||||
|
import java.util.Random;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.function.Predicate;
|
||||||
|
|
||||||
|
public class Main {
|
||||||
|
|
||||||
|
@SneakyThrows
|
||||||
|
private static Properties loadProperties() {
|
||||||
|
Properties properties = new Properties();
|
||||||
|
try (final var is = Main.class.getResourceAsStream("/benchmark.properties")) {
|
||||||
|
properties.load(is);
|
||||||
|
}
|
||||||
|
return properties;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final Properties properties = loadProperties();
|
||||||
|
|
||||||
|
@State(Scope.Thread)
|
||||||
|
public static class ExecutionPlan {
|
||||||
|
private final Random random = new Random(101325);
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
private final HttpClient client = HttpClient.newHttpClient();
|
||||||
|
|
||||||
|
private final Map<String, byte[]> entries = new HashMap<>();
|
||||||
|
|
||||||
|
public final Map<String, byte[]> getEntries() {
|
||||||
|
return Collections.unmodifiableMap(entries);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Map.Entry<String, byte[]> newEntry() {
|
||||||
|
final var keyBuffer = new byte[0x20];
|
||||||
|
random.nextBytes(keyBuffer);
|
||||||
|
final var key = Base64.getUrlEncoder().encodeToString(keyBuffer);
|
||||||
|
final var value = new byte[0x1000];
|
||||||
|
random.nextBytes(value);
|
||||||
|
return Map.entry(key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SneakyThrows
|
||||||
|
public HttpRequest.Builder newRequestBuilder(String key) {
|
||||||
|
final var requestBuilder = HttpRequest.newBuilder()
|
||||||
|
.uri(getServerURI().resolve(key));
|
||||||
|
String user = getUser();
|
||||||
|
if (user != null) {
|
||||||
|
requestBuilder.header("Authorization", buildAuthorizationHeader(user, getPassword()));
|
||||||
|
}
|
||||||
|
return requestBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
@SneakyThrows
|
||||||
|
public URI getServerURI() {
|
||||||
|
return new URI(properties.getProperty("gbcs.server.url"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@SneakyThrows
|
||||||
|
public String getUser() {
|
||||||
|
return Optional.ofNullable(properties.getProperty("gbcs.server.username"))
|
||||||
|
.filter(Predicate.not(String::isEmpty))
|
||||||
|
.orElse(null);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@SneakyThrows
|
||||||
|
public String getPassword() {
|
||||||
|
return Optional.ofNullable(properties.getProperty("gbcs.server.password"))
|
||||||
|
.filter(Predicate.not(String::isEmpty))
|
||||||
|
.orElse(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String buildAuthorizationHeader(String user, String password) {
|
||||||
|
final var b64 = Base64.getEncoder().encode(String.format("%s:%s", user, password).getBytes(StandardCharsets.UTF_8));
|
||||||
|
return "Basic " + new String(b64);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@SneakyThrows
|
||||||
|
@Setup(Level.Trial)
|
||||||
|
public void setUp() {
|
||||||
|
try (final var client = HttpClient.newHttpClient()) {
|
||||||
|
for (int i = 0; i < 10000; i++) {
|
||||||
|
final var pair = newEntry();
|
||||||
|
final var requestBuilder = newRequestBuilder(pair.getKey())
|
||||||
|
.header("Content-Type", "application/octet-stream")
|
||||||
|
.PUT(HttpRequest.BodyPublishers.ofByteArray(pair.getValue()));
|
||||||
|
final var response = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofString());
|
||||||
|
if (201 != response.statusCode()) {
|
||||||
|
throw new IllegalStateException(Integer.toString(response.statusCode()));
|
||||||
|
} else {
|
||||||
|
entries.put(pair.getKey(), pair.getValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Iterator<Map.Entry<String, byte[]>> it = null;
|
||||||
|
|
||||||
|
private Map.Entry<String, byte[]> nextEntry() {
|
||||||
|
if (it == null || !it.hasNext()) {
|
||||||
|
it = getEntries().entrySet().iterator();
|
||||||
|
}
|
||||||
|
return it.next();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SneakyThrows
|
||||||
|
@Benchmark
|
||||||
|
@BenchmarkMode(Mode.Throughput)
|
||||||
|
@OutputTimeUnit(TimeUnit.SECONDS)
|
||||||
|
public void get(ExecutionPlan plan) {
|
||||||
|
final var client = plan.getClient();
|
||||||
|
final var entry = plan.nextEntry();
|
||||||
|
final var requestBuilder = plan.newRequestBuilder(entry.getKey())
|
||||||
|
.header("Accept", "application/octet-stream")
|
||||||
|
.GET();
|
||||||
|
final var response = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray());
|
||||||
|
if (200 != response.statusCode()) {
|
||||||
|
throw new IllegalStateException(Integer.toString(response.statusCode()));
|
||||||
|
} else {
|
||||||
|
if (!Arrays.equals(entry.getValue(), response.body())) {
|
||||||
|
throw new IllegalStateException("Retrieved unexpected value");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@SneakyThrows
|
||||||
|
@Benchmark
|
||||||
|
@BenchmarkMode(Mode.Throughput)
|
||||||
|
@OutputTimeUnit(TimeUnit.SECONDS)
|
||||||
|
public void put(Main.ExecutionPlan plan) {
|
||||||
|
final var client = plan.getClient();
|
||||||
|
final var entry = plan.nextEntry();
|
||||||
|
|
||||||
|
final var requestBuilder = plan.newRequestBuilder(entry.getKey())
|
||||||
|
.header("Content-Type", "application/octet-stream")
|
||||||
|
.PUT(HttpRequest.BodyPublishers.ofByteArray(entry.getValue()));
|
||||||
|
|
||||||
|
final var response = client.send(requestBuilder.build(), HttpResponse.BodyHandlers.ofByteArray());
|
||||||
|
if (201 != response.statusCode()) {
|
||||||
|
throw new IllegalStateException(Integer.toString(response.statusCode()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
1
benchmark/src/jmh/resources/benchmark.properties
Normal file
1
benchmark/src/jmh/resources/benchmark.properties
Normal file
@@ -0,0 +1 @@
|
|||||||
|
gbcs.server.url= http://localhost:8080
|
80
build.gradle
80
build.gradle
@@ -1,31 +1,24 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
id 'jvm-test-suite'
|
|
||||||
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
|
alias catalog.plugins.lombok
|
||||||
alias catalog.plugins.graalvm.native.image
|
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
}
|
}
|
||||||
|
|
||||||
import net.woggioni.gradle.envelope.EnvelopeJarTask
|
|
||||||
import net.woggioni.gradle.graalvm.NativeImagePlugin
|
|
||||||
import net.woggioni.gradle.graalvm.NativeImageTask
|
|
||||||
import net.woggioni.gradle.graalvm.NativeImageConfigurationTask
|
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
|
||||||
|
|
||||||
allprojects {
|
allprojects { subproject ->
|
||||||
group = 'net.woggioni'
|
group = 'net.woggioni'
|
||||||
|
|
||||||
if(project.currentTag.isPresent()) {
|
if(project.currentTag.isPresent()) {
|
||||||
version = project.currentTag
|
version = project.currentTag.map { it[0] }.get()
|
||||||
} else {
|
} else {
|
||||||
version = project.gitRevision.map { gitRevision ->
|
version = project.gitRevision.map { gitRevision ->
|
||||||
"${getProperty('gbcs.version')}.${gitRevision[0..10]}"
|
"${getProperty('gbcs.version')}.${gitRevision[0..10]}"
|
||||||
}
|
}.get()
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
@@ -41,6 +34,11 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pluginManager.withPlugin('java-library') {
|
pluginManager.withPlugin('java-library') {
|
||||||
|
|
||||||
|
ext {
|
||||||
|
jpmsModuleName = subproject.group + '.' + subproject.name.replace('-', '.')
|
||||||
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
modularity.inferModulePath = true
|
modularity.inferModulePath = true
|
||||||
@@ -58,6 +56,16 @@ allprojects {
|
|||||||
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
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pluginManager.withPlugin(catalog.plugins.kotlin.jvm.get().pluginId) {
|
pluginManager.withPlugin(catalog.plugins.kotlin.jvm.get().pluginId) {
|
||||||
@@ -94,32 +102,16 @@ allprojects {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Property<String> mainClassName = objects.property(String.class)
|
|
||||||
mainClassName.set('net.woggioni.gbcs.GradleBuildCacheServer')
|
|
||||||
|
|
||||||
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
|
|
||||||
options.compilerArgs << '--patch-module' << 'net.woggioni.gbcs=' + project.sourceSets.main.output.asPath
|
|
||||||
options.javaModuleVersion = version
|
|
||||||
options.javaModuleMainClass = mainClassName
|
|
||||||
}
|
|
||||||
|
|
||||||
envelopeJar {
|
|
||||||
mainModule = 'net.woggioni.gbcs'
|
|
||||||
mainClass = mainClassName
|
|
||||||
|
|
||||||
extraClasspath = ["plugins"]
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation catalog.jwo
|
implementation catalog.jwo
|
||||||
implementation catalog.slf4j.api
|
implementation catalog.slf4j.api
|
||||||
implementation catalog.netty.codec.http
|
implementation catalog.netty.codec.http
|
||||||
|
|
||||||
implementation project('gbcs-base')
|
api project('gbcs-base')
|
||||||
implementation project('gbcs-api')
|
api project('gbcs-api')
|
||||||
|
|
||||||
// runtimeOnly catalog.slf4j.jdk14
|
// runtimeOnly catalog.slf4j.jdk14
|
||||||
runtimeOnly catalog.logback.classic
|
testRuntimeOnly catalog.logback.classic
|
||||||
|
|
||||||
testImplementation catalog.bcprov.jdk18on
|
testImplementation catalog.bcprov.jdk18on
|
||||||
testImplementation catalog.bcpkix.jdk18on
|
testImplementation catalog.bcpkix.jdk18on
|
||||||
@@ -130,33 +122,17 @@ dependencies {
|
|||||||
testRuntimeOnly project("gbcs-memcached")
|
testRuntimeOnly project("gbcs-memcached")
|
||||||
}
|
}
|
||||||
|
|
||||||
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/logback.xml'
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def envelopeJarArtifact = artifacts.add('archives', envelopeJarTaskProvider.get().archiveFile.get().asFile) {
|
|
||||||
type = 'jar'
|
|
||||||
builtBy envelopeJarTaskProvider
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named(NativeImagePlugin.CONFIGURE_NATIVE_IMAGE_TASK_NAME, NativeImageConfigurationTask) {
|
|
||||||
mainClass = 'net.woggioni.gbcs.GraalNativeImageConfiguration'
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named(NativeImagePlugin.NATIVE_IMAGE_TASK_NAME, NativeImageTask) {
|
|
||||||
mainClass = 'net.woggioni.gbcs.GradleBuildCacheServer'
|
|
||||||
useMusl = true
|
|
||||||
buildStaticImage = true
|
|
||||||
}
|
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
publications {
|
publications {
|
||||||
maven(MavenPublication) {
|
maven(MavenPublication) {
|
||||||
artifact envelopeJarArtifact
|
from(components["java"])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.register('version') {
|
||||||
|
doLast {
|
||||||
|
println("VERSION=$version")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<gbcs:server useVirtualThreads="false" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
<gbcs:server useVirtualThreads="true" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns:gbcs="urn:net.woggioni.gbcs"
|
xmlns:gbcs="urn:net.woggioni.gbcs"
|
||||||
xmlns:gbcs-memcached="urn:net.woggioni.gbcs-memcached"
|
xmlns:gbcs-memcached="urn:net.woggioni.gbcs-memcached"
|
||||||
xs:schemaLocation="urn:net.woggioni.gbcs-memcached classpath:net/woggioni/gbcs/memcached/schema/gbcs-memcached.xsd urn:net.woggioni.gbcs classpath:net/woggioni/gbcs/schema/gbcs.xsd">
|
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" />
|
<bind host="0.0.0.0" port="13080" />
|
||||||
<cache xs:type="gbcs-memcached:memcachedCacheType" max-age="P7D" max-size="16777216" compression-mode="zip">
|
<cache xs:type="gbcs-memcached:memcachedCacheType" max-age="P7D" max-size="16777216" compression-mode="zip">
|
||||||
<server host="memcached" port="11211"/>
|
<server host="memcached" port="11211"/>
|
||||||
|
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>
|
@@ -11,7 +11,6 @@ services:
|
|||||||
gbcs:
|
gbcs:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
target: compose
|
|
||||||
container_name: gbcs
|
container_name: gbcs
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
|
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"]
|
||||||
|
|
||||||
|
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"]
|
||||||
|
|
||||||
|
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 }]
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@@ -1,11 +1,16 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
|
id 'maven-publish'
|
||||||
alias catalog.plugins.lombok
|
alias catalog.plugins.lombok
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
|
publishing {
|
||||||
options.javaModuleVersion = version
|
publications {
|
||||||
|
maven(MavenPublication) {
|
||||||
|
from(components["java"])
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
@@ -1,6 +1,7 @@
|
|||||||
package net.woggioni.gbcs.api;
|
package net.woggioni.gbcs.api;
|
||||||
|
|
||||||
|
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.Value;
|
import lombok.Value;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
@@ -23,25 +24,18 @@ public class Configuration {
|
|||||||
|
|
||||||
@Value
|
@Value
|
||||||
public static class Group {
|
public static class Group {
|
||||||
|
@EqualsAndHashCode.Include
|
||||||
String name;
|
String name;
|
||||||
Set<Role> roles;
|
Set<Role> roles;
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
return name.hashCode();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Value
|
@Value
|
||||||
public static class User {
|
public static class User {
|
||||||
|
@EqualsAndHashCode.Include
|
||||||
String name;
|
String name;
|
||||||
String password;
|
String password;
|
||||||
Set<Group> groups;
|
Set<Group> groups;
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
return name.hashCode();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Set<Role> getRoles() {
|
public Set<Role> getRoles() {
|
||||||
return groups.stream()
|
return groups.stream()
|
||||||
|
@@ -1,8 +1,7 @@
|
|||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
|
id 'maven-publish'
|
||||||
alias catalog.plugins.kotlin.jvm
|
alias catalog.plugins.kotlin.jvm
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11,11 +10,10 @@ dependencies {
|
|||||||
compileOnly catalog.slf4j.api
|
compileOnly catalog.slf4j.api
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
|
publishing {
|
||||||
options.compilerArgs << '--patch-module' << 'net.woggioni.gbcs.base=' + project.sourceSets.main.output.asPath
|
publications {
|
||||||
options.javaModuleVersion = version
|
maven(MavenPublication) {
|
||||||
|
from(components["java"])
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named("compileKotlin", KotlinCompile.class) {
|
|
||||||
compilerOptions.jvmTarget = JvmTarget.JVM_21
|
|
||||||
}
|
}
|
@@ -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,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
|
||||||
|
}
|
||||||
|
}
|
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.NativeImagePlugin
|
||||||
|
import net.woggioni.gradle.graalvm.NativeImageTask
|
||||||
|
import net.woggioni.gradle.graalvm.NativeImageConfigurationTask
|
||||||
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
|
||||||
|
Property<String> mainClassName = objects.property(String.class)
|
||||||
|
mainClassName.set('net.woggioni.gbcs.cli.GradleBuildCacheServerCli')
|
||||||
|
|
||||||
|
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
|
||||||
|
options.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 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 = 'net.woggioni.gbcs.GraalNativeImageConfiguration'
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named(NativeImagePlugin.NATIVE_IMAGE_TASK_NAME, NativeImageTask) {
|
||||||
|
mainClass = 'net.woggioni.gbcs.GradleBuildCacheServer'
|
||||||
|
useMusl = true
|
||||||
|
buildStaticImage = true
|
||||||
|
}
|
||||||
|
|
||||||
|
artifacts {
|
||||||
|
release(envelopeJarTaskProvider)
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
maven(MavenPublication) {
|
||||||
|
artifact envelopeJar
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
15
gbcs-cli/src/main/java/module-info.java
Normal file
15
gbcs-cli/src/main/java/module-info.java
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
module net.woggioni.gbcs.cli {
|
||||||
|
requires org.slf4j;
|
||||||
|
requires net.woggioni.gbcs;
|
||||||
|
requires info.picocli;
|
||||||
|
requires net.woggioni.gbcs.base;
|
||||||
|
requires kotlin.stdlib;
|
||||||
|
requires net.woggioni.jwo;
|
||||||
|
|
||||||
|
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,99 @@
|
|||||||
|
package net.woggioni.gbcs.cli
|
||||||
|
|
||||||
|
import net.woggioni.gbcs.GradleBuildCacheServer
|
||||||
|
import net.woggioni.gbcs.GradleBuildCacheServer.Companion.DEFAULT_CONFIGURATION_URL
|
||||||
|
import net.woggioni.gbcs.base.GbcsUrlStreamHandlerFactory
|
||||||
|
import net.woggioni.gbcs.base.contextLogger
|
||||||
|
import net.woggioni.gbcs.base.debug
|
||||||
|
import net.woggioni.gbcs.base.info
|
||||||
|
import net.woggioni.gbcs.cli.impl.AbstractVersionProvider
|
||||||
|
import net.woggioni.gbcs.cli.impl.GbcsCommand
|
||||||
|
import net.woggioni.gbcs.cli.impl.commands.PasswordHashCommand
|
||||||
|
import net.woggioni.jwo.Application
|
||||||
|
import net.woggioni.jwo.JWO
|
||||||
|
import org.slf4j.Logger
|
||||||
|
import picocli.CommandLine
|
||||||
|
import picocli.CommandLine.Model.CommandSpec
|
||||||
|
import java.io.ByteArrayOutputStream
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Path
|
||||||
|
|
||||||
|
|
||||||
|
@CommandLine.Command(
|
||||||
|
name = "gbcs", versionProvider = GradleBuildCacheServerCli.VersionProvider::class
|
||||||
|
)
|
||||||
|
class GradleBuildCacheServerCli(application : Application, private val log : Logger) : 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(app, log)
|
||||||
|
val commandLine = CommandLine(gbcsCli)
|
||||||
|
commandLine.setExecutionExceptionHandler { ex, cl, parseResult ->
|
||||||
|
log.error(ex.message, ex)
|
||||||
|
CommandLine.ExitCode.SOFTWARE
|
||||||
|
}
|
||||||
|
commandLine.addSubcommand(PasswordHashCommand())
|
||||||
|
System.exit(commandLine.execute(*args))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ["-c", "--config-file"],
|
||||||
|
description = ["Read the application configuration from this file"],
|
||||||
|
paramLabel = "CONFIG_FILE"
|
||||||
|
)
|
||||||
|
private var configurationFile: Path = findConfigurationFile(application)
|
||||||
|
|
||||||
|
@CommandLine.Option(names = ["-V", "--version"], versionHelp = true)
|
||||||
|
var versionHelp = false
|
||||||
|
private set
|
||||||
|
|
||||||
|
@CommandLine.Spec
|
||||||
|
private lateinit var spec: CommandSpec
|
||||||
|
|
||||||
|
private fun findConfigurationFile(app : Application): Path {
|
||||||
|
val confDir = app.computeConfigurationDirectory()
|
||||||
|
val configurationFile = confDir.resolve("gbcs.xml")
|
||||||
|
return configurationFile
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun createDefaultConfigurationFile(configurationFile : Path) {
|
||||||
|
log.info {
|
||||||
|
"Creating default configuration file at '$configurationFile'"
|
||||||
|
}
|
||||||
|
val defaultConfigurationFileResource = DEFAULT_CONFIGURATION_URL
|
||||||
|
Files.newOutputStream(configurationFile).use { outputStream ->
|
||||||
|
defaultConfigurationFileResource.openStream().use { inputStream ->
|
||||||
|
JWO.copy(inputStream, outputStream)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun run() {
|
||||||
|
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,32 @@
|
|||||||
|
package net.woggioni.gbcs.cli.impl
|
||||||
|
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.net.URL
|
||||||
|
import java.util.Enumeration
|
||||||
|
import java.util.jar.Attributes
|
||||||
|
import java.util.jar.JarFile
|
||||||
|
import java.util.jar.Manifest
|
||||||
|
|
||||||
|
|
||||||
|
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,11 @@
|
|||||||
|
package net.woggioni.gbcs.cli.impl
|
||||||
|
|
||||||
|
import picocli.CommandLine
|
||||||
|
|
||||||
|
|
||||||
|
abstract class GbcsCommand : Runnable {
|
||||||
|
|
||||||
|
@CommandLine.Option(names = ["-h", "--help"], usageHelp = true)
|
||||||
|
var usageHelp = false
|
||||||
|
private set
|
||||||
|
}
|
@@ -0,0 +1,38 @@
|
|||||||
|
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.BufferedWriter
|
||||||
|
import java.io.OutputStream
|
||||||
|
import java.io.OutputStreamWriter
|
||||||
|
|
||||||
|
|
||||||
|
@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],
|
||||||
|
defaultValue = "stdout",
|
||||||
|
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")
|
||||||
|
|
||||||
|
BufferedWriter(OutputStreamWriter(outputStream, Charsets.UTF_8)).use {
|
||||||
|
it.write(hashPassword(password1))
|
||||||
|
it.newLine()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -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,7 +6,7 @@
|
|||||||
<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>
|
@@ -22,7 +22,15 @@ configurations {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
release {
|
||||||
|
transitive = false
|
||||||
|
canBeConsumed = true
|
||||||
|
canBeResolved = true
|
||||||
|
visible = true
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly project(':gbcs-base')
|
compileOnly project(':gbcs-base')
|
||||||
compileOnly project(':gbcs-api')
|
compileOnly project(':gbcs-api')
|
||||||
@@ -30,15 +38,6 @@ dependencies {
|
|||||||
implementation catalog.xmemcached
|
implementation catalog.xmemcached
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
|
|
||||||
options.compilerArgs << '--patch-module' << 'net.woggioni.gbcs.memcached=' + project.sourceSets.main.output.asPath
|
|
||||||
options.javaModuleVersion = version
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named("compileKotlin", KotlinCompile.class) {
|
|
||||||
compilerOptions.jvmTarget = JvmTarget.JVM_21
|
|
||||||
}
|
|
||||||
|
|
||||||
Provider<Tar> bundleTask = tasks.register("bundle", Tar) {
|
Provider<Tar> bundleTask = tasks.register("bundle", Tar) {
|
||||||
from(tasks.named(JavaPlugin.JAR_TASK_NAME))
|
from(tasks.named(JavaPlugin.JAR_TASK_NAME))
|
||||||
from(configurations.bundle)
|
from(configurations.bundle)
|
||||||
@@ -49,16 +48,14 @@ tasks.named(BasePlugin.ASSEMBLE_TASK_NAME) {
|
|||||||
dependsOn(bundleTask)
|
dependsOn(bundleTask)
|
||||||
}
|
}
|
||||||
|
|
||||||
def bundleArtifact = artifacts.add('archives', bundleTask.get().archiveFile.get().asFile) {
|
artifacts {
|
||||||
type = 'tar'
|
release(bundleTask)
|
||||||
builtBy bundleTask
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
publications {
|
publications {
|
||||||
maven(MavenPublication) {
|
maven(MavenPublication) {
|
||||||
artifact bundleArtifact
|
artifact bundleTask
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -4,6 +4,7 @@ org.gradle.caching=true
|
|||||||
|
|
||||||
gbcs.version = 0.0.1
|
gbcs.version = 0.0.1
|
||||||
|
|
||||||
lys.version = 2025.01.08
|
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
|
||||||
|
@@ -29,5 +29,7 @@ rootProject.name = 'gbcs'
|
|||||||
include 'gbcs-api'
|
include 'gbcs-api'
|
||||||
include 'gbcs-base'
|
include 'gbcs-base'
|
||||||
include 'gbcs-memcached'
|
include 'gbcs-memcached'
|
||||||
|
include 'gbcs-cli'
|
||||||
|
include 'docker'
|
||||||
|
include 'benchmark'
|
||||||
|
|
||||||
|
@@ -1,8 +1,7 @@
|
|||||||
import net.woggioni.gbcs.api.CacheProvider;
|
import net.woggioni.gbcs.api.CacheProvider;
|
||||||
import net.woggioni.gbcs.url.ClasspathUrlStreamHandlerFactoryProvider;
|
|
||||||
import net.woggioni.gbcs.cache.FileSystemCacheProvider;
|
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;
|
||||||
@@ -19,9 +18,11 @@ open module net.woggioni.gbcs {
|
|||||||
requires net.woggioni.gbcs.base;
|
requires net.woggioni.gbcs.base;
|
||||||
requires net.woggioni.gbcs.api;
|
requires net.woggioni.gbcs.api;
|
||||||
|
|
||||||
provides java.net.URLStreamHandlerFactory with ClasspathUrlStreamHandlerFactoryProvider;
|
exports net.woggioni.gbcs;
|
||||||
uses java.net.URLStreamHandlerFactory;
|
|
||||||
uses CacheProvider;
|
|
||||||
|
|
||||||
|
opens net.woggioni.gbcs;
|
||||||
|
opens net.woggioni.gbcs.schema;
|
||||||
|
|
||||||
|
uses CacheProvider;
|
||||||
provides CacheProvider with FileSystemCacheProvider;
|
provides CacheProvider with FileSystemCacheProvider;
|
||||||
}
|
}
|
@@ -1,104 +0,0 @@
|
|||||||
package net.woggioni.gbcs.url;
|
|
||||||
|
|
||||||
import net.woggioni.jwo.Fun;
|
|
||||||
import net.woggioni.jwo.LazyValue;
|
|
||||||
|
|
||||||
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.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
public class ClasspathUrlStreamHandlerFactoryProvider implements URLStreamHandlerFactory {
|
|
||||||
|
|
||||||
private static final AtomicBoolean installed = new AtomicBoolean(false);
|
|
||||||
public static void install() {
|
|
||||||
if(!installed.getAndSet(true)) {
|
|
||||||
URL.setURLStreamHandlerFactory(new ClasspathUrlStreamHandlerFactoryProvider());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final LazyValue<Map<String, List<Module>>> packageMap = LazyValue.of(() ->
|
|
||||||
ClasspathUrlStreamHandlerFactoryProvider.class.getModule().getLayer()
|
|
||||||
.modules()
|
|
||||||
.stream()
|
|
||||||
.flatMap(m -> m.getPackages().stream().map(p -> Map.entry(p, m)))
|
|
||||||
.collect(
|
|
||||||
Collectors.groupingBy(
|
|
||||||
Map.Entry::getKey,
|
|
||||||
Collectors.mapping(
|
|
||||||
Map.Entry::getValue,
|
|
||||||
Collectors.toUnmodifiableList()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
),
|
|
||||||
LazyValue.ThreadSafetyMode.NONE
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
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 {
|
|
||||||
return Optional.ofNullable(getClass().getModule())
|
|
||||||
.filter(m -> m.getLayer() != null)
|
|
||||||
.map(m -> {
|
|
||||||
final var path = u.getPath();
|
|
||||||
final var i = path.lastIndexOf('/');
|
|
||||||
final var packageName = path.substring(0, i).replace('/', '.');
|
|
||||||
final var modules = packageMap.get().get(packageName);
|
|
||||||
return (URLConnection) new ModuleResourceURLConnection(u, modules);
|
|
||||||
})
|
|
||||||
.or(() -> Optional.of(classLoader).map(cl -> cl.getResource(u.getPath())).map((Fun<URL, URLConnection>) URL::openConnection))
|
|
||||||
.orElse(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public URLStreamHandler createURLStreamHandler(String protocol) {
|
|
||||||
URLStreamHandler result;
|
|
||||||
switch (protocol) {
|
|
||||||
case "classpath":
|
|
||||||
result = new Handler();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
result = null;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final class ModuleResourceURLConnection extends URLConnection {
|
|
||||||
private final List<Module> modules;
|
|
||||||
|
|
||||||
ModuleResourceURLConnection(URL url, List<Module> modules) {
|
|
||||||
super(url);
|
|
||||||
this.modules = modules;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void connect() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public InputStream getInputStream() throws IOException {
|
|
||||||
for(final var module : modules) {
|
|
||||||
final var result = module.getResourceAsStream(getURL().getPath());
|
|
||||||
if(result != null) return result;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -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
|
||||||
@@ -46,21 +45,22 @@ import net.woggioni.gbcs.api.Cache
|
|||||||
import net.woggioni.gbcs.api.Configuration
|
import net.woggioni.gbcs.api.Configuration
|
||||||
import net.woggioni.gbcs.api.Role
|
import net.woggioni.gbcs.api.Role
|
||||||
import net.woggioni.gbcs.api.exception.ContentTooLargeException
|
import net.woggioni.gbcs.api.exception.ContentTooLargeException
|
||||||
|
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.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.Xml
|
||||||
import net.woggioni.gbcs.base.contextLogger
|
import net.woggioni.gbcs.base.contextLogger
|
||||||
import net.woggioni.gbcs.base.debug
|
|
||||||
import net.woggioni.gbcs.base.info
|
import net.woggioni.gbcs.base.info
|
||||||
import net.woggioni.gbcs.configuration.Parser
|
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 net.woggioni.jwo.Application
|
|
||||||
import net.woggioni.jwo.JWO
|
import net.woggioni.jwo.JWO
|
||||||
import net.woggioni.jwo.Tuple2
|
import net.woggioni.jwo.Tuple2
|
||||||
import java.io.ByteArrayOutputStream
|
import java.io.OutputStream
|
||||||
import java.net.InetSocketAddress
|
import java.net.InetSocketAddress
|
||||||
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
|
||||||
@@ -69,7 +69,6 @@ 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
|
||||||
@@ -178,8 +177,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) {
|
||||||
@@ -187,7 +190,7 @@ 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))
|
||||||
@@ -208,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)
|
||||||
@@ -235,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)
|
||||||
@@ -294,7 +294,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
}
|
}
|
||||||
val cacheImplementation = cfg.cache.materialize()
|
val cacheImplementation = cfg.cache.materialize()
|
||||||
val prefix = Path.of("/").resolve(Path.of(cfg.serverPath ?: "/"))
|
val prefix = Path.of("/").resolve(Path.of(cfg.serverPath ?: "/"))
|
||||||
pipeline.addLast(group, ServerHandler(cacheImplementation, prefix))
|
pipeline.addLast(eventExecutorGroup, ServerHandler(cacheImplementation, prefix))
|
||||||
pipeline.addLast(ExceptionHandler())
|
pipeline.addLast(ExceptionHandler())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -344,20 +344,12 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
|
|||||||
|
|
||||||
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) 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 path = Path.of(msg.uri())
|
||||||
val prefix = path.parent
|
val prefix = path.parent
|
||||||
val key = path.fileName.toString()
|
val key = path.fileName.toString()
|
||||||
@@ -453,46 +445,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.isUseVirtualThread) {
|
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)
|
||||||
}
|
}
|
||||||
@@ -501,96 +497,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 val log by lazy {
|
|
||||||
contextLogger()
|
|
||||||
}
|
|
||||||
|
|
||||||
private const val PROTOCOL_HANDLER = "java.protocol.handler.pkgs"
|
|
||||||
private const val HANDLERS_PACKAGE = "net.woggioni.gbcs.url"
|
|
||||||
|
|
||||||
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
|
|
||||||
* reset the handler by trying to set a null [URLStreamHandlerFactory] which
|
|
||||||
* should have no effect other than clearing the handlers cache.
|
|
||||||
*/
|
|
||||||
private fun resetCachedUrlHandlers() {
|
|
||||||
try {
|
|
||||||
URL.setURLStreamHandlerFactory(null)
|
|
||||||
} catch (ex: Error) {
|
|
||||||
// Ignore
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun registerUrlProtocolHandler() {
|
|
||||||
val handlers = System.getProperty(PROTOCOL_HANDLER, "")
|
|
||||||
System.setProperty(
|
|
||||||
PROTOCOL_HANDLER,
|
|
||||||
if (handlers == null || handlers.isEmpty()) HANDLERS_PACKAGE else "$handlers|$HANDLERS_PACKAGE"
|
|
||||||
)
|
|
||||||
resetCachedUrlHandlers()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun loadConfiguration(args: Array<String>): Configuration {
|
|
||||||
// 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)) {
|
|
||||||
log.info {
|
|
||||||
"Creating default configuration file at '$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 = GBCS.CONFIGURATION_SCHEMA_URL
|
|
||||||
val dbf = Xml.newDocumentBuilderFactory(null)
|
val dbf = Xml.newDocumentBuilderFactory(null)
|
||||||
// dbf.schema = Xml.getSchema(this::class.java.module.getResourceAsStream("/net/woggioni/gbcs/gbcs.xsd"))
|
|
||||||
// dbf.schema = Xml.getSchema(schemaUrl)
|
|
||||||
val db = dbf.newDocumentBuilder()
|
val db = dbf.newDocumentBuilder()
|
||||||
val doc = Files.newInputStream(configurationFile).use(db::parse)
|
val doc = Files.newInputStream(configurationFile).use(db::parse)
|
||||||
return Parser.parse(doc)
|
return Parser.parse(doc)
|
||||||
}
|
}
|
||||||
|
|
||||||
@JvmStatic
|
fun dumpConfiguration(conf: Configuration, outputStream: OutputStream) {
|
||||||
fun main(args: Array<String>) {
|
Xml.write(Serializer.serialize(conf), outputStream)
|
||||||
ClasspathUrlStreamHandlerFactoryProvider.install()
|
|
||||||
val configuration = loadConfiguration(args)
|
|
||||||
log.debug {
|
|
||||||
ByteArrayOutputStream().also {
|
|
||||||
Xml.write(Serializer.serialize(configuration), it)
|
|
||||||
}.let {
|
|
||||||
"Server configuration:\n${String(it.toByteArray())}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
GradleBuildCacheServer(configuration).run().use {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
object GraalNativeImageConfiguration {
|
private val log = contextLogger()
|
||||||
@JvmStatic
|
|
||||||
fun main(args: Array<String>) {
|
|
||||||
val conf = GradleBuildCacheServer.loadConfiguration(args)
|
|
||||||
GradleBuildCacheServer(conf).run().use {
|
|
||||||
Thread.sleep(3000)
|
|
||||||
it.shutdown()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -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
|
||||||
@@ -12,18 +12,12 @@ 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 net.woggioni.gbcs.api.Role
|
import net.woggioni.gbcs.api.Role
|
||||||
import java.security.SecureRandom
|
|
||||||
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"
|
||||||
@@ -33,42 +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<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,4 +1,4 @@
|
|||||||
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
|
import net.woggioni.gbcs.api.Role
|
@@ -1,4 +1,4 @@
|
|||||||
package net.woggioni.gbcs
|
package net.woggioni.gbcs.auth
|
||||||
|
|
||||||
import java.security.KeyStore
|
import java.security.KeyStore
|
||||||
import java.security.cert.CertPathValidator
|
import java.security.cert.CertPathValidator
|
@@ -1,4 +1,4 @@
|
|||||||
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
|
@@ -32,7 +32,7 @@ object Parser {
|
|||||||
val serverPath = root.getAttribute("path")
|
val serverPath = root.getAttribute("path")
|
||||||
val useVirtualThread = root.getAttribute("useVirtualThreads")
|
val useVirtualThread = root.getAttribute("useVirtualThreads")
|
||||||
.takeIf(String::isNotEmpty)
|
.takeIf(String::isNotEmpty)
|
||||||
?.let(String::toBoolean) ?: false
|
?.let(String::toBoolean) ?: true
|
||||||
var authentication: Authentication? = null
|
var authentication: Authentication? = null
|
||||||
for (child in root.asIterable()) {
|
for (child in root.asIterable()) {
|
||||||
when (child.localName) {
|
when (child.localName) {
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<gbcs:server useVirtualThreads="false" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
<gbcs:server useVirtualThreads="false" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns:gbcs="urn:net.woggioni.gbcs"
|
xmlns:gbcs="urn:net.woggioni.gbcs"
|
||||||
xs:schemaLocation="urn:net.woggioni.gbcs classpath:net/woggioni/gbcs/schema/gbcs.xsd">
|
xs:schemaLocation="urn:net.woggioni.gbcs jpms://net.woggioni.gbcs/net/woggioni/gbcs/schema/gbcs.xsd">
|
||||||
<bind host="127.0.0.1" port="11443"/>
|
<bind host="127.0.0.1" port="8080"/>
|
||||||
<cache xs:type="gbcs:fileSystemCacheType" path="/tmp/gbcs" max-age="P7D"/>
|
<cache xs:type="gbcs:fileSystemCacheType" path="/tmp/gbcs" max-age="P7D"/>
|
||||||
<authentication>
|
<authentication>
|
||||||
<none/>
|
<none/>
|
||||||
|
@@ -10,9 +10,6 @@
|
|||||||
<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"/>
|
||||||
@@ -28,7 +25,7 @@
|
|||||||
<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">
|
||||||
|
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");
|
||||||
|
}
|
||||||
|
}
|
@@ -1,15 +1,17 @@
|
|||||||
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.AbstractNettyHttpAuthenticator.Companion.hashPassword
|
|
||||||
import net.woggioni.gbcs.api.Role
|
|
||||||
import net.woggioni.gbcs.base.Xml
|
|
||||||
import net.woggioni.gbcs.api.Configuration
|
import net.woggioni.gbcs.api.Configuration
|
||||||
|
import net.woggioni.gbcs.api.Role
|
||||||
|
import net.woggioni.gbcs.base.PasswordSecurity.hashPassword
|
||||||
|
import net.woggioni.gbcs.base.Xml
|
||||||
import net.woggioni.gbcs.cache.FileSystemCacheConfiguration
|
import net.woggioni.gbcs.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.io.IOException
|
||||||
import java.net.ServerSocket
|
import java.net.ServerSocket
|
||||||
import java.net.URI
|
import java.net.URI
|
||||||
import java.net.http.HttpClient
|
import java.net.http.HttpClient
|
||||||
@@ -41,7 +43,7 @@ class BasicAuthServerTest : AbstractServerTest() {
|
|||||||
val writersGroup = Configuration.Group("writers", setOf(Role.Writer))
|
val writersGroup = Configuration.Group("writers", setOf(Role.Writer))
|
||||||
cfg = Configuration(
|
cfg = Configuration(
|
||||||
"127.0.0.1",
|
"127.0.0.1",
|
||||||
ServerSocket(0).localPort + 1,
|
NetworkUtils.getFreePort(),
|
||||||
serverPath,
|
serverPath,
|
||||||
listOf(
|
listOf(
|
||||||
Configuration.User("user1", hashPassword(PASSWORD), setOf(readersGroup)),
|
Configuration.User("user1", hashPassword(PASSWORD), setOf(readersGroup)),
|
||||||
|
@@ -1,10 +1,10 @@
|
|||||||
package net.woggioni.gbcs.test
|
package net.woggioni.gbcs.test
|
||||||
|
|
||||||
|
import net.woggioni.gbcs.base.GbcsUrlStreamHandlerFactory
|
||||||
import net.woggioni.gbcs.base.GBCS.toUrl
|
import net.woggioni.gbcs.base.GBCS.toUrl
|
||||||
import net.woggioni.gbcs.base.Xml
|
import net.woggioni.gbcs.base.Xml
|
||||||
import net.woggioni.gbcs.configuration.Parser
|
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.io.TempDir
|
import org.junit.jupiter.api.io.TempDir
|
||||||
import org.junit.jupiter.params.ParameterizedTest
|
import org.junit.jupiter.params.ParameterizedTest
|
||||||
@@ -22,7 +22,7 @@ class ConfigurationTest {
|
|||||||
)
|
)
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
fun test(configurationUrl: String, @TempDir testDir: Path) {
|
fun test(configurationUrl: String, @TempDir testDir: Path) {
|
||||||
ClasspathUrlStreamHandlerFactoryProvider.install()
|
GbcsUrlStreamHandlerFactory.install()
|
||||||
val doc = Xml.parseXml(configurationUrl.toUrl())
|
val doc = Xml.parseXml(configurationUrl.toUrl())
|
||||||
val cfg = Parser.parse(doc)
|
val cfg = Parser.parse(doc)
|
||||||
val configFile = testDir.resolve("gbcs.xml")
|
val configFile = testDir.resolve("gbcs.xml")
|
||||||
|
@@ -5,6 +5,7 @@ import net.woggioni.gbcs.base.Xml
|
|||||||
import net.woggioni.gbcs.api.Configuration
|
import net.woggioni.gbcs.api.Configuration
|
||||||
import net.woggioni.gbcs.cache.FileSystemCacheConfiguration
|
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
|
||||||
@@ -32,7 +33,7 @@ class NoAuthServerTest : AbstractServerTest() {
|
|||||||
this.cacheDir = testDir.resolve("cache")
|
this.cacheDir = testDir.resolve("cache")
|
||||||
cfg = Configuration(
|
cfg = Configuration(
|
||||||
"127.0.0.1",
|
"127.0.0.1",
|
||||||
ServerSocket(0).localPort + 1,
|
NetworkUtils.getFreePort(),
|
||||||
serverPath,
|
serverPath,
|
||||||
emptyMap(),
|
emptyMap(),
|
||||||
emptyMap(),
|
emptyMap(),
|
||||||
@@ -104,4 +105,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())
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
}
|
}
|
@@ -8,6 +8,7 @@ import net.woggioni.gbcs.cache.FileSystemCacheConfiguration
|
|||||||
import net.woggioni.gbcs.configuration.Serializer
|
import net.woggioni.gbcs.configuration.Serializer
|
||||||
import net.woggioni.gbcs.utils.CertificateUtils
|
import net.woggioni.gbcs.utils.CertificateUtils
|
||||||
import net.woggioni.gbcs.utils.CertificateUtils.X509Credentials
|
import net.woggioni.gbcs.utils.CertificateUtils.X509Credentials
|
||||||
|
import net.woggioni.gbcs.utils.NetworkUtils
|
||||||
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
|
||||||
@@ -146,7 +147,7 @@ class TlsServerTest : AbstractServerTest() {
|
|||||||
createKeyStoreAndTrustStore()
|
createKeyStoreAndTrustStore()
|
||||||
cfg = Configuration(
|
cfg = Configuration(
|
||||||
"127.0.0.1",
|
"127.0.0.1",
|
||||||
ServerSocket(0).localPort + 1,
|
NetworkUtils.getFreePort(),
|
||||||
serverPath,
|
serverPath,
|
||||||
users.asSequence().map { it.name to it }.toMap(),
|
users.asSequence().map { it.name to it }.toMap(),
|
||||||
sequenceOf(writersGroup, readersGroup).map { it.name to it }.toMap(),
|
sequenceOf(writersGroup, readersGroup).map { it.name to it }.toMap(),
|
||||||
@@ -227,7 +228,6 @@ class TlsServerTest : AbstractServerTest() {
|
|||||||
@Test
|
@Test
|
||||||
@Order(3)
|
@Order(3)
|
||||||
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
|
||||||
@@ -245,7 +245,6 @@ class TlsServerTest : AbstractServerTest() {
|
|||||||
@Test
|
@Test
|
||||||
@Order(4)
|
@Order(4)
|
||||||
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
|
||||||
|
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>
|
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<gbcs:server useVirtualThreads="false" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
<gbcs:server useVirtualThreads="false" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns:gbcs="urn:net.woggioni.gbcs"
|
xmlns:gbcs="urn:net.woggioni.gbcs"
|
||||||
xs:schemaLocation="urn:net.woggioni.gbcs classpath:net/woggioni/gbcs/schema/gbcs.xsd">
|
xs:schemaLocation="urn:net.woggioni.gbcs jpms://net.woggioni.gbcs/net/woggioni/gbcs/schema/gbcs.xsd">
|
||||||
<bind host="127.0.0.1" port="11443"/>
|
<bind host="127.0.0.1" port="11443"/>
|
||||||
<cache xs:type="gbcs:fileSystemCacheType" path="/tmp/gbcs" max-age="P7D"/>
|
<cache xs:type="gbcs:fileSystemCacheType" path="/tmp/gbcs" max-age="P7D"/>
|
||||||
<authentication>
|
<authentication>
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
<gbcs:server useVirtualThreads="false" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
<gbcs:server useVirtualThreads="false" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns:gbcs="urn:net.woggioni.gbcs"
|
xmlns:gbcs="urn:net.woggioni.gbcs"
|
||||||
xmlns:gbcs-memcached="urn:net.woggioni.gbcs-memcached"
|
xmlns:gbcs-memcached="urn:net.woggioni.gbcs-memcached"
|
||||||
xs:schemaLocation="urn:net.woggioni.gbcs classpath:net/woggioni/gbcs/schema/gbcs.xsd urn:net.woggioni.gbcs-memcached classpath:net/woggioni/gbcs/memcached/schema/gbcs-memcached.xsd">
|
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" />
|
<bind host="127.0.0.1" port="11443" />
|
||||||
<cache xs:type="gbcs-memcached:memcachedCacheType" max-age="P7D" max-size="101325" compression-mode="gzip" digest="SHA-256">
|
<cache xs:type="gbcs-memcached:memcachedCacheType" max-age="P7D" max-size="101325" compression-mode="gzip" digest="SHA-256">
|
||||||
<server host="127.0.0.1" port="11211"/>
|
<server host="127.0.0.1" port="11211"/>
|
||||||
|
Reference in New Issue
Block a user