Compare commits
42 Commits
Author | SHA1 | Date | |
---|---|---|---|
7eca8a270d
|
|||
84d7c977f9
|
|||
317eadce07
|
|||
af79e74b95
|
|||
78ae21caa4
|
|||
6c0eadb9fb
|
|||
5fef1b932e
|
|||
5e173dbf62
|
|||
53b24e3d54
|
|||
7d0f24fa58
|
|||
1b6cf1bd96
|
|||
4180df2352
|
|||
c2e388b931
|
|||
6c62ac85c0
|
|||
89153b60f8
|
|||
a2a40ab60f
|
|||
45458761f3
|
|||
90a5834f5f
|
|||
1823d0b9ca
|
|||
649cbba954
|
|||
eb9ccce3be
|
|||
316f64cf9d
|
|||
24a49779f9
|
|||
423b749db9
|
|||
9ce3e7fa0a
|
|||
1e6ece37a5
|
|||
fc9900d821
|
|||
1a78c8092b
|
|||
3d1847c408
|
|||
702556bfbb
|
|||
06e9e7ca09
|
|||
fa5bb55baa
|
|||
007d0fffd6
|
|||
75ebf2248f
|
|||
241d95fe1c
|
|||
3b7030c302
|
|||
a8670277e7
|
|||
03ee75266d
|
|||
05a265e4b4
|
|||
5af99330f8
|
|||
747168cda3
|
|||
225f156864
|
@@ -9,11 +9,6 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Setup Java
|
|
||||||
uses: actions/setup-java@v4
|
|
||||||
with:
|
|
||||||
distribution: graalvm
|
|
||||||
java-version: 21
|
|
||||||
- name: Setup Gradle
|
- name: Setup Gradle
|
||||||
uses: gradle/actions/setup-gradle@v3
|
uses: gradle/actions/setup-gradle@v3
|
||||||
- name: Execute Gradle build
|
- name: Execute Gradle build
|
||||||
@@ -36,7 +31,7 @@ jobs:
|
|||||||
username: woggioni
|
username: woggioni
|
||||||
password: ${{ secrets.PUBLISHER_TOKEN }}
|
password: ${{ secrets.PUBLISHER_TOKEN }}
|
||||||
-
|
-
|
||||||
name: Build gbcs Docker image
|
name: Build rbcs Docker image
|
||||||
uses: docker/build-push-action@v5.3.0
|
uses: docker/build-push-action@v5.3.0
|
||||||
with:
|
with:
|
||||||
context: "docker/build/docker"
|
context: "docker/build/docker"
|
||||||
@@ -44,12 +39,12 @@ jobs:
|
|||||||
push: true
|
push: true
|
||||||
pull: true
|
pull: true
|
||||||
tags: |
|
tags: |
|
||||||
gitea.woggioni.net/woggioni/gbcs:latest
|
gitea.woggioni.net/woggioni/rbcs:latest
|
||||||
gitea.woggioni.net/woggioni/gbcs:${{ steps.retrieve-version.outputs.VERSION }}
|
gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}
|
||||||
target: release
|
target: release
|
||||||
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/gbcs:buildx
|
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/rbcs:buildx
|
||||||
-
|
-
|
||||||
name: Build gbcs memcached Docker image
|
name: Build rbcs memcache Docker image
|
||||||
uses: docker/build-push-action@v5.3.0
|
uses: docker/build-push-action@v5.3.0
|
||||||
with:
|
with:
|
||||||
context: "docker/build/docker"
|
context: "docker/build/docker"
|
||||||
@@ -57,11 +52,11 @@ jobs:
|
|||||||
push: true
|
push: true
|
||||||
pull: true
|
pull: true
|
||||||
tags: |
|
tags: |
|
||||||
gitea.woggioni.net/woggioni/gbcs:memcached
|
gitea.woggioni.net/woggioni/rbcs:memcache
|
||||||
gitea.woggioni.net/woggioni/gbcs:memcached-${{ steps.retrieve-version.outputs.VERSION }}
|
gitea.woggioni.net/woggioni/rbcs:memcache-${{ steps.retrieve-version.outputs.VERSION }}
|
||||||
target: release-memcached
|
target: release-memcache
|
||||||
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/gbcs:buildx
|
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/rbcs: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/rbcs:buildx
|
||||||
- name: Publish artifacts
|
- name: Publish artifacts
|
||||||
env:
|
env:
|
||||||
PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}
|
PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@@ -4,4 +4,4 @@
|
|||||||
# Ignore Gradle build output directory
|
# Ignore Gradle build output directory
|
||||||
build
|
build
|
||||||
|
|
||||||
gbcs-cli/native-image/*.json
|
rbcs-cli/native-image/*.json
|
||||||
|
@@ -1,2 +0,0 @@
|
|||||||
FROM gitea.woggioni.net/woggioni/gbcs:memcached
|
|
||||||
COPY --chown=luser:luser conf/gbcs-memcached.xml /home/luser/.config/gbcs/gbcs.xml
|
|
@@ -1,26 +0,0 @@
|
|||||||
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'
|
|
||||||
}
|
|
||||||
|
|
@@ -1,170 +0,0 @@
|
|||||||
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 +0,0 @@
|
|||||||
gbcs.server.url= http://localhost:8080
|
|
55
build.gradle
55
build.gradle
@@ -1,14 +1,12 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
alias catalog.plugins.kotlin.jvm apply false
|
||||||
alias catalog.plugins.kotlin.jvm
|
|
||||||
alias catalog.plugins.sambal
|
alias catalog.plugins.sambal
|
||||||
alias catalog.plugins.lombok
|
alias catalog.plugins.lombok apply false
|
||||||
id 'maven-publish'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
|
||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
|
|
||||||
allprojects { subproject ->
|
allprojects { subproject ->
|
||||||
group = 'net.woggioni'
|
group = 'net.woggioni'
|
||||||
@@ -17,7 +15,7 @@ allprojects { subproject ->
|
|||||||
version = project.currentTag.map { it[0] }.get()
|
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('rbcs.version')}.${gitRevision[0..10]}"
|
||||||
}.get()
|
}.get()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,6 +46,12 @@ allprojects { subproject ->
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
testImplementation catalog.junit.jupiter.api
|
||||||
|
testImplementation catalog.junit.jupiter.params
|
||||||
|
testRuntimeOnly catalog.junit.jupiter.engine
|
||||||
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
@@ -68,6 +72,15 @@ allprojects { subproject ->
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pluginManager.withPlugin('jacoco') {
|
||||||
|
test {
|
||||||
|
finalizedBy jacocoTestReport
|
||||||
|
}
|
||||||
|
jacocoTestReport {
|
||||||
|
dependsOn test
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pluginManager.withPlugin(catalog.plugins.kotlin.jvm.get().pluginId) {
|
pluginManager.withPlugin(catalog.plugins.kotlin.jvm.get().pluginId) {
|
||||||
tasks.withType(KotlinCompile.class) {
|
tasks.withType(KotlinCompile.class) {
|
||||||
compilerOptions.jvmTarget = JvmTarget.JVM_21
|
compilerOptions.jvmTarget = JvmTarget.JVM_21
|
||||||
@@ -102,34 +115,6 @@ allprojects { subproject ->
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation catalog.jwo
|
|
||||||
implementation catalog.slf4j.api
|
|
||||||
implementation catalog.netty.codec.http
|
|
||||||
|
|
||||||
api project('gbcs-base')
|
|
||||||
api project('gbcs-api')
|
|
||||||
|
|
||||||
// runtimeOnly catalog.slf4j.jdk14
|
|
||||||
testRuntimeOnly catalog.logback.classic
|
|
||||||
|
|
||||||
testImplementation catalog.bcprov.jdk18on
|
|
||||||
testImplementation catalog.bcpkix.jdk18on
|
|
||||||
testImplementation catalog.junit.jupiter.api
|
|
||||||
testImplementation catalog.junit.jupiter.params
|
|
||||||
testRuntimeOnly catalog.junit.jupiter.engine
|
|
||||||
|
|
||||||
testRuntimeOnly project("gbcs-memcached")
|
|
||||||
}
|
|
||||||
|
|
||||||
publishing {
|
|
||||||
publications {
|
|
||||||
maven(MavenPublication) {
|
|
||||||
from(components["java"])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register('version') {
|
tasks.register('version') {
|
||||||
doLast {
|
doLast {
|
||||||
println("VERSION=$version")
|
println("VERSION=$version")
|
||||||
|
@@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
|
||||||
<gbcs:server useVirtualThreads="true" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xmlns:gbcs="urn:net.woggioni.gbcs"
|
|
||||||
xmlns:gbcs-memcached="urn:net.woggioni.gbcs-memcached"
|
|
||||||
xs:schemaLocation="urn:net.woggioni.gbcs-memcached jpms://net.woggioni.gbcs.memcached/net/woggioni/gbcs/memcached/schema/gbcs-memcached.xsd urn:net.woggioni.gbcs jpms://net.woggioni.gbcs/net/woggioni/gbcs/schema/gbcs.xsd">
|
|
||||||
<bind host="0.0.0.0" port="13080" />
|
|
||||||
<cache xs:type="gbcs-memcached:memcachedCacheType" max-age="P7D" max-size="16777216" compression-mode="zip">
|
|
||||||
<server host="memcached" port="11211"/>
|
|
||||||
</cache>
|
|
||||||
<authentication>
|
|
||||||
<none/>
|
|
||||||
</authentication>
|
|
||||||
</gbcs:server>
|
|
@@ -1,36 +0,0 @@
|
|||||||
networks:
|
|
||||||
default:
|
|
||||||
external: false
|
|
||||||
ipam:
|
|
||||||
driver: default
|
|
||||||
config:
|
|
||||||
- subnet: 172.118.0.0/16
|
|
||||||
ip_range: 172.118.0.0/16
|
|
||||||
gateway: 172.118.0.254
|
|
||||||
services:
|
|
||||||
gbcs:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
container_name: gbcs
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "127.0.0.1:8080:13080"
|
|
||||||
- "[::1]:8080:13080"
|
|
||||||
depends_on:
|
|
||||||
memcached:
|
|
||||||
condition: service_started
|
|
||||||
deploy:
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
cpus: "2.00"
|
|
||||||
memory: 256M
|
|
||||||
memcached:
|
|
||||||
image: memcached
|
|
||||||
container_name: memcached
|
|
||||||
restart: unless-stopped
|
|
||||||
command: -I 64m -m 900m
|
|
||||||
deploy:
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
cpus: "1.00"
|
|
||||||
memory: 1G
|
|
@@ -1,21 +1,16 @@
|
|||||||
FROM alpine:latest AS base-release
|
FROM eclipse-temurin:21-jre-alpine 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
|
RUN adduser -D luser
|
||||||
USER luser
|
USER luser
|
||||||
WORKDIR /home/luser
|
WORKDIR /home/luser
|
||||||
|
|
||||||
FROM base-release AS release
|
FROM base-release AS release
|
||||||
ADD gbcs-cli-envelope-*.jar gbcs.jar
|
ADD rbcs-cli-envelope-*.jar rbcs.jar
|
||||||
ENTRYPOINT ["java", "-jar", "/home/luser/gbcs.jar"]
|
ENTRYPOINT ["java", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/rbcs.jar", "server"]
|
||||||
|
|
||||||
FROM base-release AS release-memcached
|
FROM base-release AS release-memcache
|
||||||
ADD --chown=luser:luser gbcs-cli-envelope-*.jar gbcs.jar
|
ADD --chown=luser:luser rbcs-cli-envelope-*.jar rbcs.jar
|
||||||
RUN mkdir plugins
|
RUN mkdir plugins
|
||||||
WORKDIR /home/luser/plugins
|
WORKDIR /home/luser/plugins
|
||||||
RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/gbcs-memcached*.tar
|
RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-memcache*.tar
|
||||||
WORKDIR /home/luser
|
WORKDIR /home/luser
|
||||||
ENTRYPOINT ["java", "-jar", "/home/luser/gbcs.jar"]
|
ENTRYPOINT ["java", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/rbcs.jar", "server"]
|
||||||
|
|
||||||
FROM release-memcached as compose
|
|
||||||
COPY --chown=luser:luser conf/gbcs-memcached.xml /home/luser/.config/gbcs/gbcs.xml
|
|
||||||
|
@@ -18,8 +18,8 @@ configurations {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
docker project(path: ':gbcs-cli', configuration: 'release')
|
docker project(path: ':rbcs-cli', configuration: 'release')
|
||||||
docker project(path: ':gbcs-memcached', configuration: 'release')
|
docker project(path: ':rbcs-server-memcache', configuration: 'release')
|
||||||
}
|
}
|
||||||
|
|
||||||
Provider<Task> cleanTaskProvider = tasks.named(BasePlugin.CLEAN_TASK_NAME) {}
|
Provider<Task> cleanTaskProvider = tasks.named(BasePlugin.CLEAN_TASK_NAME) {}
|
||||||
@@ -35,33 +35,33 @@ Provider<Copy> prepareDockerBuild = tasks.register('prepareDockerBuild', Copy) {
|
|||||||
Provider<DockerBuildImage> dockerBuild = tasks.register('dockerBuildImage', DockerBuildImage) {
|
Provider<DockerBuildImage> dockerBuild = tasks.register('dockerBuildImage', DockerBuildImage) {
|
||||||
group = 'docker'
|
group = 'docker'
|
||||||
dependsOn prepareDockerBuild
|
dependsOn prepareDockerBuild
|
||||||
images.add('gitea.woggioni.net/woggioni/gbcs:latest')
|
images.add('gitea.woggioni.net/woggioni/rbcs:latest')
|
||||||
images.add("gitea.woggioni.net/woggioni/gbcs:${version}")
|
images.add("gitea.woggioni.net/woggioni/rbcs:${version}")
|
||||||
}
|
}
|
||||||
|
|
||||||
Provider<DockerTagImage> dockerTag = tasks.register('dockerTagImage', DockerTagImage) {
|
Provider<DockerTagImage> dockerTag = tasks.register('dockerTagImage', DockerTagImage) {
|
||||||
group = 'docker'
|
group = 'docker'
|
||||||
repository = 'gitea.woggioni.net/woggioni/gbcs'
|
repository = 'gitea.woggioni.net/woggioni/rbcs'
|
||||||
imageId = 'gitea.woggioni.net/woggioni/gbcs:latest'
|
imageId = 'gitea.woggioni.net/woggioni/rbcs:latest'
|
||||||
tag = version
|
tag = version
|
||||||
}
|
}
|
||||||
|
|
||||||
Provider<DockerTagImage> dockerTagMemcached = tasks.register('dockerTagMemcachedImage', DockerTagImage) {
|
Provider<DockerTagImage> dockerTagMemcache = tasks.register('dockerTagMemcacheImage', DockerTagImage) {
|
||||||
group = 'docker'
|
group = 'docker'
|
||||||
repository = 'gitea.woggioni.net/woggioni/gbcs'
|
repository = 'gitea.woggioni.net/woggioni/rbcs'
|
||||||
imageId = 'gitea.woggioni.net/woggioni/gbcs:memcached'
|
imageId = 'gitea.woggioni.net/woggioni/rbcs:memcache'
|
||||||
tag = "${version}-memcached"
|
tag = "${version}-memcache"
|
||||||
}
|
}
|
||||||
|
|
||||||
Provider<DockerPushImage> dockerPush = tasks.register('dockerPushImage', DockerPushImage) {
|
Provider<DockerPushImage> dockerPush = tasks.register('dockerPushImage', DockerPushImage) {
|
||||||
group = 'docker'
|
group = 'docker'
|
||||||
dependsOn dockerTag, dockerTagMemcached
|
dependsOn dockerTag, dockerTagMemcache
|
||||||
registryCredentials {
|
registryCredentials {
|
||||||
url = getProperty('docker.registry.url')
|
url = getProperty('docker.registry.url')
|
||||||
username = 'woggioni'
|
username = 'woggioni'
|
||||||
password = System.getenv().get("PUBLISHER_TOKEN")
|
password = System.getenv().get("PUBLISHER_TOKEN")
|
||||||
}
|
}
|
||||||
images = [dockerTag.flatMap{ it.tag }, dockerTagMemcached.flatMap{ it.tag }]
|
images = [dockerTag.flatMap{ it.tag }, dockerTagMemcache.flatMap{ it.tag }]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -1,6 +0,0 @@
|
|||||||
module net.woggioni.gbcs.api {
|
|
||||||
requires static lombok;
|
|
||||||
requires java.xml;
|
|
||||||
exports net.woggioni.gbcs.api;
|
|
||||||
exports net.woggioni.gbcs.api.exception;
|
|
||||||
}
|
|
@@ -1,11 +0,0 @@
|
|||||||
package net.woggioni.gbcs.api;
|
|
||||||
|
|
||||||
import net.woggioni.gbcs.api.exception.ContentTooLargeException;
|
|
||||||
|
|
||||||
import java.nio.channels.ReadableByteChannel;
|
|
||||||
|
|
||||||
public interface Cache extends AutoCloseable {
|
|
||||||
ReadableByteChannel get(String key);
|
|
||||||
|
|
||||||
void put(String key, byte[] content) throws ContentTooLargeException;
|
|
||||||
}
|
|
@@ -1,7 +0,0 @@
|
|||||||
package net.woggioni.gbcs.api.exception;
|
|
||||||
|
|
||||||
public class GbcsException extends RuntimeException {
|
|
||||||
public GbcsException(String message, Throwable cause) {
|
|
||||||
super(message, cause);
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,8 +0,0 @@
|
|||||||
module net.woggioni.gbcs.base {
|
|
||||||
requires java.xml;
|
|
||||||
requires java.logging;
|
|
||||||
requires org.slf4j;
|
|
||||||
requires kotlin.stdlib;
|
|
||||||
|
|
||||||
exports net.woggioni.gbcs.base;
|
|
||||||
}
|
|
@@ -1,12 +0,0 @@
|
|||||||
package net.woggioni.gbcs.base
|
|
||||||
|
|
||||||
import java.net.URI
|
|
||||||
import java.net.URL
|
|
||||||
|
|
||||||
object GBCS {
|
|
||||||
fun String.toUrl() : URL = URL.of(URI(this), null)
|
|
||||||
|
|
||||||
const val GBCS_NAMESPACE_URI: String = "urn:net.woggioni.gbcs"
|
|
||||||
const val GBCS_PREFIX: String = "gbcs"
|
|
||||||
const val XML_SCHEMA_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
}
|
|
@@ -1,15 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
@@ -1,99 +0,0 @@
|
|||||||
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 {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,11 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
@@ -1,14 +0,0 @@
|
|||||||
import net.woggioni.gbcs.api.CacheProvider;
|
|
||||||
|
|
||||||
module net.woggioni.gbcs.memcached {
|
|
||||||
requires net.woggioni.gbcs.base;
|
|
||||||
requires net.woggioni.gbcs.api;
|
|
||||||
requires com.googlecode.xmemcached;
|
|
||||||
requires net.woggioni.jwo;
|
|
||||||
requires java.xml;
|
|
||||||
requires kotlin.stdlib;
|
|
||||||
|
|
||||||
provides CacheProvider with net.woggioni.gbcs.memcached.MemcachedCacheProvider;
|
|
||||||
|
|
||||||
opens net.woggioni.gbcs.memcached.schema;
|
|
||||||
}
|
|
@@ -1,60 +0,0 @@
|
|||||||
package net.woggioni.gbcs.memcached
|
|
||||||
|
|
||||||
import net.rubyeye.xmemcached.MemcachedClient
|
|
||||||
import net.rubyeye.xmemcached.XMemcachedClientBuilder
|
|
||||||
import net.rubyeye.xmemcached.command.BinaryCommandFactory
|
|
||||||
import net.rubyeye.xmemcached.transcoders.CompressionMode
|
|
||||||
import net.rubyeye.xmemcached.transcoders.SerializingTranscoder
|
|
||||||
import net.woggioni.gbcs.api.Cache
|
|
||||||
import net.woggioni.gbcs.api.exception.ContentTooLargeException
|
|
||||||
import net.woggioni.gbcs.base.HostAndPort
|
|
||||||
import net.woggioni.jwo.JWO
|
|
||||||
import java.io.ByteArrayInputStream
|
|
||||||
import java.net.InetSocketAddress
|
|
||||||
import java.nio.channels.Channels
|
|
||||||
import java.nio.channels.ReadableByteChannel
|
|
||||||
import java.nio.charset.StandardCharsets
|
|
||||||
import java.security.MessageDigest
|
|
||||||
import java.time.Duration
|
|
||||||
|
|
||||||
class MemcachedCache(
|
|
||||||
servers: List<HostAndPort>,
|
|
||||||
private val maxAge: Duration,
|
|
||||||
maxSize : Int,
|
|
||||||
digestAlgorithm: String?,
|
|
||||||
compressionMode: CompressionMode,
|
|
||||||
) : Cache {
|
|
||||||
private val memcachedClient = XMemcachedClientBuilder(
|
|
||||||
servers.stream().map { addr: HostAndPort -> InetSocketAddress(addr.host, addr.port) }.toList()
|
|
||||||
).apply {
|
|
||||||
commandFactory = BinaryCommandFactory()
|
|
||||||
digestAlgorithm?.let { dAlg ->
|
|
||||||
setKeyProvider { key ->
|
|
||||||
val md = MessageDigest.getInstance(dAlg)
|
|
||||||
md.update(key.toByteArray(StandardCharsets.UTF_8))
|
|
||||||
JWO.bytesToHex(md.digest())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
transcoder = SerializingTranscoder(maxSize).apply {
|
|
||||||
setCompressionMode(compressionMode)
|
|
||||||
}
|
|
||||||
}.build()
|
|
||||||
|
|
||||||
override fun get(key: String): ReadableByteChannel? {
|
|
||||||
return memcachedClient.get<ByteArray>(key)
|
|
||||||
?.let(::ByteArrayInputStream)
|
|
||||||
?.let(Channels::newChannel)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun put(key: String, content: ByteArray) {
|
|
||||||
try {
|
|
||||||
memcachedClient[key, maxAge.toSeconds().toInt()] = content
|
|
||||||
} catch (e: IllegalArgumentException) {
|
|
||||||
throw ContentTooLargeException(e.message, e)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun close() {
|
|
||||||
memcachedClient.shutdown()
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,26 +0,0 @@
|
|||||||
package net.woggioni.gbcs.memcached
|
|
||||||
|
|
||||||
import net.rubyeye.xmemcached.transcoders.CompressionMode
|
|
||||||
import net.woggioni.gbcs.api.Configuration
|
|
||||||
import net.woggioni.gbcs.base.HostAndPort
|
|
||||||
import java.time.Duration
|
|
||||||
|
|
||||||
data class MemcachedCacheConfiguration(
|
|
||||||
var servers: List<HostAndPort>,
|
|
||||||
var maxAge: Duration = Duration.ofDays(1),
|
|
||||||
var maxSize: Int = 0x100000,
|
|
||||||
var digestAlgorithm: String? = null,
|
|
||||||
var compressionMode: CompressionMode = CompressionMode.ZIP,
|
|
||||||
) : Configuration.Cache {
|
|
||||||
override fun materialize() = MemcachedCache(
|
|
||||||
servers,
|
|
||||||
maxAge,
|
|
||||||
maxSize,
|
|
||||||
digestAlgorithm,
|
|
||||||
compressionMode
|
|
||||||
)
|
|
||||||
|
|
||||||
override fun getNamespaceURI() = "urn:net.woggioni.gbcs-memcached"
|
|
||||||
|
|
||||||
override fun getTypeName() = "memcachedCacheType"
|
|
||||||
}
|
|
@@ -1,85 +0,0 @@
|
|||||||
package net.woggioni.gbcs.memcached
|
|
||||||
|
|
||||||
import net.rubyeye.xmemcached.transcoders.CompressionMode
|
|
||||||
import net.woggioni.gbcs.api.CacheProvider
|
|
||||||
import net.woggioni.gbcs.base.GBCS
|
|
||||||
import net.woggioni.gbcs.base.HostAndPort
|
|
||||||
import net.woggioni.gbcs.base.Xml
|
|
||||||
import net.woggioni.gbcs.base.Xml.Companion.asIterable
|
|
||||||
import org.w3c.dom.Document
|
|
||||||
import org.w3c.dom.Element
|
|
||||||
import java.time.Duration
|
|
||||||
import java.util.zip.Deflater
|
|
||||||
|
|
||||||
class MemcachedCacheProvider : CacheProvider<MemcachedCacheConfiguration> {
|
|
||||||
override fun getXmlSchemaLocation() = "classpath:net/woggioni/gbcs/memcached/schema/gbcs-memcached.xsd"
|
|
||||||
|
|
||||||
override fun getXmlType() = "memcachedCacheType"
|
|
||||||
|
|
||||||
override fun getXmlNamespace()= "urn:net.woggioni.gbcs-memcached"
|
|
||||||
|
|
||||||
override fun deserialize(el: Element): MemcachedCacheConfiguration {
|
|
||||||
val servers = mutableListOf<HostAndPort>()
|
|
||||||
val maxAge = el.getAttribute("max-age")
|
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
?.let(Duration::parse)
|
|
||||||
?: Duration.ofDays(1)
|
|
||||||
val maxSize = el.getAttribute("max-size")
|
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
?.let(String::toInt)
|
|
||||||
?: 0x100000
|
|
||||||
val enableCompression = el.getAttribute("enable-compression")
|
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
?.let(String::toBoolean)
|
|
||||||
?: false
|
|
||||||
val compressionMode = el.getAttribute("compression-mode")
|
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
?.let {
|
|
||||||
when(it) {
|
|
||||||
"gzip" -> CompressionMode.GZIP
|
|
||||||
"zip" -> CompressionMode.ZIP
|
|
||||||
else -> CompressionMode.ZIP
|
|
||||||
}
|
|
||||||
}
|
|
||||||
?: CompressionMode.ZIP
|
|
||||||
val digestAlgorithm = el.getAttribute("digest").takeIf(String::isNotEmpty)
|
|
||||||
for (child in el.asIterable()) {
|
|
||||||
when (child.nodeName) {
|
|
||||||
"server" -> {
|
|
||||||
servers.add(HostAndPort(child.getAttribute("host"), child.getAttribute("port").toInt()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return MemcachedCacheConfiguration(
|
|
||||||
servers,
|
|
||||||
maxAge,
|
|
||||||
maxSize,
|
|
||||||
digestAlgorithm,
|
|
||||||
compressionMode,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun serialize(doc: Document, cache : MemcachedCacheConfiguration) = cache.run {
|
|
||||||
val result = doc.createElementNS(xmlNamespace,"cache")
|
|
||||||
Xml.of(doc, result) {
|
|
||||||
attr("xs:type", xmlType, GBCS.XML_SCHEMA_NAMESPACE_URI)
|
|
||||||
for (server in servers) {
|
|
||||||
node("server", xmlNamespace) {
|
|
||||||
attr("host", server.host)
|
|
||||||
attr("port", server.port.toString())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
attr("max-age", maxAge.toString())
|
|
||||||
attr("max-size", maxSize.toString())
|
|
||||||
digestAlgorithm?.let { digestAlgorithm ->
|
|
||||||
attr("digest", digestAlgorithm)
|
|
||||||
}
|
|
||||||
attr("compression-mode", when(compressionMode) {
|
|
||||||
CompressionMode.GZIP -> "gzip"
|
|
||||||
CompressionMode.ZIP -> "zip"
|
|
||||||
})
|
|
||||||
}
|
|
||||||
result
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1 +0,0 @@
|
|||||||
net.woggioni.gbcs.memcached.MemcachedCacheProvider
|
|
@@ -1,35 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
|
||||||
<xs:schema targetNamespace="urn:net.woggioni.gbcs-memcached"
|
|
||||||
xmlns:gbcs-memcached="urn:net.woggioni.gbcs-memcached"
|
|
||||||
xmlns:gbcs="urn:net.woggioni.gbcs"
|
|
||||||
xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
|
||||||
|
|
||||||
<xs:import schemaLocation="classpath:net/woggioni/gbcs/schema/gbcs.xsd" namespace="urn:net.woggioni.gbcs"/>
|
|
||||||
|
|
||||||
<xs:complexType name="memcachedServerType">
|
|
||||||
<xs:attribute name="host" type="xs:string" use="required"/>
|
|
||||||
<xs:attribute name="port" type="xs:positiveInteger" use="required"/>
|
|
||||||
</xs:complexType>
|
|
||||||
|
|
||||||
<xs:complexType name="memcachedCacheType">
|
|
||||||
<xs:complexContent>
|
|
||||||
<xs:extension base="gbcs:cacheType">
|
|
||||||
<xs:sequence maxOccurs="unbounded">
|
|
||||||
<xs:element name="server" type="gbcs-memcached:memcachedServerType"/>
|
|
||||||
</xs:sequence>
|
|
||||||
<xs:attribute name="max-age" type="xs:duration" default="P1D"/>
|
|
||||||
<xs:attribute name="max-size" type="xs:unsignedInt" default="1048576"/>
|
|
||||||
<xs:attribute name="digest" type="xs:token" />
|
|
||||||
<xs:attribute name="compression-type" type="gbcs-memcached:compressionType" default="deflate"/>
|
|
||||||
</xs:extension>
|
|
||||||
</xs:complexContent>
|
|
||||||
</xs:complexType>
|
|
||||||
|
|
||||||
<xs:simpleType name="compressionType">
|
|
||||||
<xs:restriction base="xs:token">
|
|
||||||
<xs:enumeration value="deflate"/>
|
|
||||||
<xs:enumeration value="gzip"/>
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
|
|
||||||
</xs:schema>
|
|
@@ -2,9 +2,10 @@ org.gradle.configuration-cache=false
|
|||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
org.gradle.caching=true
|
org.gradle.caching=true
|
||||||
|
|
||||||
gbcs.version = 0.0.1
|
rbcs.version = 0.1.6
|
||||||
|
|
||||||
lys.version = 2025.01.10
|
lys.version = 2025.02.08
|
||||||
|
|
||||||
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
|
docker.registry.url=gitea.woggioni.net
|
||||||
|
|
||||||
|
@@ -5,6 +5,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
api catalog.netty.buffer
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
7
rbcs-api/src/main/java/module-info.java
Normal file
7
rbcs-api/src/main/java/module-info.java
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
module net.woggioni.rbcs.api {
|
||||||
|
requires static lombok;
|
||||||
|
requires java.xml;
|
||||||
|
requires io.netty.buffer;
|
||||||
|
exports net.woggioni.rbcs.api;
|
||||||
|
exports net.woggioni.rbcs.api.exception;
|
||||||
|
}
|
14
rbcs-api/src/main/java/net/woggioni/rbcs/api/Cache.java
Normal file
14
rbcs-api/src/main/java/net/woggioni/rbcs/api/Cache.java
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
package net.woggioni.rbcs.api;
|
||||||
|
|
||||||
|
import io.netty.buffer.ByteBuf;
|
||||||
|
import net.woggioni.rbcs.api.exception.ContentTooLargeException;
|
||||||
|
|
||||||
|
import java.nio.channels.ReadableByteChannel;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
|
||||||
|
public interface Cache extends AutoCloseable {
|
||||||
|
CompletableFuture<ReadableByteChannel> get(String key);
|
||||||
|
|
||||||
|
CompletableFuture<Void> put(String key, ByteBuf content) throws ContentTooLargeException;
|
||||||
|
}
|
@@ -1,4 +1,4 @@
|
|||||||
package net.woggioni.gbcs.api;
|
package net.woggioni.rbcs.api;
|
||||||
|
|
||||||
import org.w3c.dom.Document;
|
import org.w3c.dom.Document;
|
||||||
import org.w3c.dom.Element;
|
import org.w3c.dom.Element;
|
@@ -1,11 +1,13 @@
|
|||||||
package net.woggioni.gbcs.api;
|
package net.woggioni.rbcs.api;
|
||||||
|
|
||||||
|
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.NonNull;
|
||||||
import lombok.Value;
|
import lombok.Value;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.security.cert.X509Certificate;
|
import java.security.cert.X509Certificate;
|
||||||
|
import java.time.Duration;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -14,19 +16,48 @@ import java.util.stream.Collectors;
|
|||||||
public class Configuration {
|
public class Configuration {
|
||||||
String host;
|
String host;
|
||||||
int port;
|
int port;
|
||||||
|
int incomingConnectionsBacklogSize;
|
||||||
String serverPath;
|
String serverPath;
|
||||||
|
@NonNull
|
||||||
|
EventExecutor eventExecutor;
|
||||||
|
@NonNull
|
||||||
|
Connection connection;
|
||||||
Map<String, User> users;
|
Map<String, User> users;
|
||||||
Map<String, Group> groups;
|
Map<String, Group> groups;
|
||||||
Cache cache;
|
Cache cache;
|
||||||
Authentication authentication;
|
Authentication authentication;
|
||||||
Tls tls;
|
Tls tls;
|
||||||
boolean useVirtualThread;
|
|
||||||
|
@Value
|
||||||
|
public static class EventExecutor {
|
||||||
|
boolean useVirtualThreads;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Value
|
||||||
|
public static class Connection {
|
||||||
|
Duration readTimeout;
|
||||||
|
Duration writeTimeout;
|
||||||
|
Duration idleTimeout;
|
||||||
|
Duration readIdleTimeout;
|
||||||
|
Duration writeIdleTimeout;
|
||||||
|
int maxRequestSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Value
|
||||||
|
public static class Quota {
|
||||||
|
long calls;
|
||||||
|
Duration period;
|
||||||
|
long initialAvailableCalls;
|
||||||
|
long maxAvailableCalls;
|
||||||
|
}
|
||||||
|
|
||||||
@Value
|
@Value
|
||||||
public static class Group {
|
public static class Group {
|
||||||
@EqualsAndHashCode.Include
|
@EqualsAndHashCode.Include
|
||||||
String name;
|
String name;
|
||||||
Set<Role> roles;
|
Set<Role> roles;
|
||||||
|
Quota groupQuota;
|
||||||
|
Quota userQuota;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Value
|
@Value
|
||||||
@@ -35,7 +66,7 @@ public class Configuration {
|
|||||||
String name;
|
String name;
|
||||||
String password;
|
String password;
|
||||||
Set<Group> groups;
|
Set<Group> groups;
|
||||||
|
Quota quota;
|
||||||
|
|
||||||
public Set<Role> getRoles() {
|
public Set<Role> getRoles() {
|
||||||
return groups.stream()
|
return groups.stream()
|
||||||
@@ -55,12 +86,22 @@ public class Configuration {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Value
|
@Value
|
||||||
public static class Tls {
|
public static class Throttling {
|
||||||
KeyStore keyStore;
|
KeyStore keyStore;
|
||||||
TrustStore trustStore;
|
TrustStore trustStore;
|
||||||
boolean verifyClients;
|
boolean verifyClients;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum ClientCertificate {
|
||||||
|
REQUIRED, OPTIONAL
|
||||||
|
}
|
||||||
|
|
||||||
|
@Value
|
||||||
|
public static class Tls {
|
||||||
|
KeyStore keyStore;
|
||||||
|
TrustStore trustStore;
|
||||||
|
}
|
||||||
|
|
||||||
@Value
|
@Value
|
||||||
public static class KeyStore {
|
public static class KeyStore {
|
||||||
Path file;
|
Path file;
|
||||||
@@ -74,6 +115,7 @@ public class Configuration {
|
|||||||
Path file;
|
Path file;
|
||||||
String password;
|
String password;
|
||||||
boolean checkCertificateStatus;
|
boolean checkCertificateStatus;
|
||||||
|
boolean requireClientCertificate;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Value
|
@Value
|
||||||
@@ -93,7 +135,7 @@ public class Configuration {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public interface Cache {
|
public interface Cache {
|
||||||
net.woggioni.gbcs.api.Cache materialize();
|
net.woggioni.rbcs.api.Cache materialize();
|
||||||
String getNamespaceURI();
|
String getNamespaceURI();
|
||||||
String getTypeName();
|
String getTypeName();
|
||||||
}
|
}
|
||||||
@@ -101,24 +143,28 @@ public class Configuration {
|
|||||||
public static Configuration of(
|
public static Configuration of(
|
||||||
String host,
|
String host,
|
||||||
int port,
|
int port,
|
||||||
|
int incomingConnectionsBacklogSize,
|
||||||
String serverPath,
|
String serverPath,
|
||||||
|
EventExecutor eventExecutor,
|
||||||
|
Connection connection,
|
||||||
Map<String, User> users,
|
Map<String, User> users,
|
||||||
Map<String, Group> groups,
|
Map<String, Group> groups,
|
||||||
Cache cache,
|
Cache cache,
|
||||||
Authentication authentication,
|
Authentication authentication,
|
||||||
Tls tls,
|
Tls tls
|
||||||
boolean useVirtualThread
|
|
||||||
) {
|
) {
|
||||||
return new Configuration(
|
return new Configuration(
|
||||||
host,
|
host,
|
||||||
port,
|
port,
|
||||||
|
incomingConnectionsBacklogSize,
|
||||||
serverPath != null && !serverPath.isEmpty() && !serverPath.equals("/") ? serverPath : null,
|
serverPath != null && !serverPath.isEmpty() && !serverPath.equals("/") ? serverPath : null,
|
||||||
|
eventExecutor,
|
||||||
|
connection,
|
||||||
users,
|
users,
|
||||||
groups,
|
groups,
|
||||||
cache,
|
cache,
|
||||||
authentication,
|
authentication,
|
||||||
tls,
|
tls
|
||||||
useVirtualThread
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -1,4 +1,4 @@
|
|||||||
package net.woggioni.gbcs.api;
|
package net.woggioni.rbcs.api;
|
||||||
|
|
||||||
public enum Role {
|
public enum Role {
|
||||||
Reader, Writer
|
Reader, Writer
|
@@ -0,0 +1,11 @@
|
|||||||
|
package net.woggioni.rbcs.api.exception;
|
||||||
|
|
||||||
|
public class CacheException extends RbcsException {
|
||||||
|
public CacheException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
public CacheException(String message) {
|
||||||
|
this(message, null);
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,11 @@
|
|||||||
|
package net.woggioni.rbcs.api.exception;
|
||||||
|
|
||||||
|
public class ConfigurationException extends RbcsException {
|
||||||
|
public ConfigurationException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ConfigurationException(String message) {
|
||||||
|
this(message, null);
|
||||||
|
}
|
||||||
|
}
|
@@ -1,6 +1,6 @@
|
|||||||
package net.woggioni.gbcs.api.exception;
|
package net.woggioni.rbcs.api.exception;
|
||||||
|
|
||||||
public class ContentTooLargeException extends GbcsException {
|
public class ContentTooLargeException extends RbcsException {
|
||||||
public ContentTooLargeException(String message, Throwable cause) {
|
public ContentTooLargeException(String message, Throwable cause) {
|
||||||
super(message, cause);
|
super(message, cause);
|
||||||
}
|
}
|
@@ -0,0 +1,7 @@
|
|||||||
|
package net.woggioni.rbcs.api.exception;
|
||||||
|
|
||||||
|
public class RbcsException extends RuntimeException {
|
||||||
|
public RbcsException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
}
|
@@ -4,18 +4,22 @@ plugins {
|
|||||||
alias catalog.plugins.envelope
|
alias catalog.plugins.envelope
|
||||||
alias catalog.plugins.sambal
|
alias catalog.plugins.sambal
|
||||||
alias catalog.plugins.graalvm.native.image
|
alias catalog.plugins.graalvm.native.image
|
||||||
|
alias catalog.plugins.graalvm.jlink
|
||||||
|
alias catalog.plugins.jpms.check
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
}
|
}
|
||||||
|
|
||||||
import net.woggioni.gradle.envelope.EnvelopeJarTask
|
import net.woggioni.gradle.envelope.EnvelopeJarTask
|
||||||
|
import net.woggioni.gradle.graalvm.NativeImageConfigurationTask
|
||||||
import net.woggioni.gradle.graalvm.NativeImagePlugin
|
import net.woggioni.gradle.graalvm.NativeImagePlugin
|
||||||
import net.woggioni.gradle.graalvm.NativeImageTask
|
import net.woggioni.gradle.graalvm.NativeImageTask
|
||||||
import net.woggioni.gradle.graalvm.NativeImageConfigurationTask
|
import net.woggioni.gradle.graalvm.JlinkPlugin
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import net.woggioni.gradle.graalvm.JlinkTask
|
||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
|
||||||
|
|
||||||
|
Property<String> mainModuleName = objects.property(String.class)
|
||||||
|
mainModuleName.set('net.woggioni.rbcs.cli')
|
||||||
Property<String> mainClassName = objects.property(String.class)
|
Property<String> mainClassName = objects.property(String.class)
|
||||||
mainClassName.set('net.woggioni.gbcs.cli.GradleBuildCacheServerCli')
|
mainClassName.set('net.woggioni.rbcs.cli.RemoteBuildCacheServerCli')
|
||||||
|
|
||||||
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
|
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
|
||||||
options.javaModuleMainClass = mainClassName
|
options.javaModuleMainClass = mainClassName
|
||||||
@@ -31,7 +35,7 @@ configurations {
|
|||||||
}
|
}
|
||||||
|
|
||||||
envelopeJar {
|
envelopeJar {
|
||||||
mainModule = 'net.woggioni.gbcs.cli'
|
mainModule = mainModuleName
|
||||||
mainClass = mainClassName
|
mainClass = mainClassName
|
||||||
|
|
||||||
extraClasspath = ["plugins"]
|
extraClasspath = ["plugins"]
|
||||||
@@ -40,31 +44,47 @@ envelopeJar {
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation catalog.jwo
|
implementation catalog.jwo
|
||||||
implementation catalog.slf4j.api
|
implementation catalog.slf4j.api
|
||||||
implementation catalog.netty.codec.http
|
|
||||||
implementation catalog.picocli
|
implementation catalog.picocli
|
||||||
|
|
||||||
implementation rootProject
|
implementation project(':rbcs-client')
|
||||||
|
implementation project(':rbcs-server')
|
||||||
|
|
||||||
// runtimeOnly catalog.slf4j.jdk14
|
// runtimeOnly catalog.slf4j.jdk14
|
||||||
runtimeOnly catalog.logback.classic
|
runtimeOnly catalog.logback.classic
|
||||||
|
// runtimeOnly catalog.slf4j.simple
|
||||||
}
|
}
|
||||||
|
|
||||||
Provider<EnvelopeJarTask> envelopeJarTaskProvider = tasks.named('envelopeJar', EnvelopeJarTask.class) {
|
Provider<EnvelopeJarTask> envelopeJarTaskProvider = tasks.named('envelopeJar', EnvelopeJarTask.class) {
|
||||||
// systemProperties['java.util.logging.config.class'] = 'net.woggioni.gbcs.LoggingConfig'
|
// systemProperties['java.util.logging.config.class'] = 'net.woggioni.rbcs.LoggingConfig'
|
||||||
// systemProperties['log.config.source'] = 'logging.properties'
|
// systemProperties['log.config.source'] = 'net/woggioni/rbcs/cli/logging.properties'
|
||||||
systemProperties['logback.configurationFile'] = 'classpath:net/woggioni/gbcs/cli/logback.xml'
|
// systemProperties['java.util.logging.config.file'] = 'classpath:net/woggioni/rbcs/cli/logging.properties'
|
||||||
|
systemProperties['logback.configurationFile'] = 'classpath:net/woggioni/rbcs/cli/logback.xml'
|
||||||
|
systemProperties['io.netty.leakDetectionLevel'] = 'DISABLED'
|
||||||
|
|
||||||
|
// systemProperties['org.slf4j.simpleLogger.showDateTime'] = 'true'
|
||||||
|
// systemProperties['org.slf4j.simpleLogger.defaultLogLevel'] = 'debug'
|
||||||
|
// systemProperties['org.slf4j.simpleLogger.log.com.google.code.yanf4j'] = 'warn'
|
||||||
|
// systemProperties['org.slf4j.simpleLogger.log.net.rubyeye.xmemcached'] = 'warn'
|
||||||
|
// systemProperties['org.slf4j.simpleLogger.dateTimeFormat'] = 'yyyy-MM-dd\'T\'HH:mm:ss.SSSZ'
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named(NativeImagePlugin.CONFIGURE_NATIVE_IMAGE_TASK_NAME, NativeImageConfigurationTask) {
|
tasks.named(NativeImagePlugin.CONFIGURE_NATIVE_IMAGE_TASK_NAME, NativeImageConfigurationTask) {
|
||||||
mainClass = 'net.woggioni.gbcs.GraalNativeImageConfiguration'
|
mainClass = mainClassName
|
||||||
|
mainModule = mainModuleName
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named(NativeImagePlugin.NATIVE_IMAGE_TASK_NAME, NativeImageTask) {
|
tasks.named(NativeImagePlugin.NATIVE_IMAGE_TASK_NAME, NativeImageTask) {
|
||||||
mainClass = 'net.woggioni.gbcs.GradleBuildCacheServer'
|
mainClass = mainClassName
|
||||||
|
mainModule = mainModuleName
|
||||||
useMusl = true
|
useMusl = true
|
||||||
buildStaticImage = true
|
buildStaticImage = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.named(JlinkPlugin.JLINK_TASK_NAME, JlinkTask) {
|
||||||
|
mainClass = mainClassName
|
||||||
|
mainModule = 'net.woggioni.rbcs.cli'
|
||||||
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
release(envelopeJarTaskProvider)
|
release(envelopeJarTaskProvider)
|
||||||
}
|
}
|
@@ -1,2 +1,2 @@
|
|||||||
Args=-H:Optimize=3 --gc=serial
|
Args=-H:Optimize=3 --gc=serial --initialize-at-run-time=io.netty
|
||||||
#-H:TraceClassInitialization=io.netty.handler.ssl.BouncyCastleAlpnSslUtils
|
#-H:TraceClassInitialization=io.netty.handler.ssl.BouncyCastleAlpnSslUtils
|
17
rbcs-cli/src/main/java/module-info.java
Normal file
17
rbcs-cli/src/main/java/module-info.java
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
module net.woggioni.rbcs.cli {
|
||||||
|
requires org.slf4j;
|
||||||
|
requires net.woggioni.rbcs.server;
|
||||||
|
requires info.picocli;
|
||||||
|
requires net.woggioni.rbcs.common;
|
||||||
|
requires net.woggioni.rbcs.client;
|
||||||
|
requires kotlin.stdlib;
|
||||||
|
requires net.woggioni.jwo;
|
||||||
|
requires net.woggioni.rbcs.api;
|
||||||
|
|
||||||
|
exports net.woggioni.rbcs.cli.impl.converters to info.picocli;
|
||||||
|
opens net.woggioni.rbcs.cli.impl.commands to info.picocli;
|
||||||
|
opens net.woggioni.rbcs.cli.impl to info.picocli;
|
||||||
|
opens net.woggioni.rbcs.cli to info.picocli, net.woggioni.rbcs.common;
|
||||||
|
|
||||||
|
exports net.woggioni.rbcs.cli;
|
||||||
|
}
|
@@ -0,0 +1,69 @@
|
|||||||
|
package net.woggioni.rbcs.cli
|
||||||
|
|
||||||
|
import net.woggioni.rbcs.cli.impl.AbstractVersionProvider
|
||||||
|
import net.woggioni.rbcs.cli.impl.RbcsCommand
|
||||||
|
import net.woggioni.rbcs.cli.impl.commands.BenchmarkCommand
|
||||||
|
import net.woggioni.rbcs.cli.impl.commands.ClientCommand
|
||||||
|
import net.woggioni.rbcs.cli.impl.commands.GetCommand
|
||||||
|
import net.woggioni.rbcs.cli.impl.commands.HealthCheckCommand
|
||||||
|
import net.woggioni.rbcs.cli.impl.commands.PasswordHashCommand
|
||||||
|
import net.woggioni.rbcs.cli.impl.commands.PutCommand
|
||||||
|
import net.woggioni.rbcs.cli.impl.commands.ServerCommand
|
||||||
|
import net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory
|
||||||
|
import net.woggioni.rbcs.common.contextLogger
|
||||||
|
import net.woggioni.jwo.Application
|
||||||
|
import picocli.CommandLine
|
||||||
|
import picocli.CommandLine.Model.CommandSpec
|
||||||
|
|
||||||
|
|
||||||
|
@CommandLine.Command(
|
||||||
|
name = "rbcs", versionProvider = RemoteBuildCacheServerCli.VersionProvider::class
|
||||||
|
)
|
||||||
|
class RemoteBuildCacheServerCli : RbcsCommand() {
|
||||||
|
|
||||||
|
class VersionProvider : AbstractVersionProvider()
|
||||||
|
companion object {
|
||||||
|
@JvmStatic
|
||||||
|
fun main(vararg args: String) {
|
||||||
|
val currentClassLoader = RemoteBuildCacheServerCli::class.java.classLoader
|
||||||
|
Thread.currentThread().contextClassLoader = currentClassLoader
|
||||||
|
if(currentClassLoader.javaClass.name == "net.woggioni.envelope.loader.ModuleClassLoader") {
|
||||||
|
//We're running in an envelope jar and custom URL protocols won't work
|
||||||
|
RbcsUrlStreamHandlerFactory.install()
|
||||||
|
}
|
||||||
|
val log = contextLogger()
|
||||||
|
val app = Application.builder("rbcs")
|
||||||
|
.configurationDirectoryEnvVar("RBCS_CONFIGURATION_DIR")
|
||||||
|
.configurationDirectoryPropertyKey("net.woggioni.rbcs.conf.dir")
|
||||||
|
.build()
|
||||||
|
val rbcsCli = RemoteBuildCacheServerCli()
|
||||||
|
val commandLine = CommandLine(rbcsCli)
|
||||||
|
commandLine.setExecutionExceptionHandler { ex, cl, parseResult ->
|
||||||
|
log.error(ex.message, ex)
|
||||||
|
CommandLine.ExitCode.SOFTWARE
|
||||||
|
}
|
||||||
|
commandLine.addSubcommand(ServerCommand(app))
|
||||||
|
commandLine.addSubcommand(PasswordHashCommand())
|
||||||
|
commandLine.addSubcommand(
|
||||||
|
CommandLine(ClientCommand(app)).apply {
|
||||||
|
addSubcommand(BenchmarkCommand())
|
||||||
|
addSubcommand(PutCommand())
|
||||||
|
addSubcommand(GetCommand())
|
||||||
|
addSubcommand(HealthCheckCommand())
|
||||||
|
})
|
||||||
|
System.exit(commandLine.execute(*args))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@CommandLine.Option(names = ["-V", "--version"], versionHelp = true)
|
||||||
|
var versionHelp = false
|
||||||
|
private set
|
||||||
|
|
||||||
|
@CommandLine.Spec
|
||||||
|
private lateinit var spec: CommandSpec
|
||||||
|
|
||||||
|
|
||||||
|
override fun run() {
|
||||||
|
spec.commandLine().usage(System.out);
|
||||||
|
}
|
||||||
|
}
|
@@ -1,8 +1,6 @@
|
|||||||
package net.woggioni.gbcs.cli.impl
|
package net.woggioni.rbcs.cli.impl
|
||||||
|
|
||||||
import picocli.CommandLine
|
import picocli.CommandLine
|
||||||
import java.net.URL
|
|
||||||
import java.util.Enumeration
|
|
||||||
import java.util.jar.Attributes
|
import java.util.jar.Attributes
|
||||||
import java.util.jar.JarFile
|
import java.util.jar.JarFile
|
||||||
import java.util.jar.Manifest
|
import java.util.jar.Manifest
|
@@ -0,0 +1,19 @@
|
|||||||
|
package net.woggioni.rbcs.cli.impl
|
||||||
|
|
||||||
|
import net.woggioni.jwo.Application
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.nio.file.Path
|
||||||
|
|
||||||
|
|
||||||
|
abstract class RbcsCommand : Runnable {
|
||||||
|
|
||||||
|
@CommandLine.Option(names = ["-h", "--help"], usageHelp = true)
|
||||||
|
var usageHelp = false
|
||||||
|
private set
|
||||||
|
|
||||||
|
protected fun findConfigurationFile(app: Application, fileName : String): Path {
|
||||||
|
val confDir = app.computeConfigurationDirectory()
|
||||||
|
val configurationFile = confDir.resolve(fileName)
|
||||||
|
return configurationFile
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,142 @@
|
|||||||
|
package net.woggioni.rbcs.cli.impl.commands
|
||||||
|
|
||||||
|
import net.woggioni.rbcs.cli.impl.RbcsCommand
|
||||||
|
import net.woggioni.rbcs.client.RemoteBuildCacheClient
|
||||||
|
import net.woggioni.rbcs.common.contextLogger
|
||||||
|
import net.woggioni.rbcs.common.error
|
||||||
|
import net.woggioni.rbcs.common.info
|
||||||
|
import net.woggioni.jwo.JWO
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.security.SecureRandom
|
||||||
|
import java.time.Duration
|
||||||
|
import java.time.Instant
|
||||||
|
import java.util.concurrent.LinkedBlockingQueue
|
||||||
|
import java.util.concurrent.Semaphore
|
||||||
|
import java.util.concurrent.atomic.AtomicLong
|
||||||
|
import kotlin.random.Random
|
||||||
|
|
||||||
|
@CommandLine.Command(
|
||||||
|
name = "benchmark",
|
||||||
|
description = ["Run a load test against the server"],
|
||||||
|
showDefaultValues = true
|
||||||
|
)
|
||||||
|
class BenchmarkCommand : RbcsCommand() {
|
||||||
|
private val log = contextLogger()
|
||||||
|
|
||||||
|
@CommandLine.Spec
|
||||||
|
private lateinit var spec: CommandLine.Model.CommandSpec
|
||||||
|
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ["-e", "--entries"],
|
||||||
|
description = ["Total number of elements to be added to the cache"],
|
||||||
|
paramLabel = "NUMBER_OF_ENTRIES"
|
||||||
|
)
|
||||||
|
private var numberOfEntries = 1000
|
||||||
|
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ["-s", "--size"],
|
||||||
|
description = ["Size of a cache value in bytes"],
|
||||||
|
paramLabel = "SIZE"
|
||||||
|
)
|
||||||
|
private var size = 0x1000
|
||||||
|
|
||||||
|
override fun run() {
|
||||||
|
val clientCommand = spec.parent().userObject() as ClientCommand
|
||||||
|
val profile = clientCommand.profileName.let { profileName ->
|
||||||
|
clientCommand.configuration.profiles[profileName]
|
||||||
|
?: throw IllegalArgumentException("Profile $profileName does not exist in configuration")
|
||||||
|
}
|
||||||
|
RemoteBuildCacheClient(profile).use { client ->
|
||||||
|
|
||||||
|
val entryGenerator = sequence {
|
||||||
|
val random = Random(SecureRandom.getInstance("NativePRNGNonBlocking").nextLong())
|
||||||
|
while (true) {
|
||||||
|
val key = JWO.bytesToHex(random.nextBytes(16))
|
||||||
|
val content = random.nextInt().toByte()
|
||||||
|
val value = ByteArray(size, { _ -> content })
|
||||||
|
yield(key to value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
log.info {
|
||||||
|
"Starting insertion"
|
||||||
|
}
|
||||||
|
val entries = let {
|
||||||
|
val completionCounter = AtomicLong(0)
|
||||||
|
val completionQueue = LinkedBlockingQueue<Pair<String, ByteArray>>(numberOfEntries)
|
||||||
|
val start = Instant.now()
|
||||||
|
val semaphore = Semaphore(profile.maxConnections * 3)
|
||||||
|
val iterator = entryGenerator.take(numberOfEntries).iterator()
|
||||||
|
while (completionCounter.get() < numberOfEntries) {
|
||||||
|
if (iterator.hasNext()) {
|
||||||
|
val entry = iterator.next()
|
||||||
|
semaphore.acquire()
|
||||||
|
val future = client.put(entry.first, entry.second).thenApply { entry }
|
||||||
|
future.whenComplete { result, ex ->
|
||||||
|
if (ex != null) {
|
||||||
|
log.error(ex.message, ex)
|
||||||
|
} else {
|
||||||
|
completionQueue.put(result)
|
||||||
|
}
|
||||||
|
semaphore.release()
|
||||||
|
completionCounter.incrementAndGet()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Thread.sleep(0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val inserted = completionQueue.toList()
|
||||||
|
val end = Instant.now()
|
||||||
|
log.info {
|
||||||
|
val elapsed = Duration.between(start, end).toMillis()
|
||||||
|
val opsPerSecond = String.format("%.2f", numberOfEntries.toDouble() / elapsed * 1000)
|
||||||
|
"Insertion rate: $opsPerSecond ops/s"
|
||||||
|
}
|
||||||
|
inserted
|
||||||
|
}
|
||||||
|
log.info {
|
||||||
|
"Inserted ${entries.size} entries"
|
||||||
|
}
|
||||||
|
log.info {
|
||||||
|
"Starting retrieval"
|
||||||
|
}
|
||||||
|
if (entries.isNotEmpty()) {
|
||||||
|
val completionCounter = AtomicLong(0)
|
||||||
|
val semaphore = Semaphore(profile.maxConnections * 3)
|
||||||
|
val start = Instant.now()
|
||||||
|
val it = entries.iterator()
|
||||||
|
while (completionCounter.get() < entries.size) {
|
||||||
|
if (it.hasNext()) {
|
||||||
|
val entry = it.next()
|
||||||
|
val future = client.get(entry.first).thenApply {
|
||||||
|
if (it == null) {
|
||||||
|
log.error {
|
||||||
|
"Missing entry for key '${entry.first}'"
|
||||||
|
}
|
||||||
|
} else if (!entry.second.contentEquals(it)) {
|
||||||
|
log.error {
|
||||||
|
"Retrieved a value different from what was inserted for key '${entry.first}'"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
future.whenComplete { _, _ ->
|
||||||
|
completionCounter.incrementAndGet()
|
||||||
|
semaphore.release()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Thread.sleep(0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val end = Instant.now()
|
||||||
|
log.info {
|
||||||
|
val elapsed = Duration.between(start, end).toMillis()
|
||||||
|
val opsPerSecond = String.format("%.2f", entries.size.toDouble() / elapsed * 1000)
|
||||||
|
"Retrieval rate: $opsPerSecond ops/s"
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
log.error("Skipping retrieval benchmark as it was not possible to insert any entry in the cache")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,41 @@
|
|||||||
|
package net.woggioni.rbcs.cli.impl.commands
|
||||||
|
|
||||||
|
import net.woggioni.rbcs.cli.impl.RbcsCommand
|
||||||
|
import net.woggioni.rbcs.client.RemoteBuildCacheClient
|
||||||
|
import net.woggioni.jwo.Application
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.nio.file.Path
|
||||||
|
|
||||||
|
@CommandLine.Command(
|
||||||
|
name = "client",
|
||||||
|
description = ["RBCS client"],
|
||||||
|
showDefaultValues = true
|
||||||
|
)
|
||||||
|
class ClientCommand(app : Application) : RbcsCommand() {
|
||||||
|
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ["-c", "--configuration"],
|
||||||
|
description = ["Path to the client configuration file"],
|
||||||
|
paramLabel = "CONFIGURATION_FILE"
|
||||||
|
)
|
||||||
|
private var configurationFile : Path = findConfigurationFile(app, "rbcs-client.xml")
|
||||||
|
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ["-p", "--profile"],
|
||||||
|
description = ["Name of the client profile to be used"],
|
||||||
|
paramLabel = "PROFILE",
|
||||||
|
required = true
|
||||||
|
)
|
||||||
|
var profileName : String? = null
|
||||||
|
|
||||||
|
val configuration : RemoteBuildCacheClient.Configuration by lazy {
|
||||||
|
RemoteBuildCacheClient.Configuration.parse(configurationFile)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun run() {
|
||||||
|
println("Available profiles:")
|
||||||
|
configuration.profiles.forEach { (profileName, _) ->
|
||||||
|
println(profileName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,51 @@
|
|||||||
|
package net.woggioni.rbcs.cli.impl.commands
|
||||||
|
|
||||||
|
import net.woggioni.rbcs.cli.impl.RbcsCommand
|
||||||
|
import net.woggioni.rbcs.client.RemoteBuildCacheClient
|
||||||
|
import net.woggioni.rbcs.common.contextLogger
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Path
|
||||||
|
|
||||||
|
@CommandLine.Command(
|
||||||
|
name = "get",
|
||||||
|
description = ["Fetch a value from the cache with the specified key"],
|
||||||
|
showDefaultValues = true
|
||||||
|
)
|
||||||
|
class GetCommand : RbcsCommand() {
|
||||||
|
private val log = contextLogger()
|
||||||
|
|
||||||
|
@CommandLine.Spec
|
||||||
|
private lateinit var spec: CommandLine.Model.CommandSpec
|
||||||
|
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ["-k", "--key"],
|
||||||
|
description = ["The key for the new value"],
|
||||||
|
paramLabel = "KEY"
|
||||||
|
)
|
||||||
|
private var key : String = ""
|
||||||
|
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ["-v", "--value"],
|
||||||
|
description = ["Path to a file where the retrieved value will be written (defaults to stdout)"],
|
||||||
|
paramLabel = "VALUE_FILE",
|
||||||
|
)
|
||||||
|
private var output : Path? = null
|
||||||
|
|
||||||
|
override fun run() {
|
||||||
|
val clientCommand = spec.parent().userObject() as ClientCommand
|
||||||
|
val profile = clientCommand.profileName.let { profileName ->
|
||||||
|
clientCommand.configuration.profiles[profileName]
|
||||||
|
?: throw IllegalArgumentException("Profile $profileName does not exist in configuration")
|
||||||
|
}
|
||||||
|
RemoteBuildCacheClient(profile).use { client ->
|
||||||
|
client.get(key).thenApply { value ->
|
||||||
|
value?.let {
|
||||||
|
(output?.let(Files::newOutputStream) ?: System.out).use {
|
||||||
|
it.write(value)
|
||||||
|
}
|
||||||
|
} ?: throw NoSuchElementException("No value found for key $key")
|
||||||
|
}.get()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,45 @@
|
|||||||
|
package net.woggioni.rbcs.cli.impl.commands
|
||||||
|
|
||||||
|
import net.woggioni.rbcs.cli.impl.RbcsCommand
|
||||||
|
import net.woggioni.rbcs.client.RemoteBuildCacheClient
|
||||||
|
import net.woggioni.rbcs.common.contextLogger
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.security.SecureRandom
|
||||||
|
import kotlin.random.Random
|
||||||
|
|
||||||
|
@CommandLine.Command(
|
||||||
|
name = "health",
|
||||||
|
description = ["Check server health"],
|
||||||
|
showDefaultValues = true
|
||||||
|
)
|
||||||
|
class HealthCheckCommand : RbcsCommand() {
|
||||||
|
private val log = contextLogger()
|
||||||
|
|
||||||
|
@CommandLine.Spec
|
||||||
|
private lateinit var spec: CommandLine.Model.CommandSpec
|
||||||
|
|
||||||
|
override fun run() {
|
||||||
|
val clientCommand = spec.parent().userObject() as ClientCommand
|
||||||
|
val profile = clientCommand.profileName.let { profileName ->
|
||||||
|
clientCommand.configuration.profiles[profileName]
|
||||||
|
?: throw IllegalArgumentException("Profile $profileName does not exist in configuration")
|
||||||
|
}
|
||||||
|
RemoteBuildCacheClient(profile).use { client ->
|
||||||
|
val random = Random(SecureRandom.getInstance("NativePRNGNonBlocking").nextLong())
|
||||||
|
val nonce = ByteArray(0xa0)
|
||||||
|
random.nextBytes(nonce)
|
||||||
|
client.healthCheck(nonce).thenApply { value ->
|
||||||
|
if(value == null) {
|
||||||
|
throw IllegalStateException("Empty response from server")
|
||||||
|
}
|
||||||
|
for(i in 0 until nonce.size) {
|
||||||
|
for(j in value.size - nonce.size until nonce.size) {
|
||||||
|
if(nonce[i] != value[j]) {
|
||||||
|
throw IllegalStateException("Server nonce does not match")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}.get()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -1,26 +1,26 @@
|
|||||||
package net.woggioni.gbcs.cli.impl.commands
|
package net.woggioni.rbcs.cli.impl.commands
|
||||||
|
|
||||||
import net.woggioni.gbcs.base.PasswordSecurity.hashPassword
|
import net.woggioni.rbcs.cli.impl.RbcsCommand
|
||||||
import net.woggioni.gbcs.cli.impl.GbcsCommand
|
import net.woggioni.rbcs.cli.impl.converters.OutputStreamConverter
|
||||||
import net.woggioni.gbcs.cli.impl.converters.OutputStreamConverter
|
import net.woggioni.rbcs.common.PasswordSecurity.hashPassword
|
||||||
import net.woggioni.jwo.UncloseableOutputStream
|
import net.woggioni.jwo.UncloseableOutputStream
|
||||||
import picocli.CommandLine
|
import picocli.CommandLine
|
||||||
import java.io.BufferedWriter
|
|
||||||
import java.io.OutputStream
|
import java.io.OutputStream
|
||||||
import java.io.OutputStreamWriter
|
import java.io.OutputStreamWriter
|
||||||
|
import java.io.PrintWriter
|
||||||
|
|
||||||
|
|
||||||
@CommandLine.Command(
|
@CommandLine.Command(
|
||||||
name = "password",
|
name = "password",
|
||||||
description = ["Generate a password hash to add to GBCS configuration file"],
|
description = ["Generate a password hash to add to RBCS configuration file"],
|
||||||
showDefaultValues = true
|
showDefaultValues = true
|
||||||
)
|
)
|
||||||
class PasswordHashCommand : GbcsCommand() {
|
class PasswordHashCommand : RbcsCommand() {
|
||||||
@CommandLine.Option(
|
@CommandLine.Option(
|
||||||
names = ["-o", "--output-file"],
|
names = ["-o", "--output-file"],
|
||||||
description = ["Write the output to a file instead of stdout"],
|
description = ["Write the output to a file instead of stdout"],
|
||||||
converter = [OutputStreamConverter::class],
|
converter = [OutputStreamConverter::class],
|
||||||
defaultValue = "stdout",
|
showDefaultValue = CommandLine.Help.Visibility.NEVER,
|
||||||
paramLabel = "OUTPUT_FILE"
|
paramLabel = "OUTPUT_FILE"
|
||||||
)
|
)
|
||||||
private var outputStream: OutputStream = UncloseableOutputStream(System.out)
|
private var outputStream: OutputStream = UncloseableOutputStream(System.out)
|
||||||
@@ -30,9 +30,8 @@ class PasswordHashCommand : GbcsCommand() {
|
|||||||
val password2 = String(System.console().readPassword("Type your password again for confirmation:"))
|
val password2 = String(System.console().readPassword("Type your password again for confirmation:"))
|
||||||
if(password1 != password2) throw IllegalArgumentException("Passwords do not match")
|
if(password1 != password2) throw IllegalArgumentException("Passwords do not match")
|
||||||
|
|
||||||
BufferedWriter(OutputStreamWriter(outputStream, Charsets.UTF_8)).use {
|
PrintWriter(OutputStreamWriter(outputStream, Charsets.UTF_8)).use {
|
||||||
it.write(hashPassword(password1))
|
it.println(hashPassword(password1))
|
||||||
it.newLine()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -0,0 +1,48 @@
|
|||||||
|
package net.woggioni.rbcs.cli.impl.commands
|
||||||
|
|
||||||
|
import net.woggioni.rbcs.cli.impl.RbcsCommand
|
||||||
|
import net.woggioni.rbcs.cli.impl.converters.InputStreamConverter
|
||||||
|
import net.woggioni.rbcs.client.RemoteBuildCacheClient
|
||||||
|
import net.woggioni.rbcs.common.contextLogger
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.io.InputStream
|
||||||
|
|
||||||
|
@CommandLine.Command(
|
||||||
|
name = "put",
|
||||||
|
description = ["Add or replace a value to the cache with the specified key"],
|
||||||
|
showDefaultValues = true
|
||||||
|
)
|
||||||
|
class PutCommand : RbcsCommand() {
|
||||||
|
private val log = contextLogger()
|
||||||
|
|
||||||
|
@CommandLine.Spec
|
||||||
|
private lateinit var spec: CommandLine.Model.CommandSpec
|
||||||
|
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ["-k", "--key"],
|
||||||
|
description = ["The key for the new value"],
|
||||||
|
paramLabel = "KEY"
|
||||||
|
)
|
||||||
|
private var key : String = ""
|
||||||
|
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ["-v", "--value"],
|
||||||
|
description = ["Path to a file containing the value to be added (defaults to stdin)"],
|
||||||
|
paramLabel = "VALUE_FILE",
|
||||||
|
converter = [InputStreamConverter::class]
|
||||||
|
)
|
||||||
|
private var value : InputStream = System.`in`
|
||||||
|
|
||||||
|
override fun run() {
|
||||||
|
val clientCommand = spec.parent().userObject() as ClientCommand
|
||||||
|
val profile = clientCommand.profileName.let { profileName ->
|
||||||
|
clientCommand.configuration.profiles[profileName]
|
||||||
|
?: throw IllegalArgumentException("Profile $profileName does not exist in configuration")
|
||||||
|
}
|
||||||
|
RemoteBuildCacheClient(profile).use { client ->
|
||||||
|
value.use {
|
||||||
|
client.put(key, it.readAllBytes())
|
||||||
|
}.get()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,76 @@
|
|||||||
|
package net.woggioni.rbcs.cli.impl.commands
|
||||||
|
|
||||||
|
import net.woggioni.rbcs.cli.impl.RbcsCommand
|
||||||
|
import net.woggioni.rbcs.cli.impl.converters.DurationConverter
|
||||||
|
import net.woggioni.rbcs.common.contextLogger
|
||||||
|
import net.woggioni.rbcs.common.debug
|
||||||
|
import net.woggioni.rbcs.common.info
|
||||||
|
import net.woggioni.rbcs.server.RemoteBuildCacheServer
|
||||||
|
import net.woggioni.rbcs.server.RemoteBuildCacheServer.Companion.DEFAULT_CONFIGURATION_URL
|
||||||
|
import net.woggioni.jwo.Application
|
||||||
|
import net.woggioni.jwo.JWO
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.io.ByteArrayOutputStream
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Path
|
||||||
|
import java.time.Duration
|
||||||
|
|
||||||
|
@CommandLine.Command(
|
||||||
|
name = "server",
|
||||||
|
description = ["RBCS server"],
|
||||||
|
showDefaultValues = true
|
||||||
|
)
|
||||||
|
class ServerCommand(app : Application) : RbcsCommand() {
|
||||||
|
|
||||||
|
private val log = contextLogger()
|
||||||
|
|
||||||
|
private fun createDefaultConfigurationFile(configurationFile: Path) {
|
||||||
|
log.info {
|
||||||
|
"Creating default configuration file at '$configurationFile'"
|
||||||
|
}
|
||||||
|
val defaultConfigurationFileResource = DEFAULT_CONFIGURATION_URL
|
||||||
|
Files.newOutputStream(configurationFile).use { outputStream ->
|
||||||
|
defaultConfigurationFileResource.openStream().use { inputStream ->
|
||||||
|
JWO.copy(inputStream, outputStream)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ["-t", "--timeout"],
|
||||||
|
description = ["Exit after the specified time"],
|
||||||
|
paramLabel = "TIMEOUT",
|
||||||
|
converter = [DurationConverter::class]
|
||||||
|
)
|
||||||
|
private var timeout: Duration? = null
|
||||||
|
|
||||||
|
@CommandLine.Option(
|
||||||
|
names = ["-c", "--config-file"],
|
||||||
|
description = ["Read the application configuration from this file"],
|
||||||
|
paramLabel = "CONFIG_FILE"
|
||||||
|
)
|
||||||
|
private var configurationFile: Path = findConfigurationFile(app, "rbcs-server.xml")
|
||||||
|
|
||||||
|
override fun run() {
|
||||||
|
if (!Files.exists(configurationFile)) {
|
||||||
|
Files.createDirectories(configurationFile.parent)
|
||||||
|
createDefaultConfigurationFile(configurationFile)
|
||||||
|
}
|
||||||
|
|
||||||
|
val configuration = RemoteBuildCacheServer.loadConfiguration(configurationFile)
|
||||||
|
log.debug {
|
||||||
|
ByteArrayOutputStream().also {
|
||||||
|
RemoteBuildCacheServer.dumpConfiguration(configuration, it)
|
||||||
|
}.let {
|
||||||
|
"Server configuration:\n${String(it.toByteArray())}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val server = RemoteBuildCacheServer(configuration)
|
||||||
|
server.run().use { server ->
|
||||||
|
timeout?.let {
|
||||||
|
Thread.sleep(it)
|
||||||
|
server.shutdown()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,11 @@
|
|||||||
|
package net.woggioni.rbcs.cli.impl.converters
|
||||||
|
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.time.Duration
|
||||||
|
|
||||||
|
|
||||||
|
class DurationConverter : CommandLine.ITypeConverter<Duration> {
|
||||||
|
override fun convert(value: String): Duration {
|
||||||
|
return Duration.parse(value)
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,13 @@
|
|||||||
|
package net.woggioni.rbcs.cli.impl.converters
|
||||||
|
|
||||||
|
import picocli.CommandLine
|
||||||
|
import java.io.InputStream
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Paths
|
||||||
|
|
||||||
|
|
||||||
|
class InputStreamConverter : CommandLine.ITypeConverter<InputStream> {
|
||||||
|
override fun convert(value: String): InputStream {
|
||||||
|
return Files.newInputStream(Paths.get(value))
|
||||||
|
}
|
||||||
|
}
|
@@ -1,4 +1,4 @@
|
|||||||
package net.woggioni.gbcs.cli.impl.converters
|
package net.woggioni.rbcs.cli.impl.converters
|
||||||
|
|
||||||
import picocli.CommandLine
|
import picocli.CommandLine
|
||||||
import java.io.OutputStream
|
import java.io.OutputStream
|
@@ -12,10 +12,7 @@
|
|||||||
</encoder>
|
</encoder>
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<root level="debug">
|
<root level="info">
|
||||||
<appender-ref ref="console"/>
|
<appender-ref ref="console"/>
|
||||||
</root>
|
</root>
|
||||||
<logger name="io.netty" level="debug"/>
|
|
||||||
<logger name="com.google.code.yanf4j" level="warn"/>
|
|
||||||
<logger name="net.rubyeye.xmemcached" level="warn"/>
|
|
||||||
</configuration>
|
</configuration>
|
19
rbcs-client/build.gradle
Normal file
19
rbcs-client/build.gradle
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
alias catalog.plugins.kotlin.jvm
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation project(':rbcs-api')
|
||||||
|
implementation project(':rbcs-common')
|
||||||
|
implementation catalog.slf4j.api
|
||||||
|
implementation catalog.netty.buffer
|
||||||
|
implementation catalog.netty.handler
|
||||||
|
implementation catalog.netty.transport
|
||||||
|
implementation catalog.netty.common
|
||||||
|
implementation catalog.netty.codec.http
|
||||||
|
|
||||||
|
testRuntimeOnly catalog.logback.classic
|
||||||
|
}
|
||||||
|
|
||||||
|
|
17
rbcs-client/src/main/java/module-info.java
Normal file
17
rbcs-client/src/main/java/module-info.java
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
module net.woggioni.rbcs.client {
|
||||||
|
requires io.netty.handler;
|
||||||
|
requires io.netty.codec.http;
|
||||||
|
requires io.netty.transport;
|
||||||
|
requires kotlin.stdlib;
|
||||||
|
requires io.netty.common;
|
||||||
|
requires io.netty.buffer;
|
||||||
|
requires java.xml;
|
||||||
|
requires net.woggioni.rbcs.common;
|
||||||
|
requires net.woggioni.rbcs.api;
|
||||||
|
requires io.netty.codec;
|
||||||
|
requires org.slf4j;
|
||||||
|
|
||||||
|
exports net.woggioni.rbcs.client;
|
||||||
|
|
||||||
|
opens net.woggioni.rbcs.client.schema;
|
||||||
|
}
|
345
rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/Client.kt
Normal file
345
rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/Client.kt
Normal file
@@ -0,0 +1,345 @@
|
|||||||
|
package net.woggioni.rbcs.client
|
||||||
|
|
||||||
|
import io.netty.bootstrap.Bootstrap
|
||||||
|
import io.netty.buffer.ByteBuf
|
||||||
|
import io.netty.buffer.Unpooled
|
||||||
|
import io.netty.channel.Channel
|
||||||
|
import io.netty.channel.ChannelHandlerContext
|
||||||
|
import io.netty.channel.ChannelOption
|
||||||
|
import io.netty.channel.ChannelPipeline
|
||||||
|
import io.netty.channel.SimpleChannelInboundHandler
|
||||||
|
import io.netty.channel.nio.NioEventLoopGroup
|
||||||
|
import io.netty.channel.pool.AbstractChannelPoolHandler
|
||||||
|
import io.netty.channel.pool.ChannelPool
|
||||||
|
import io.netty.channel.pool.FixedChannelPool
|
||||||
|
import io.netty.channel.socket.nio.NioSocketChannel
|
||||||
|
import io.netty.handler.codec.DecoderException
|
||||||
|
import io.netty.handler.codec.http.DefaultFullHttpRequest
|
||||||
|
import io.netty.handler.codec.http.FullHttpRequest
|
||||||
|
import io.netty.handler.codec.http.FullHttpResponse
|
||||||
|
import io.netty.handler.codec.http.HttpClientCodec
|
||||||
|
import io.netty.handler.codec.http.HttpContentDecompressor
|
||||||
|
import io.netty.handler.codec.http.HttpHeaderNames
|
||||||
|
import io.netty.handler.codec.http.HttpHeaderValues
|
||||||
|
import io.netty.handler.codec.http.HttpMethod
|
||||||
|
import io.netty.handler.codec.http.HttpObjectAggregator
|
||||||
|
import io.netty.handler.codec.http.HttpResponseStatus
|
||||||
|
import io.netty.handler.codec.http.HttpVersion
|
||||||
|
import io.netty.handler.ssl.SslContext
|
||||||
|
import io.netty.handler.ssl.SslContextBuilder
|
||||||
|
import io.netty.handler.stream.ChunkedWriteHandler
|
||||||
|
import io.netty.util.concurrent.Future
|
||||||
|
import io.netty.util.concurrent.GenericFutureListener
|
||||||
|
import net.woggioni.rbcs.client.impl.Parser
|
||||||
|
import net.woggioni.rbcs.common.Xml
|
||||||
|
import net.woggioni.rbcs.common.contextLogger
|
||||||
|
import net.woggioni.rbcs.common.debug
|
||||||
|
import net.woggioni.rbcs.common.trace
|
||||||
|
import java.net.InetSocketAddress
|
||||||
|
import java.net.URI
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Path
|
||||||
|
import java.security.PrivateKey
|
||||||
|
import java.security.cert.X509Certificate
|
||||||
|
import java.time.Duration
|
||||||
|
import java.util.Base64
|
||||||
|
import java.util.concurrent.CompletableFuture
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger
|
||||||
|
import kotlin.random.Random
|
||||||
|
import io.netty.util.concurrent.Future as NettyFuture
|
||||||
|
|
||||||
|
class RemoteBuildCacheClient(private val profile: Configuration.Profile) : AutoCloseable {
|
||||||
|
private val group: NioEventLoopGroup
|
||||||
|
private var sslContext: SslContext
|
||||||
|
private val log = contextLogger()
|
||||||
|
private val pool: ChannelPool
|
||||||
|
|
||||||
|
data class Configuration(
|
||||||
|
val profiles: Map<String, Profile>
|
||||||
|
) {
|
||||||
|
sealed class Authentication {
|
||||||
|
data class TlsClientAuthenticationCredentials(
|
||||||
|
val key: PrivateKey,
|
||||||
|
val certificateChain: Array<X509Certificate>
|
||||||
|
) : Authentication()
|
||||||
|
|
||||||
|
data class BasicAuthenticationCredentials(val username: String, val password: String) : Authentication()
|
||||||
|
}
|
||||||
|
|
||||||
|
class RetryPolicy(
|
||||||
|
val maxAttempts: Int,
|
||||||
|
val initialDelayMillis: Long,
|
||||||
|
val exp: Double
|
||||||
|
)
|
||||||
|
|
||||||
|
data class Profile(
|
||||||
|
val serverURI: URI,
|
||||||
|
val authentication: Authentication?,
|
||||||
|
val connectionTimeout: Duration?,
|
||||||
|
val maxConnections: Int,
|
||||||
|
val retryPolicy: RetryPolicy?,
|
||||||
|
)
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
fun parse(path: Path): Configuration {
|
||||||
|
return Files.newInputStream(path).use {
|
||||||
|
Xml.parseXml(path.toUri().toURL(), it)
|
||||||
|
}.let(Parser::parse)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
group = NioEventLoopGroup()
|
||||||
|
sslContext = SslContextBuilder.forClient().also { builder ->
|
||||||
|
(profile.authentication as? Configuration.Authentication.TlsClientAuthenticationCredentials)?.let { tlsClientAuthenticationCredentials ->
|
||||||
|
builder.keyManager(
|
||||||
|
tlsClientAuthenticationCredentials.key,
|
||||||
|
*tlsClientAuthenticationCredentials.certificateChain
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}.build()
|
||||||
|
|
||||||
|
val (scheme, host, port) = profile.serverURI.run {
|
||||||
|
Triple(
|
||||||
|
if (scheme == null) "http" else profile.serverURI.scheme,
|
||||||
|
host,
|
||||||
|
port.takeIf { it > 0 } ?: if ("https" == scheme.lowercase()) 443 else 80
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
val bootstrap = Bootstrap().apply {
|
||||||
|
group(group)
|
||||||
|
channel(NioSocketChannel::class.java)
|
||||||
|
option(ChannelOption.TCP_NODELAY, true)
|
||||||
|
option(ChannelOption.SO_KEEPALIVE, true)
|
||||||
|
remoteAddress(InetSocketAddress(host, port))
|
||||||
|
profile.connectionTimeout?.let {
|
||||||
|
option(ChannelOption.CONNECT_TIMEOUT_MILLIS, it.toMillis().toInt())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val channelPoolHandler = object : AbstractChannelPoolHandler() {
|
||||||
|
|
||||||
|
@Volatile
|
||||||
|
private var connectionCount = AtomicInteger()
|
||||||
|
|
||||||
|
@Volatile
|
||||||
|
private var leaseCount = AtomicInteger()
|
||||||
|
|
||||||
|
override fun channelReleased(ch: Channel) {
|
||||||
|
val activeLeases = leaseCount.decrementAndGet()
|
||||||
|
log.trace {
|
||||||
|
"Released channel ${ch.id().asShortText()}, number of active leases: $activeLeases"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun channelAcquired(ch: Channel) {
|
||||||
|
val activeLeases = leaseCount.getAndIncrement()
|
||||||
|
log.trace {
|
||||||
|
"Acquired channel ${ch.id().asShortText()}, number of active leases: $activeLeases"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun channelCreated(ch: Channel) {
|
||||||
|
val connectionId = connectionCount.getAndIncrement()
|
||||||
|
log.debug {
|
||||||
|
"Created connection $connectionId, total number of active connections: $connectionId"
|
||||||
|
}
|
||||||
|
ch.closeFuture().addListener {
|
||||||
|
val activeConnections = connectionCount.decrementAndGet()
|
||||||
|
log.debug {
|
||||||
|
"Closed connection $connectionId, total number of active connections: $activeConnections"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val pipeline: ChannelPipeline = ch.pipeline()
|
||||||
|
|
||||||
|
// Add SSL handler if needed
|
||||||
|
if ("https".equals(scheme, ignoreCase = true)) {
|
||||||
|
pipeline.addLast("ssl", sslContext.newHandler(ch.alloc(), host, port))
|
||||||
|
}
|
||||||
|
|
||||||
|
// HTTP handlers
|
||||||
|
pipeline.addLast("codec", HttpClientCodec())
|
||||||
|
pipeline.addLast("decompressor", HttpContentDecompressor())
|
||||||
|
pipeline.addLast("aggregator", HttpObjectAggregator(134217728))
|
||||||
|
pipeline.addLast("chunked", ChunkedWriteHandler())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pool = FixedChannelPool(bootstrap, channelPoolHandler, profile.maxConnections)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun executeWithRetry(operation: () -> CompletableFuture<FullHttpResponse>): CompletableFuture<FullHttpResponse> {
|
||||||
|
val retryPolicy = profile.retryPolicy
|
||||||
|
return if (retryPolicy != null) {
|
||||||
|
val outcomeHandler = OutcomeHandler<FullHttpResponse> { outcome ->
|
||||||
|
when (outcome) {
|
||||||
|
is OperationOutcome.Success -> {
|
||||||
|
val response = outcome.result
|
||||||
|
val status = response.status()
|
||||||
|
when (status) {
|
||||||
|
HttpResponseStatus.TOO_MANY_REQUESTS -> {
|
||||||
|
val retryAfter = response.headers()[HttpHeaderNames.RETRY_AFTER]?.let { headerValue ->
|
||||||
|
try {
|
||||||
|
headerValue.toLong() * 1000
|
||||||
|
} catch (nfe: NumberFormatException) {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
OutcomeHandlerResult.Retry(retryAfter)
|
||||||
|
}
|
||||||
|
|
||||||
|
HttpResponseStatus.INTERNAL_SERVER_ERROR, HttpResponseStatus.SERVICE_UNAVAILABLE ->
|
||||||
|
OutcomeHandlerResult.Retry()
|
||||||
|
|
||||||
|
else -> OutcomeHandlerResult.DoNotRetry()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
is OperationOutcome.Failure -> {
|
||||||
|
OutcomeHandlerResult.Retry()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
executeWithRetry(
|
||||||
|
group,
|
||||||
|
retryPolicy.maxAttempts,
|
||||||
|
retryPolicy.initialDelayMillis.toDouble(),
|
||||||
|
retryPolicy.exp,
|
||||||
|
outcomeHandler,
|
||||||
|
Random.Default,
|
||||||
|
operation
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
operation()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun healthCheck(nonce: ByteArray): CompletableFuture<ByteArray?> {
|
||||||
|
return executeWithRetry {
|
||||||
|
sendRequest(profile.serverURI, HttpMethod.TRACE, nonce)
|
||||||
|
}.thenApply {
|
||||||
|
val status = it.status()
|
||||||
|
if (it.status() != HttpResponseStatus.OK) {
|
||||||
|
throw HttpException(status)
|
||||||
|
} else {
|
||||||
|
it.content()
|
||||||
|
}
|
||||||
|
}.thenApply { maybeByteBuf ->
|
||||||
|
maybeByteBuf?.let {
|
||||||
|
val result = ByteArray(it.readableBytes())
|
||||||
|
it.getBytes(0, result)
|
||||||
|
result
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun get(key: String): CompletableFuture<ByteArray?> {
|
||||||
|
return executeWithRetry {
|
||||||
|
sendRequest(profile.serverURI.resolve(key), HttpMethod.GET, null)
|
||||||
|
}.thenApply {
|
||||||
|
val status = it.status()
|
||||||
|
if (it.status() == HttpResponseStatus.NOT_FOUND) {
|
||||||
|
null
|
||||||
|
} else if (it.status() != HttpResponseStatus.OK) {
|
||||||
|
throw HttpException(status)
|
||||||
|
} else {
|
||||||
|
it.content()
|
||||||
|
}
|
||||||
|
}.thenApply { maybeByteBuf ->
|
||||||
|
maybeByteBuf?.let {
|
||||||
|
val result = ByteArray(it.readableBytes())
|
||||||
|
it.getBytes(0, result)
|
||||||
|
result
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun put(key: String, content: ByteArray): CompletableFuture<Unit> {
|
||||||
|
return executeWithRetry {
|
||||||
|
sendRequest(profile.serverURI.resolve(key), HttpMethod.PUT, content)
|
||||||
|
}.thenApply {
|
||||||
|
val status = it.status()
|
||||||
|
if (it.status() != HttpResponseStatus.CREATED && it.status() != HttpResponseStatus.OK) {
|
||||||
|
throw HttpException(status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun sendRequest(uri: URI, method: HttpMethod, body: ByteArray?): CompletableFuture<FullHttpResponse> {
|
||||||
|
val responseFuture = CompletableFuture<FullHttpResponse>()
|
||||||
|
// Custom handler for processing responses
|
||||||
|
pool.acquire().addListener(object : GenericFutureListener<NettyFuture<Channel>> {
|
||||||
|
override fun operationComplete(channelFuture: Future<Channel>) {
|
||||||
|
if (channelFuture.isSuccess) {
|
||||||
|
val channel = channelFuture.now
|
||||||
|
val pipeline = channel.pipeline()
|
||||||
|
channel.pipeline().addLast("handler", object : SimpleChannelInboundHandler<FullHttpResponse>() {
|
||||||
|
override fun channelRead0(
|
||||||
|
ctx: ChannelHandlerContext,
|
||||||
|
response: FullHttpResponse
|
||||||
|
) {
|
||||||
|
pipeline.removeLast()
|
||||||
|
pool.release(channel)
|
||||||
|
responseFuture.complete(response)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable) {
|
||||||
|
val ex = when (cause) {
|
||||||
|
is DecoderException -> cause.cause
|
||||||
|
else -> cause
|
||||||
|
}
|
||||||
|
responseFuture.completeExceptionally(ex)
|
||||||
|
ctx.close()
|
||||||
|
pipeline.removeLast()
|
||||||
|
pool.release(channel)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
// Prepare the HTTP request
|
||||||
|
val request: FullHttpRequest = let {
|
||||||
|
val content: ByteBuf? = body?.takeIf(ByteArray::isNotEmpty)?.let(Unpooled::wrappedBuffer)
|
||||||
|
DefaultFullHttpRequest(
|
||||||
|
HttpVersion.HTTP_1_1,
|
||||||
|
method,
|
||||||
|
uri.rawPath,
|
||||||
|
content ?: Unpooled.buffer(0)
|
||||||
|
).apply {
|
||||||
|
headers().apply {
|
||||||
|
if (content != null) {
|
||||||
|
set(HttpHeaderNames.CONTENT_TYPE, HttpHeaderValues.APPLICATION_OCTET_STREAM)
|
||||||
|
set(HttpHeaderNames.CONTENT_LENGTH, content.readableBytes())
|
||||||
|
}
|
||||||
|
set(HttpHeaderNames.HOST, profile.serverURI.host)
|
||||||
|
set(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE)
|
||||||
|
set(
|
||||||
|
HttpHeaderNames.ACCEPT_ENCODING,
|
||||||
|
HttpHeaderValues.GZIP.toString() + "," + HttpHeaderValues.DEFLATE.toString()
|
||||||
|
)
|
||||||
|
// Add basic auth if configured
|
||||||
|
(profile.authentication as? Configuration.Authentication.BasicAuthenticationCredentials)?.let { credentials ->
|
||||||
|
val auth = "${credentials.username}:${credentials.password}"
|
||||||
|
val encodedAuth = Base64.getEncoder().encodeToString(auth.toByteArray())
|
||||||
|
set(HttpHeaderNames.AUTHORIZATION, "Basic $encodedAuth")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set headers
|
||||||
|
// Send the request
|
||||||
|
channel.writeAndFlush(request)
|
||||||
|
} else {
|
||||||
|
responseFuture.completeExceptionally(channelFuture.cause())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return responseFuture
|
||||||
|
}
|
||||||
|
|
||||||
|
fun shutDown(): NettyFuture<*> {
|
||||||
|
return group.shutdownGracefully()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun close() {
|
||||||
|
shutDown().sync()
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,9 @@
|
|||||||
|
package net.woggioni.rbcs.client
|
||||||
|
|
||||||
|
import io.netty.handler.codec.http.HttpResponseStatus
|
||||||
|
|
||||||
|
class HttpException(private val status : HttpResponseStatus) : RuntimeException(status.reasonPhrase()) {
|
||||||
|
|
||||||
|
override val message: String
|
||||||
|
get() = "Http status ${status.code()}: ${status.reasonPhrase()}"
|
||||||
|
}
|
@@ -0,0 +1,108 @@
|
|||||||
|
package net.woggioni.rbcs.client.impl
|
||||||
|
|
||||||
|
import net.woggioni.rbcs.api.exception.ConfigurationException
|
||||||
|
import net.woggioni.rbcs.client.RemoteBuildCacheClient
|
||||||
|
import net.woggioni.rbcs.common.Xml.Companion.asIterable
|
||||||
|
import net.woggioni.rbcs.common.Xml.Companion.renderAttribute
|
||||||
|
import org.w3c.dom.Document
|
||||||
|
import java.net.URI
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Path
|
||||||
|
import java.security.KeyStore
|
||||||
|
import java.security.PrivateKey
|
||||||
|
import java.security.cert.X509Certificate
|
||||||
|
import java.time.Duration
|
||||||
|
|
||||||
|
object Parser {
|
||||||
|
|
||||||
|
fun parse(document: Document): RemoteBuildCacheClient.Configuration {
|
||||||
|
val root = document.documentElement
|
||||||
|
val profiles = mutableMapOf<String, RemoteBuildCacheClient.Configuration.Profile>()
|
||||||
|
|
||||||
|
for (child in root.asIterable()) {
|
||||||
|
val tagName = child.localName
|
||||||
|
when (tagName) {
|
||||||
|
"profile" -> {
|
||||||
|
val name =
|
||||||
|
child.renderAttribute("name") ?: throw ConfigurationException("name attribute is required")
|
||||||
|
val uri = child.renderAttribute("base-url")?.let(::URI)
|
||||||
|
?: throw ConfigurationException("base-url attribute is required")
|
||||||
|
var authentication: RemoteBuildCacheClient.Configuration.Authentication? = null
|
||||||
|
var retryPolicy: RemoteBuildCacheClient.Configuration.RetryPolicy? = null
|
||||||
|
for (gchild in child.asIterable()) {
|
||||||
|
when (gchild.localName) {
|
||||||
|
"tls-client-auth" -> {
|
||||||
|
val keyStoreFile = gchild.renderAttribute("key-store-file")
|
||||||
|
val keyStorePassword =
|
||||||
|
gchild.renderAttribute("key-store-password")
|
||||||
|
val keyAlias = gchild.renderAttribute("key-alias")
|
||||||
|
val keyPassword = gchild.renderAttribute("key-password")
|
||||||
|
|
||||||
|
val keystore = KeyStore.getInstance("PKCS12").apply {
|
||||||
|
Files.newInputStream(Path.of(keyStoreFile)).use {
|
||||||
|
load(it, keyStorePassword?.toCharArray())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val key = keystore.getKey(keyAlias, keyPassword?.toCharArray()) as PrivateKey
|
||||||
|
val certChain = keystore.getCertificateChain(keyAlias).asSequence()
|
||||||
|
.map { it as X509Certificate }
|
||||||
|
.toList()
|
||||||
|
.toTypedArray()
|
||||||
|
authentication =
|
||||||
|
RemoteBuildCacheClient.Configuration.Authentication.TlsClientAuthenticationCredentials(
|
||||||
|
key,
|
||||||
|
certChain
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
"basic-auth" -> {
|
||||||
|
val username = gchild.renderAttribute("user")
|
||||||
|
?: throw ConfigurationException("username attribute is required")
|
||||||
|
val password = gchild.renderAttribute("password")
|
||||||
|
?: throw ConfigurationException("password attribute is required")
|
||||||
|
authentication =
|
||||||
|
RemoteBuildCacheClient.Configuration.Authentication.BasicAuthenticationCredentials(
|
||||||
|
username,
|
||||||
|
password
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
"retry-policy" -> {
|
||||||
|
val maxAttempts =
|
||||||
|
gchild.renderAttribute("max-attempts")
|
||||||
|
?.let(String::toInt)
|
||||||
|
?: throw ConfigurationException("max-attempts attribute is required")
|
||||||
|
val initialDelay =
|
||||||
|
gchild.renderAttribute("initial-delay")
|
||||||
|
?.let(Duration::parse)
|
||||||
|
?: Duration.ofSeconds(1)
|
||||||
|
val exp =
|
||||||
|
gchild.renderAttribute("exp")
|
||||||
|
?.let(String::toDouble)
|
||||||
|
?: 2.0f
|
||||||
|
retryPolicy = RemoteBuildCacheClient.Configuration.RetryPolicy(
|
||||||
|
maxAttempts,
|
||||||
|
initialDelay.toMillis(),
|
||||||
|
exp.toDouble()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val maxConnections = child.renderAttribute("max-connections")
|
||||||
|
?.let(String::toInt)
|
||||||
|
?: 50
|
||||||
|
val connectionTimeout = child.renderAttribute("connection-timeout")
|
||||||
|
?.let(Duration::parse)
|
||||||
|
profiles[name] = RemoteBuildCacheClient.Configuration.Profile(
|
||||||
|
uri,
|
||||||
|
authentication,
|
||||||
|
connectionTimeout,
|
||||||
|
maxConnections,
|
||||||
|
retryPolicy
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return RemoteBuildCacheClient.Configuration(profiles)
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,79 @@
|
|||||||
|
package net.woggioni.rbcs.client
|
||||||
|
|
||||||
|
import io.netty.util.concurrent.EventExecutorGroup
|
||||||
|
import java.util.concurrent.CompletableFuture
|
||||||
|
import java.util.concurrent.TimeUnit
|
||||||
|
import kotlin.math.pow
|
||||||
|
import kotlin.random.Random
|
||||||
|
|
||||||
|
sealed class OperationOutcome<T> {
|
||||||
|
class Success<T>(val result: T) : OperationOutcome<T>()
|
||||||
|
class Failure<T>(val ex: Throwable) : OperationOutcome<T>()
|
||||||
|
}
|
||||||
|
|
||||||
|
sealed class OutcomeHandlerResult {
|
||||||
|
class Retry(val suggestedDelayMillis: Long? = null) : OutcomeHandlerResult()
|
||||||
|
class DoNotRetry : OutcomeHandlerResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun interface OutcomeHandler<T> {
|
||||||
|
fun shouldRetry(result: OperationOutcome<T>): OutcomeHandlerResult
|
||||||
|
}
|
||||||
|
|
||||||
|
fun <T> executeWithRetry(
|
||||||
|
eventExecutorGroup: EventExecutorGroup,
|
||||||
|
maxAttempts: Int,
|
||||||
|
initialDelay: Double,
|
||||||
|
exp: Double,
|
||||||
|
outcomeHandler: OutcomeHandler<T>,
|
||||||
|
randomizer : Random?,
|
||||||
|
cb: () -> CompletableFuture<T>
|
||||||
|
): CompletableFuture<T> {
|
||||||
|
|
||||||
|
val finalResult = cb()
|
||||||
|
var future = finalResult
|
||||||
|
var shortCircuit = false
|
||||||
|
for (i in 1 until maxAttempts) {
|
||||||
|
future = future.handle { result, ex ->
|
||||||
|
val operationOutcome = if (ex == null) {
|
||||||
|
OperationOutcome.Success(result)
|
||||||
|
} else {
|
||||||
|
OperationOutcome.Failure(ex.cause ?: ex)
|
||||||
|
}
|
||||||
|
if (shortCircuit) {
|
||||||
|
when(operationOutcome) {
|
||||||
|
is OperationOutcome.Failure -> throw operationOutcome.ex
|
||||||
|
is OperationOutcome.Success -> CompletableFuture.completedFuture(operationOutcome.result)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
when(val outcomeHandlerResult = outcomeHandler.shouldRetry(operationOutcome)) {
|
||||||
|
is OutcomeHandlerResult.Retry -> {
|
||||||
|
val res = CompletableFuture<T>()
|
||||||
|
val delay = run {
|
||||||
|
val scheduledDelay = (initialDelay * exp.pow(i.toDouble()) * (1.0 + (randomizer?.nextDouble(-0.5, 0.5) ?: 0.0))).toLong()
|
||||||
|
outcomeHandlerResult.suggestedDelayMillis?.coerceAtMost(scheduledDelay) ?: scheduledDelay
|
||||||
|
}
|
||||||
|
eventExecutorGroup.schedule({
|
||||||
|
cb().handle { result, ex ->
|
||||||
|
if (ex == null) {
|
||||||
|
res.complete(result)
|
||||||
|
} else {
|
||||||
|
res.completeExceptionally(ex)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, delay, TimeUnit.MILLISECONDS)
|
||||||
|
res
|
||||||
|
}
|
||||||
|
is OutcomeHandlerResult.DoNotRetry -> {
|
||||||
|
shortCircuit = true
|
||||||
|
when(operationOutcome) {
|
||||||
|
is OperationOutcome.Failure -> throw operationOutcome.ex
|
||||||
|
is OperationOutcome.Success -> CompletableFuture.completedFuture(operationOutcome.result)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}.thenCompose { it }
|
||||||
|
}
|
||||||
|
return future
|
||||||
|
}
|
@@ -0,0 +1,50 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
|
<xs:schema targetNamespace="urn:net.woggioni.rbcs.client"
|
||||||
|
xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
||||||
|
xmlns:rbcs-client="urn:net.woggioni.rbcs.client"
|
||||||
|
elementFormDefault="unqualified"
|
||||||
|
>
|
||||||
|
<xs:element name="profiles" type="rbcs-client:profilesType"/>
|
||||||
|
|
||||||
|
<xs:complexType name="profilesType">
|
||||||
|
<xs:sequence minOccurs="0">
|
||||||
|
<xs:element name="profile" type="rbcs-client:profileType" maxOccurs="unbounded"/>
|
||||||
|
</xs:sequence>
|
||||||
|
</xs:complexType>
|
||||||
|
|
||||||
|
<xs:complexType name="profileType">
|
||||||
|
<xs:sequence>
|
||||||
|
<xs:choice>
|
||||||
|
<xs:element name="no-auth" type="rbcs-client:noAuthType"/>
|
||||||
|
<xs:element name="basic-auth" type="rbcs-client:basicAuthType"/>
|
||||||
|
<xs:element name="tls-client-auth" type="rbcs-client:tlsClientAuthType"/>
|
||||||
|
</xs:choice>
|
||||||
|
<xs:element name="retry-policy" type="rbcs-client:retryType" minOccurs="0"/>
|
||||||
|
</xs:sequence>
|
||||||
|
<xs:attribute name="name" type="xs:token" use="required"/>
|
||||||
|
<xs:attribute name="base-url" type="xs:anyURI" use="required"/>
|
||||||
|
<xs:attribute name="max-connections" type="xs:positiveInteger" default="50"/>
|
||||||
|
<xs:attribute name="connection-timeout" type="xs:duration"/>
|
||||||
|
</xs:complexType>
|
||||||
|
|
||||||
|
<xs:complexType name="noAuthType"/>
|
||||||
|
|
||||||
|
<xs:complexType name="basicAuthType">
|
||||||
|
<xs:attribute name="user" type="xs:token" use="required"/>
|
||||||
|
<xs:attribute name="password" type="xs:string" use="required"/>
|
||||||
|
</xs:complexType>
|
||||||
|
|
||||||
|
<xs:complexType name="tlsClientAuthType">
|
||||||
|
<xs:attribute name="key-store-file" type="xs:anyURI" use="required"/>
|
||||||
|
<xs:attribute name="key-store-password" type="xs:string" use="required"/>
|
||||||
|
<xs:attribute name="key-alias" type="xs:token" use="required"/>
|
||||||
|
<xs:attribute name="key-password" type="xs:string" use="optional"/>
|
||||||
|
</xs:complexType>
|
||||||
|
|
||||||
|
<xs:complexType name="retryType">
|
||||||
|
<xs:attribute name="max-attempts" type="xs:positiveInteger" use="required"/>
|
||||||
|
<xs:attribute name="initial-delay" type="xs:duration" default="PT1S"/>
|
||||||
|
<xs:attribute name="exp" type="xs:double" default="2.0"/>
|
||||||
|
</xs:complexType>
|
||||||
|
|
||||||
|
</xs:schema>
|
@@ -0,0 +1,148 @@
|
|||||||
|
package net.woggioni.rbcs.client
|
||||||
|
|
||||||
|
import io.netty.util.concurrent.DefaultEventExecutorGroup
|
||||||
|
import io.netty.util.concurrent.EventExecutorGroup
|
||||||
|
import net.woggioni.rbcs.common.contextLogger
|
||||||
|
import org.junit.jupiter.api.Assertions
|
||||||
|
import org.junit.jupiter.api.extension.ExtensionContext
|
||||||
|
import org.junit.jupiter.params.ParameterizedTest
|
||||||
|
import org.junit.jupiter.params.provider.Arguments
|
||||||
|
import org.junit.jupiter.params.provider.ArgumentsProvider
|
||||||
|
import org.junit.jupiter.params.provider.ArgumentsSource
|
||||||
|
import java.util.concurrent.CompletableFuture
|
||||||
|
import java.util.stream.Stream
|
||||||
|
import kotlin.random.Random
|
||||||
|
|
||||||
|
class RetryTest {
|
||||||
|
|
||||||
|
data class TestArgs(
|
||||||
|
val seed: Int,
|
||||||
|
val maxAttempt: Int,
|
||||||
|
val initialDelay: Double,
|
||||||
|
val exp: Double,
|
||||||
|
)
|
||||||
|
|
||||||
|
class TestArguments : ArgumentsProvider {
|
||||||
|
override fun provideArguments(context: ExtensionContext): Stream<out Arguments> {
|
||||||
|
return Stream.of(
|
||||||
|
TestArgs(
|
||||||
|
seed = 101325,
|
||||||
|
maxAttempt = 5,
|
||||||
|
initialDelay = 50.0,
|
||||||
|
exp = 2.0,
|
||||||
|
),
|
||||||
|
TestArgs(
|
||||||
|
seed = 101325,
|
||||||
|
maxAttempt = 20,
|
||||||
|
initialDelay = 100.0,
|
||||||
|
exp = 1.1,
|
||||||
|
),
|
||||||
|
TestArgs(
|
||||||
|
seed = 123487,
|
||||||
|
maxAttempt = 20,
|
||||||
|
initialDelay = 100.0,
|
||||||
|
exp = 2.0,
|
||||||
|
),
|
||||||
|
TestArgs(
|
||||||
|
seed = 20082024,
|
||||||
|
maxAttempt = 10,
|
||||||
|
initialDelay = 100.0,
|
||||||
|
exp = 2.0,
|
||||||
|
)
|
||||||
|
).map {
|
||||||
|
object: Arguments {
|
||||||
|
override fun get() = arrayOf(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@ArgumentsSource(TestArguments::class)
|
||||||
|
@ParameterizedTest
|
||||||
|
fun test(testArgs: TestArgs) {
|
||||||
|
val log = contextLogger()
|
||||||
|
log.debug("Start")
|
||||||
|
val executor: EventExecutorGroup = DefaultEventExecutorGroup(1)
|
||||||
|
val attempts = mutableListOf<Pair<Long, OperationOutcome<Int>>>()
|
||||||
|
val outcomeHandler = OutcomeHandler<Int> { outcome ->
|
||||||
|
when(outcome) {
|
||||||
|
is OperationOutcome.Success -> {
|
||||||
|
if(outcome.result % 10 == 0) {
|
||||||
|
OutcomeHandlerResult.DoNotRetry()
|
||||||
|
} else {
|
||||||
|
OutcomeHandlerResult.Retry(null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is OperationOutcome.Failure -> {
|
||||||
|
when(outcome.ex) {
|
||||||
|
is IllegalStateException -> {
|
||||||
|
log.debug(outcome.ex.message, outcome.ex)
|
||||||
|
OutcomeHandlerResult.Retry(null)
|
||||||
|
}
|
||||||
|
else -> {
|
||||||
|
OutcomeHandlerResult.DoNotRetry()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val random = Random(testArgs.seed)
|
||||||
|
|
||||||
|
val future =
|
||||||
|
executeWithRetry(executor, testArgs.maxAttempt, testArgs.initialDelay, testArgs.exp, outcomeHandler, null) {
|
||||||
|
val now = System.nanoTime()
|
||||||
|
val result = CompletableFuture<Int>()
|
||||||
|
executor.submit {
|
||||||
|
val n = random.nextInt(0, Integer.MAX_VALUE)
|
||||||
|
log.debug("Got new number: {}", n)
|
||||||
|
if(n % 3 == 0) {
|
||||||
|
val ex = IllegalStateException("Value $n can be divided by 3")
|
||||||
|
result.completeExceptionally(ex)
|
||||||
|
attempts += now to OperationOutcome.Failure(ex)
|
||||||
|
} else if(n % 7 == 0) {
|
||||||
|
val ex = RuntimeException("Value $n can be divided by 7")
|
||||||
|
result.completeExceptionally(ex)
|
||||||
|
attempts += now to OperationOutcome.Failure(ex)
|
||||||
|
} else {
|
||||||
|
result.complete(n)
|
||||||
|
attempts += now to OperationOutcome.Success(n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
Assertions.assertTrue(attempts.size <= testArgs.maxAttempt)
|
||||||
|
val result = future.handle { res, ex ->
|
||||||
|
if(ex != null) {
|
||||||
|
val err = ex.cause ?: ex
|
||||||
|
log.debug(err.message, err)
|
||||||
|
OperationOutcome.Failure(err)
|
||||||
|
} else {
|
||||||
|
OperationOutcome.Success(res)
|
||||||
|
}
|
||||||
|
}.get()
|
||||||
|
for ((index, attempt) in attempts.withIndex()) {
|
||||||
|
val (timestamp, value) = attempt
|
||||||
|
if (index > 0) {
|
||||||
|
/* Check the delay for subsequent attempts is correct */
|
||||||
|
val previousAttempt = attempts[index - 1]
|
||||||
|
val expectedTimestamp =
|
||||||
|
previousAttempt.first + testArgs.initialDelay * Math.pow(testArgs.exp, index.toDouble()) * 1e6
|
||||||
|
val actualTimestamp = timestamp
|
||||||
|
val err = Math.abs(expectedTimestamp - actualTimestamp) / expectedTimestamp
|
||||||
|
Assertions.assertTrue(err < 1e-2)
|
||||||
|
}
|
||||||
|
if (index == attempts.size - 1 && index < testArgs.maxAttempt - 1) {
|
||||||
|
/*
|
||||||
|
* If the last attempt index is lower than the maximum number of attempts, then
|
||||||
|
* check the outcome handler returns DoNotRetry
|
||||||
|
*/
|
||||||
|
Assertions.assertTrue(outcomeHandler.shouldRetry(value) is OutcomeHandlerResult.DoNotRetry)
|
||||||
|
} else if (index < attempts.size - 1) {
|
||||||
|
/*
|
||||||
|
* If the attempt is not the last attempt check the outcome handler returns Retry
|
||||||
|
*/
|
||||||
|
Assertions.assertTrue(outcomeHandler.shouldRetry(value) is OutcomeHandlerResult.Retry)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -15,7 +15,7 @@
|
|||||||
<root level="info">
|
<root level="info">
|
||||||
<appender-ref ref="console"/>
|
<appender-ref ref="console"/>
|
||||||
</root>
|
</root>
|
||||||
<logger name="io.netty" level="debug"/>
|
<logger name="io.netty" level="info"/>
|
||||||
<logger name="com.google.code.yanf4j" level="warn"/>
|
<logger name="com.google.code.yanf4j" level="warn"/>
|
||||||
<logger name="net.rubyeye.xmemcached" level="warn"/>
|
<logger name="net.rubyeye.xmemcached" level="warn"/>
|
||||||
</configuration>
|
</configuration>
|
@@ -0,0 +1,16 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
|
<rbcs-client:profiles xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:rbcs-client="urn:net.woggioni.rbcs.client"
|
||||||
|
xs:schemaLocation="urn:net.woggioni.rbcs.client jms://net.woggioni.rbcs.client/net/woggioni/rbcs/client/schema/rbcs-client.xsd"
|
||||||
|
>
|
||||||
|
<profile name="profile1" base-url="https://rbcs1.example.com/">
|
||||||
|
<tls-client-auth
|
||||||
|
key-store-file="keystore.pfx"
|
||||||
|
key-store-password="password"
|
||||||
|
key-alias="woggioni@c962475fa38"
|
||||||
|
key-password="key-password"/>
|
||||||
|
</profile>
|
||||||
|
<profile name="profile2" base-url="https://rbcs2.example.com/">
|
||||||
|
<basic-auth user="user" password="password"/>
|
||||||
|
</profile>
|
||||||
|
</rbcs-client:profiles>
|
@@ -6,8 +6,10 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly project(':gbcs-api')
|
implementation project(':rbcs-api')
|
||||||
compileOnly catalog.slf4j.api
|
implementation catalog.slf4j.api
|
||||||
|
implementation catalog.jwo
|
||||||
|
implementation catalog.netty.buffer
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
11
rbcs-common/src/main/java/module-info.java
Normal file
11
rbcs-common/src/main/java/module-info.java
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
module net.woggioni.rbcs.common {
|
||||||
|
requires java.xml;
|
||||||
|
requires java.logging;
|
||||||
|
requires org.slf4j;
|
||||||
|
requires kotlin.stdlib;
|
||||||
|
requires net.woggioni.jwo;
|
||||||
|
requires io.netty.buffer;
|
||||||
|
|
||||||
|
provides java.net.spi.URLStreamHandlerProvider with net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory;
|
||||||
|
exports net.woggioni.rbcs.common;
|
||||||
|
}
|
@@ -0,0 +1,25 @@
|
|||||||
|
package net.woggioni.rbcs.common
|
||||||
|
|
||||||
|
import io.netty.buffer.ByteBuf
|
||||||
|
import java.io.InputStream
|
||||||
|
|
||||||
|
class ByteBufInputStream(private val buf : ByteBuf) : InputStream() {
|
||||||
|
override fun read(): Int {
|
||||||
|
return buf.takeIf {
|
||||||
|
it.readableBytes() > 0
|
||||||
|
}?.let(ByteBuf::readByte)
|
||||||
|
?.let(Byte::toInt) ?: -1
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun read(b: ByteArray, off: Int, len: Int): Int {
|
||||||
|
val readableBytes = buf.readableBytes()
|
||||||
|
if(readableBytes == 0) return -1
|
||||||
|
val result = len.coerceAtMost(readableBytes)
|
||||||
|
buf.readBytes(b, off, result)
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun close() {
|
||||||
|
buf.release()
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,18 @@
|
|||||||
|
package net.woggioni.rbcs.common
|
||||||
|
|
||||||
|
import io.netty.buffer.ByteBuf
|
||||||
|
import java.io.OutputStream
|
||||||
|
|
||||||
|
class ByteBufOutputStream(private val buf : ByteBuf) : OutputStream() {
|
||||||
|
override fun write(b: Int) {
|
||||||
|
buf.writeByte(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun write(b: ByteArray, off: Int, len: Int) {
|
||||||
|
buf.writeBytes(b, off, len)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun close() {
|
||||||
|
buf.release()
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,7 @@
|
|||||||
|
package net.woggioni.rbcs.common
|
||||||
|
|
||||||
|
class ResourceNotFoundException(msg : String? = null, cause: Throwable? = null) : RuntimeException(msg, cause) {
|
||||||
|
}
|
||||||
|
|
||||||
|
class ModuleNotFoundException(msg : String? = null, cause: Throwable? = null) : RuntimeException(msg, cause) {
|
||||||
|
}
|
@@ -1,4 +1,4 @@
|
|||||||
package net.woggioni.gbcs.base
|
package net.woggioni.rbcs.common
|
||||||
|
|
||||||
|
|
||||||
data class HostAndPort(val host: String, val port: Int = 0) {
|
data class HostAndPort(val host: String, val port: Int = 0) {
|
@@ -1,7 +1,8 @@
|
|||||||
package net.woggioni.gbcs.base
|
package net.woggioni.rbcs.common
|
||||||
|
|
||||||
import org.slf4j.Logger
|
import org.slf4j.Logger
|
||||||
import org.slf4j.LoggerFactory
|
import org.slf4j.LoggerFactory
|
||||||
|
import org.slf4j.event.Level
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import java.util.logging.LogManager
|
import java.util.logging.LogManager
|
||||||
@@ -52,6 +53,12 @@ inline fun log(log : Logger,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline fun Logger.log(level : Level, messageBuilder : () -> String) {
|
||||||
|
if(isEnabledForLevel(level)) {
|
||||||
|
makeLoggingEventBuilder(level).log(messageBuilder())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
inline fun Logger.trace(messageBuilder : () -> String) {
|
inline fun Logger.trace(messageBuilder : () -> String) {
|
||||||
if(isTraceEnabled) {
|
if(isTraceEnabled) {
|
||||||
trace(messageBuilder())
|
trace(messageBuilder())
|
@@ -1,4 +1,4 @@
|
|||||||
package net.woggioni.gbcs.base
|
package net.woggioni.rbcs.common
|
||||||
|
|
||||||
import java.security.SecureRandom
|
import java.security.SecureRandom
|
||||||
import java.security.spec.KeySpec
|
import java.security.spec.KeySpec
|
47
rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RBCS.kt
Normal file
47
rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RBCS.kt
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
package net.woggioni.rbcs.common
|
||||||
|
|
||||||
|
import net.woggioni.jwo.JWO
|
||||||
|
import java.net.URI
|
||||||
|
import java.net.URL
|
||||||
|
import java.security.MessageDigest
|
||||||
|
|
||||||
|
object RBCS {
|
||||||
|
fun String.toUrl() : URL = URL.of(URI(this), null)
|
||||||
|
|
||||||
|
const val RBCS_NAMESPACE_URI: String = "urn:net.woggioni.rbcs.server"
|
||||||
|
const val RBCS_PREFIX: String = "rbcs"
|
||||||
|
const val XML_SCHEMA_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
|
||||||
|
fun ByteArray.toInt(index : Int = 0) : Long {
|
||||||
|
if(index + 4 > size) throw IllegalArgumentException("Not enough bytes to decode a 32 bits integer")
|
||||||
|
var value : Long = 0
|
||||||
|
for (b in index until index + 4) {
|
||||||
|
value = (value shl 8) + (get(b).toInt() and 0xFF)
|
||||||
|
}
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
|
||||||
|
fun ByteArray.toLong(index : Int = 0) : Long {
|
||||||
|
if(index + 8 > size) throw IllegalArgumentException("Not enough bytes to decode a 64 bits long integer")
|
||||||
|
var value : Long = 0
|
||||||
|
for (b in index until index + 8) {
|
||||||
|
value = (value shl 8) + (get(b).toInt() and 0xFF)
|
||||||
|
}
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
|
||||||
|
fun digest(
|
||||||
|
data: ByteArray,
|
||||||
|
md: MessageDigest = MessageDigest.getInstance("MD5")
|
||||||
|
): ByteArray {
|
||||||
|
md.update(data)
|
||||||
|
return md.digest()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun digestString(
|
||||||
|
data: ByteArray,
|
||||||
|
md: MessageDigest = MessageDigest.getInstance("MD5")
|
||||||
|
): String {
|
||||||
|
return JWO.bytesToHex(digest(data, md))
|
||||||
|
}
|
||||||
|
}
|
@@ -1,19 +1,18 @@
|
|||||||
package net.woggioni.gbcs.base
|
package net.woggioni.rbcs.common
|
||||||
|
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.io.InputStream
|
import java.io.InputStream
|
||||||
import java.net.URL
|
import java.net.URL
|
||||||
import java.net.URLConnection
|
import java.net.URLConnection
|
||||||
import java.net.URLStreamHandler
|
import java.net.URLStreamHandler
|
||||||
import java.net.URLStreamHandlerFactory
|
import java.net.spi.URLStreamHandlerProvider
|
||||||
import java.util.Optional
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean
|
import java.util.concurrent.atomic.AtomicBoolean
|
||||||
import java.util.stream.Collectors
|
import java.util.stream.Collectors
|
||||||
|
|
||||||
|
|
||||||
class GbcsUrlStreamHandlerFactory : URLStreamHandlerFactory {
|
class RbcsUrlStreamHandlerFactory : URLStreamHandlerProvider() {
|
||||||
|
|
||||||
private class ClasspathHandler(private val classLoader: ClassLoader = GbcsUrlStreamHandlerFactory::class.java.classLoader) :
|
private class ClasspathHandler(private val classLoader: ClassLoader = RbcsUrlStreamHandlerFactory::class.java.classLoader) :
|
||||||
URLStreamHandler() {
|
URLStreamHandler() {
|
||||||
|
|
||||||
override fun openConnection(u: URL): URLConnection? {
|
override fun openConnection(u: URL): URLConnection? {
|
||||||
@@ -36,13 +35,17 @@ class GbcsUrlStreamHandlerFactory : URLStreamHandlerFactory {
|
|||||||
private class JpmsHandler : URLStreamHandler() {
|
private class JpmsHandler : URLStreamHandler() {
|
||||||
|
|
||||||
override fun openConnection(u: URL): URLConnection {
|
override fun openConnection(u: URL): URLConnection {
|
||||||
|
val moduleName = u.host
|
||||||
val thisModule = javaClass.module
|
val thisModule = javaClass.module
|
||||||
val sourceModule = Optional.ofNullable(thisModule)
|
val sourceModule =
|
||||||
.map { obj: Module -> obj.layer }
|
thisModule
|
||||||
.flatMap { layer: ModuleLayer ->
|
?.let(Module::getLayer)
|
||||||
val moduleName = u.host
|
?.let { layer: ModuleLayer ->
|
||||||
layer.findModule(moduleName)
|
layer.findModule(moduleName).orElse(null)
|
||||||
}.orElse(thisModule)
|
} ?: if(thisModule.layer == null) {
|
||||||
|
thisModule
|
||||||
|
} else throw ModuleNotFoundException("Module '$moduleName' not found")
|
||||||
|
|
||||||
return JpmsResourceURLConnection(u, sourceModule)
|
return JpmsResourceURLConnection(u, sourceModule)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -53,7 +56,9 @@ class GbcsUrlStreamHandlerFactory : URLStreamHandlerFactory {
|
|||||||
|
|
||||||
@Throws(IOException::class)
|
@Throws(IOException::class)
|
||||||
override fun getInputStream(): InputStream {
|
override fun getInputStream(): InputStream {
|
||||||
return module.getResourceAsStream(getURL().path)
|
val resource = getURL().path
|
||||||
|
return module.getResourceAsStream(resource)
|
||||||
|
?: throw ResourceNotFoundException("Resource '$resource' not found in module '${module.name}'")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,12 +87,12 @@ class GbcsUrlStreamHandlerFactory : URLStreamHandlerFactory {
|
|||||||
private val installed = AtomicBoolean(false)
|
private val installed = AtomicBoolean(false)
|
||||||
fun install() {
|
fun install() {
|
||||||
if (!installed.getAndSet(true)) {
|
if (!installed.getAndSet(true)) {
|
||||||
URL.setURLStreamHandlerFactory(GbcsUrlStreamHandlerFactory())
|
URL.setURLStreamHandlerFactory(RbcsUrlStreamHandlerFactory())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private val packageMap: Map<String, List<Module>> by lazy {
|
private val packageMap: Map<String, List<Module>> by lazy {
|
||||||
GbcsUrlStreamHandlerFactory::class.java.module.layer
|
RbcsUrlStreamHandlerFactory::class.java.module.layer
|
||||||
.modules()
|
.modules()
|
||||||
.stream()
|
.stream()
|
||||||
.flatMap { m: Module ->
|
.flatMap { m: Module ->
|
@@ -1,6 +1,8 @@
|
|||||||
package net.woggioni.gbcs.base
|
package net.woggioni.rbcs.common
|
||||||
|
|
||||||
|
import net.woggioni.jwo.JWO
|
||||||
import org.slf4j.LoggerFactory
|
import org.slf4j.LoggerFactory
|
||||||
|
import org.slf4j.event.Level
|
||||||
import org.w3c.dom.Document
|
import org.w3c.dom.Document
|
||||||
import org.w3c.dom.Element
|
import org.w3c.dom.Element
|
||||||
import org.w3c.dom.Node
|
import org.w3c.dom.Node
|
||||||
@@ -80,31 +82,36 @@ class Xml(val doc: Document, val element: Element) {
|
|||||||
private val log = LoggerFactory.getLogger(ErrorHandler::class.java)
|
private val log = LoggerFactory.getLogger(ErrorHandler::class.java)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun warning(ex: SAXParseException) {
|
override fun warning(ex: SAXParseException)= err(ex, Level.WARN)
|
||||||
log.warn(
|
|
||||||
"Problem at {}:{}:{} parsing deployment configuration: {}",
|
|
||||||
fileURL, ex.lineNumber, ex.columnNumber, ex.message
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun error(ex: SAXParseException) {
|
private fun err(ex: SAXParseException, level: Level) {
|
||||||
log.error(
|
log.log(level) {
|
||||||
"Problem at {}:{}:{} parsing deployment configuration: {}",
|
"Problem at ${fileURL}:${ex.lineNumber}:${ex.columnNumber} parsing deployment configuration: ${ex.message}"
|
||||||
fileURL, ex.lineNumber, ex.columnNumber, ex.message
|
}
|
||||||
)
|
|
||||||
throw ex
|
throw ex
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun fatalError(ex: SAXParseException) {
|
override fun error(ex: SAXParseException) = err(ex, Level.ERROR)
|
||||||
log.error(
|
override fun fatalError(ex: SAXParseException) = err(ex, Level.ERROR)
|
||||||
"Problem at {}:{}:{} parsing deployment configuration: {}",
|
|
||||||
fileURL, ex.lineNumber, ex.columnNumber, ex.message
|
|
||||||
)
|
|
||||||
throw ex
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
private val dictMap: Map<String, Map<String, Any>> = sequenceOf(
|
||||||
|
"env" to System.getenv().asSequence().map { (k, v) -> k to (v as Any) }.toMap(),
|
||||||
|
"sys" to System.getProperties().asSequence().map { (k, v) -> k as String to (v as Any) }.toMap()
|
||||||
|
).toMap()
|
||||||
|
|
||||||
|
private fun renderConfigurationTemplate(template: String): String {
|
||||||
|
return JWO.renderTemplate(template, emptyMap(), dictMap).replace("$$", "$")
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Element.renderAttribute(name : String, namespaceURI: String? = null) = if(namespaceURI == null) {
|
||||||
|
getAttribute(name)
|
||||||
|
} else {
|
||||||
|
getAttributeNS(name, namespaceURI)
|
||||||
|
}.takeIf(String::isNotEmpty)?.let(Companion::renderConfigurationTemplate)
|
||||||
|
|
||||||
|
|
||||||
fun Element.asIterable() = Iterable { ElementIterator(this, null) }
|
fun Element.asIterable() = Iterable { ElementIterator(this, null) }
|
||||||
fun NodeList.asIterable() = Iterable { NodeListIterator(this) }
|
fun NodeList.asIterable() = Iterable { NodeListIterator(this) }
|
||||||
|
|
||||||
@@ -146,29 +153,29 @@ class Xml(val doc: Document, val element: Element) {
|
|||||||
dbf.isExpandEntityReferences = true
|
dbf.isExpandEntityReferences = true
|
||||||
dbf.isIgnoringComments = true
|
dbf.isIgnoringComments = true
|
||||||
dbf.isNamespaceAware = true
|
dbf.isNamespaceAware = true
|
||||||
dbf.isValidating = false
|
dbf.isValidating = schemaResourceURL == null
|
||||||
dbf.setFeature("http://apache.org/xml/features/validation/schema", true);
|
dbf.setFeature("http://apache.org/xml/features/validation/schema", true)
|
||||||
schemaResourceURL?.let {
|
schemaResourceURL?.let {
|
||||||
dbf.schema = getSchema(it)
|
dbf.schema = getSchema(it)
|
||||||
}
|
}
|
||||||
return dbf
|
return dbf
|
||||||
}
|
}
|
||||||
|
|
||||||
fun newDocumentBuilder(resource: URL, schemaResourceURL: URL?): DocumentBuilder {
|
fun newDocumentBuilder(resource: URL, schemaResourceURL: URL?): DocumentBuilder {
|
||||||
val db = newDocumentBuilderFactory(schemaResourceURL).newDocumentBuilder()
|
val db = newDocumentBuilderFactory(schemaResourceURL).newDocumentBuilder()
|
||||||
db.setErrorHandler(ErrorHandler(resource))
|
db.setErrorHandler(ErrorHandler(resource))
|
||||||
return db
|
return db
|
||||||
}
|
}
|
||||||
|
|
||||||
fun parseXmlResource(resource: URL, schemaResourceURL: URL?): Document {
|
fun parseXmlResource(resource: URL, schemaResourceURL: URL?): Document {
|
||||||
val db = newDocumentBuilder(resource, schemaResourceURL)
|
val db = newDocumentBuilder(resource, schemaResourceURL)
|
||||||
return resource.openStream().use(db::parse)
|
return resource.openStream().use(db::parse)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun parseXml(sourceURL : URL, sourceStream: InputStream? = null, schemaResourceURL: URL? = null): Document {
|
fun parseXml(sourceURL: URL, sourceStream: InputStream? = null, schemaResourceURL: URL? = null): Document {
|
||||||
val db = newDocumentBuilder(sourceURL, schemaResourceURL)
|
val db = newDocumentBuilder(sourceURL, schemaResourceURL)
|
||||||
return sourceStream?.let(db::parse) ?: sourceURL.openStream().use(db::parse)
|
return sourceStream?.let(db::parse) ?: sourceURL.openStream().use(db::parse)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun write(doc: Document, output: OutputStream) {
|
fun write(doc: Document, output: OutputStream) {
|
||||||
val transformerFactory = TransformerFactory.newInstance()
|
val transformerFactory = TransformerFactory.newInstance()
|
||||||
@@ -183,7 +190,12 @@ class Xml(val doc: Document, val element: Element) {
|
|||||||
transformer.transform(source, result)
|
transformer.transform(source, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun of(namespaceURI: String, qualifiedName: String, schemaResourceURL: URL? = null, cb: Xml.(el: Element) -> Unit): Document {
|
fun of(
|
||||||
|
namespaceURI: String,
|
||||||
|
qualifiedName: String,
|
||||||
|
schemaResourceURL: URL? = null,
|
||||||
|
cb: Xml.(el: Element) -> Unit
|
||||||
|
): Document {
|
||||||
val dbf = newDocumentBuilderFactory(schemaResourceURL)
|
val dbf = newDocumentBuilderFactory(schemaResourceURL)
|
||||||
val db = dbf.newDocumentBuilder()
|
val db = dbf.newDocumentBuilder()
|
||||||
val doc = db.newDocument()
|
val doc = db.newDocument()
|
||||||
@@ -207,7 +219,7 @@ class Xml(val doc: Document, val element: Element) {
|
|||||||
|
|
||||||
fun node(
|
fun node(
|
||||||
name: String,
|
name: String,
|
||||||
namespaceURI : String? = null,
|
namespaceURI: String? = null,
|
||||||
attrs: Map<String, String> = emptyMap(),
|
attrs: Map<String, String> = emptyMap(),
|
||||||
cb: Xml.(el: Element) -> Unit = {}
|
cb: Xml.(el: Element) -> Unit = {}
|
||||||
): Element {
|
): Element {
|
||||||
@@ -222,7 +234,7 @@ class Xml(val doc: Document, val element: Element) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun attr(key: String, value: String, namespaceURI : String? = null) {
|
fun attr(key: String, value: String, namespaceURI: String? = null) {
|
||||||
element.setAttributeNS(namespaceURI, key, value)
|
element.setAttributeNS(namespaceURI, key, value)
|
||||||
}
|
}
|
||||||
|
|
@@ -0,0 +1 @@
|
|||||||
|
net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory
|
@@ -1,6 +1,3 @@
|
|||||||
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'
|
id 'maven-publish'
|
||||||
@@ -9,10 +6,10 @@ plugins {
|
|||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
bundle {
|
bundle {
|
||||||
extendsFrom runtimeClasspath
|
|
||||||
canBeResolved = true
|
canBeResolved = true
|
||||||
canBeConsumed = false
|
canBeConsumed = false
|
||||||
visible = false
|
visible = false
|
||||||
|
transitive = false
|
||||||
|
|
||||||
resolutionStrategy {
|
resolutionStrategy {
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -32,10 +29,20 @@ configurations {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly project(':gbcs-base')
|
implementation project(':rbcs-common')
|
||||||
compileOnly project(':gbcs-api')
|
implementation project(':rbcs-api')
|
||||||
compileOnly catalog.jwo
|
implementation catalog.jwo
|
||||||
implementation catalog.xmemcached
|
implementation catalog.slf4j.api
|
||||||
|
implementation catalog.netty.common
|
||||||
|
implementation catalog.netty.codec.memcache
|
||||||
|
|
||||||
|
bundle catalog.netty.codec.memcache
|
||||||
|
|
||||||
|
testRuntimeOnly catalog.logback.classic
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named(JavaPlugin.TEST_TASK_NAME, Test) {
|
||||||
|
systemProperty("io.netty.leakDetectionLevel", "PARANOID")
|
||||||
}
|
}
|
||||||
|
|
||||||
Provider<Tar> bundleTask = tasks.register("bundle", Tar) {
|
Provider<Tar> bundleTask = tasks.register("bundle", Tar) {
|
19
rbcs-server-memcache/src/main/java/module-info.java
Normal file
19
rbcs-server-memcache/src/main/java/module-info.java
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import net.woggioni.rbcs.api.CacheProvider;
|
||||||
|
|
||||||
|
module net.woggioni.rbcs.server.memcache {
|
||||||
|
requires net.woggioni.rbcs.common;
|
||||||
|
requires net.woggioni.rbcs.api;
|
||||||
|
requires net.woggioni.jwo;
|
||||||
|
requires java.xml;
|
||||||
|
requires kotlin.stdlib;
|
||||||
|
requires io.netty.transport;
|
||||||
|
requires io.netty.codec;
|
||||||
|
requires io.netty.codec.memcache;
|
||||||
|
requires io.netty.common;
|
||||||
|
requires io.netty.buffer;
|
||||||
|
requires org.slf4j;
|
||||||
|
|
||||||
|
provides CacheProvider with net.woggioni.rbcs.server.memcache.MemcacheCacheProvider;
|
||||||
|
|
||||||
|
opens net.woggioni.rbcs.server.memcache.schema;
|
||||||
|
}
|
@@ -0,0 +1,4 @@
|
|||||||
|
package net.woggioni.rbcs.server.memcache
|
||||||
|
|
||||||
|
class MemcacheException(status : Short, msg : String? = null, cause : Throwable? = null)
|
||||||
|
: RuntimeException(msg ?: "Memcached status $status", cause)
|
@@ -0,0 +1,23 @@
|
|||||||
|
package net.woggioni.rbcs.server.memcache
|
||||||
|
|
||||||
|
import io.netty.buffer.ByteBuf
|
||||||
|
import net.woggioni.rbcs.api.Cache
|
||||||
|
import net.woggioni.rbcs.server.memcache.client.MemcacheClient
|
||||||
|
import java.nio.channels.ReadableByteChannel
|
||||||
|
import java.util.concurrent.CompletableFuture
|
||||||
|
|
||||||
|
class MemcacheCache(private val cfg : MemcacheCacheConfiguration) : Cache {
|
||||||
|
private val memcacheClient = MemcacheClient(cfg)
|
||||||
|
|
||||||
|
override fun get(key: String): CompletableFuture<ReadableByteChannel?> {
|
||||||
|
return memcacheClient.get(key)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun put(key: String, content: ByteBuf): CompletableFuture<Void> {
|
||||||
|
return memcacheClient.put(key, content, cfg.maxAge)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun close() {
|
||||||
|
memcacheClient.close()
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,40 @@
|
|||||||
|
package net.woggioni.rbcs.server.memcache
|
||||||
|
|
||||||
|
import net.woggioni.rbcs.api.Configuration
|
||||||
|
import net.woggioni.rbcs.common.HostAndPort
|
||||||
|
import java.time.Duration
|
||||||
|
|
||||||
|
data class MemcacheCacheConfiguration(
|
||||||
|
val servers: List<Server>,
|
||||||
|
val maxAge: Duration = Duration.ofDays(1),
|
||||||
|
val maxSize: Int = 0x100000,
|
||||||
|
val digestAlgorithm: String? = null,
|
||||||
|
val compressionMode: CompressionMode? = null,
|
||||||
|
) : Configuration.Cache {
|
||||||
|
|
||||||
|
enum class CompressionMode {
|
||||||
|
/**
|
||||||
|
* Gzip mode
|
||||||
|
*/
|
||||||
|
GZIP,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deflate mode
|
||||||
|
*/
|
||||||
|
DEFLATE
|
||||||
|
}
|
||||||
|
|
||||||
|
data class Server(
|
||||||
|
val endpoint : HostAndPort,
|
||||||
|
val connectionTimeoutMillis : Int?,
|
||||||
|
val maxConnections : Int
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
override fun materialize() = MemcacheCache(this)
|
||||||
|
|
||||||
|
override fun getNamespaceURI() = "urn:net.woggioni.rbcs.server.memcache"
|
||||||
|
|
||||||
|
override fun getTypeName() = "memcacheCacheType"
|
||||||
|
}
|
||||||
|
|
@@ -0,0 +1,101 @@
|
|||||||
|
package net.woggioni.rbcs.server.memcache
|
||||||
|
|
||||||
|
import net.woggioni.rbcs.api.CacheProvider
|
||||||
|
import net.woggioni.rbcs.api.exception.ConfigurationException
|
||||||
|
import net.woggioni.rbcs.common.RBCS
|
||||||
|
import net.woggioni.rbcs.common.HostAndPort
|
||||||
|
import net.woggioni.rbcs.common.Xml
|
||||||
|
import net.woggioni.rbcs.common.Xml.Companion.asIterable
|
||||||
|
import net.woggioni.rbcs.common.Xml.Companion.renderAttribute
|
||||||
|
import org.w3c.dom.Document
|
||||||
|
import org.w3c.dom.Element
|
||||||
|
import java.time.Duration
|
||||||
|
import java.time.temporal.ChronoUnit
|
||||||
|
|
||||||
|
|
||||||
|
class MemcacheCacheProvider : CacheProvider<MemcacheCacheConfiguration> {
|
||||||
|
override fun getXmlSchemaLocation() = "jpms://net.woggioni.rbcs.server.memcache/net/woggioni/rbcs/server/memcache/schema/rbcs-memcache.xsd"
|
||||||
|
|
||||||
|
override fun getXmlType() = "memcacheCacheType"
|
||||||
|
|
||||||
|
override fun getXmlNamespace() = "urn:net.woggioni.rbcs.server.memcache"
|
||||||
|
|
||||||
|
val xmlNamespacePrefix : String
|
||||||
|
get() = "rbcs-memcache"
|
||||||
|
|
||||||
|
override fun deserialize(el: Element): MemcacheCacheConfiguration {
|
||||||
|
val servers = mutableListOf<MemcacheCacheConfiguration.Server>()
|
||||||
|
val maxAge = el.renderAttribute("max-age")
|
||||||
|
?.let(Duration::parse)
|
||||||
|
?: Duration.ofDays(1)
|
||||||
|
val maxSize = el.renderAttribute("max-size")
|
||||||
|
?.let(String::toInt)
|
||||||
|
?: 0x100000
|
||||||
|
val compressionMode = el.renderAttribute("compression-mode")
|
||||||
|
?.let {
|
||||||
|
when (it) {
|
||||||
|
"gzip" -> MemcacheCacheConfiguration.CompressionMode.GZIP
|
||||||
|
"deflate" -> MemcacheCacheConfiguration.CompressionMode.DEFLATE
|
||||||
|
else -> MemcacheCacheConfiguration.CompressionMode.DEFLATE
|
||||||
|
}
|
||||||
|
}
|
||||||
|
?: MemcacheCacheConfiguration.CompressionMode.DEFLATE
|
||||||
|
val digestAlgorithm = el.renderAttribute("digest")
|
||||||
|
for (child in el.asIterable()) {
|
||||||
|
when (child.nodeName) {
|
||||||
|
"server" -> {
|
||||||
|
val host = child.renderAttribute("host") ?: throw ConfigurationException("host attribute is required")
|
||||||
|
val port = child.renderAttribute("port")?.toInt() ?: throw ConfigurationException("port attribute is required")
|
||||||
|
val maxConnections = child.renderAttribute("max-connections")?.toInt() ?: 1
|
||||||
|
val connectionTimeout = child.renderAttribute("connection-timeout")
|
||||||
|
?.let(Duration::parse)
|
||||||
|
?.let(Duration::toMillis)
|
||||||
|
?.let(Long::toInt)
|
||||||
|
?: 10000
|
||||||
|
servers.add(MemcacheCacheConfiguration.Server(HostAndPort(host, port), connectionTimeout, maxConnections))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return MemcacheCacheConfiguration(
|
||||||
|
servers,
|
||||||
|
maxAge,
|
||||||
|
maxSize,
|
||||||
|
digestAlgorithm,
|
||||||
|
compressionMode,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun serialize(doc: Document, cache: MemcacheCacheConfiguration) = cache.run {
|
||||||
|
val result = doc.createElement("cache")
|
||||||
|
Xml.of(doc, result) {
|
||||||
|
attr("xmlns:${xmlNamespacePrefix}", xmlNamespace, namespaceURI = "http://www.w3.org/2000/xmlns/")
|
||||||
|
|
||||||
|
attr("xs:type", "${xmlNamespacePrefix}:$xmlType", RBCS.XML_SCHEMA_NAMESPACE_URI)
|
||||||
|
for (server in servers) {
|
||||||
|
node("server") {
|
||||||
|
attr("host", server.endpoint.host)
|
||||||
|
attr("port", server.endpoint.port.toString())
|
||||||
|
server.connectionTimeoutMillis?.let { connectionTimeoutMillis ->
|
||||||
|
attr("connection-timeout", Duration.of(connectionTimeoutMillis.toLong(), ChronoUnit.MILLIS).toString())
|
||||||
|
}
|
||||||
|
attr("max-connections", server.maxConnections.toString())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
attr("max-age", maxAge.toString())
|
||||||
|
attr("max-size", maxSize.toString())
|
||||||
|
digestAlgorithm?.let { digestAlgorithm ->
|
||||||
|
attr("digest", digestAlgorithm)
|
||||||
|
}
|
||||||
|
compressionMode?.let { compressionMode ->
|
||||||
|
attr(
|
||||||
|
"compression-mode", when (compressionMode) {
|
||||||
|
MemcacheCacheConfiguration.CompressionMode.GZIP -> "gzip"
|
||||||
|
MemcacheCacheConfiguration.CompressionMode.DEFLATE -> "deflate"
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,257 @@
|
|||||||
|
package net.woggioni.rbcs.server.memcache.client
|
||||||
|
|
||||||
|
|
||||||
|
import io.netty.bootstrap.Bootstrap
|
||||||
|
import io.netty.buffer.ByteBuf
|
||||||
|
import io.netty.buffer.Unpooled
|
||||||
|
import io.netty.channel.Channel
|
||||||
|
import io.netty.channel.ChannelHandlerContext
|
||||||
|
import io.netty.channel.ChannelOption
|
||||||
|
import io.netty.channel.ChannelPipeline
|
||||||
|
import io.netty.channel.SimpleChannelInboundHandler
|
||||||
|
import io.netty.channel.nio.NioEventLoopGroup
|
||||||
|
import io.netty.channel.pool.AbstractChannelPoolHandler
|
||||||
|
import io.netty.channel.pool.ChannelPool
|
||||||
|
import io.netty.channel.pool.FixedChannelPool
|
||||||
|
import io.netty.channel.socket.nio.NioSocketChannel
|
||||||
|
import io.netty.handler.codec.DecoderException
|
||||||
|
import io.netty.handler.codec.memcache.binary.BinaryMemcacheClientCodec
|
||||||
|
import io.netty.handler.codec.memcache.binary.BinaryMemcacheObjectAggregator
|
||||||
|
import io.netty.handler.codec.memcache.binary.BinaryMemcacheOpcodes
|
||||||
|
import io.netty.handler.codec.memcache.binary.BinaryMemcacheResponseStatus
|
||||||
|
import io.netty.handler.codec.memcache.binary.DefaultFullBinaryMemcacheRequest
|
||||||
|
import io.netty.handler.codec.memcache.binary.FullBinaryMemcacheRequest
|
||||||
|
import io.netty.handler.codec.memcache.binary.FullBinaryMemcacheResponse
|
||||||
|
import io.netty.util.concurrent.GenericFutureListener
|
||||||
|
import net.woggioni.rbcs.common.ByteBufInputStream
|
||||||
|
import net.woggioni.rbcs.common.ByteBufOutputStream
|
||||||
|
import net.woggioni.rbcs.common.RBCS.digest
|
||||||
|
import net.woggioni.rbcs.common.HostAndPort
|
||||||
|
import net.woggioni.rbcs.common.contextLogger
|
||||||
|
import net.woggioni.rbcs.server.memcache.MemcacheCacheConfiguration
|
||||||
|
import net.woggioni.rbcs.server.memcache.MemcacheException
|
||||||
|
import net.woggioni.jwo.JWO
|
||||||
|
import java.net.InetSocketAddress
|
||||||
|
import java.nio.channels.Channels
|
||||||
|
import java.nio.channels.ReadableByteChannel
|
||||||
|
import java.security.MessageDigest
|
||||||
|
import java.time.Duration
|
||||||
|
import java.time.Instant
|
||||||
|
import java.util.concurrent.CompletableFuture
|
||||||
|
import java.util.concurrent.ConcurrentHashMap
|
||||||
|
import java.util.zip.Deflater
|
||||||
|
import java.util.zip.DeflaterOutputStream
|
||||||
|
import java.util.zip.GZIPInputStream
|
||||||
|
import java.util.zip.GZIPOutputStream
|
||||||
|
import java.util.zip.InflaterInputStream
|
||||||
|
import io.netty.util.concurrent.Future as NettyFuture
|
||||||
|
|
||||||
|
|
||||||
|
class MemcacheClient(private val cfg: MemcacheCacheConfiguration) : AutoCloseable {
|
||||||
|
|
||||||
|
private companion object {
|
||||||
|
@JvmStatic
|
||||||
|
private val log = contextLogger()
|
||||||
|
}
|
||||||
|
|
||||||
|
private val group: NioEventLoopGroup
|
||||||
|
private val connectionPool: MutableMap<HostAndPort, ChannelPool> = ConcurrentHashMap()
|
||||||
|
|
||||||
|
init {
|
||||||
|
group = NioEventLoopGroup()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun newConnectionPool(server: MemcacheCacheConfiguration.Server): FixedChannelPool {
|
||||||
|
val bootstrap = Bootstrap().apply {
|
||||||
|
group(group)
|
||||||
|
channel(NioSocketChannel::class.java)
|
||||||
|
option(ChannelOption.SO_KEEPALIVE, true)
|
||||||
|
remoteAddress(InetSocketAddress(server.endpoint.host, server.endpoint.port))
|
||||||
|
server.connectionTimeoutMillis?.let {
|
||||||
|
option(ChannelOption.CONNECT_TIMEOUT_MILLIS, it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val channelPoolHandler = object : AbstractChannelPoolHandler() {
|
||||||
|
|
||||||
|
override fun channelCreated(ch: Channel) {
|
||||||
|
val pipeline: ChannelPipeline = ch.pipeline()
|
||||||
|
pipeline.addLast(BinaryMemcacheClientCodec())
|
||||||
|
pipeline.addLast(BinaryMemcacheObjectAggregator(cfg.maxSize))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return FixedChannelPool(bootstrap, channelPoolHandler, server.maxConnections)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private fun sendRequest(request: FullBinaryMemcacheRequest): CompletableFuture<FullBinaryMemcacheResponse> {
|
||||||
|
|
||||||
|
val server = cfg.servers.let { servers ->
|
||||||
|
if (servers.size > 1) {
|
||||||
|
val key = request.key().duplicate()
|
||||||
|
var checksum = 0
|
||||||
|
while (key.readableBytes() > 4) {
|
||||||
|
val byte = key.readInt()
|
||||||
|
checksum = checksum xor byte
|
||||||
|
}
|
||||||
|
while (key.readableBytes() > 0) {
|
||||||
|
val byte = key.readByte()
|
||||||
|
checksum = checksum xor byte.toInt()
|
||||||
|
}
|
||||||
|
servers[checksum % servers.size]
|
||||||
|
} else {
|
||||||
|
servers.first()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val response = CompletableFuture<FullBinaryMemcacheResponse>()
|
||||||
|
// Custom handler for processing responses
|
||||||
|
val pool = connectionPool.computeIfAbsent(server.endpoint) {
|
||||||
|
newConnectionPool(server)
|
||||||
|
}
|
||||||
|
pool.acquire().addListener(object : GenericFutureListener<NettyFuture<Channel>> {
|
||||||
|
override fun operationComplete(channelFuture: NettyFuture<Channel>) {
|
||||||
|
if (channelFuture.isSuccess) {
|
||||||
|
val channel = channelFuture.now
|
||||||
|
val pipeline = channel.pipeline()
|
||||||
|
channel.pipeline()
|
||||||
|
.addLast("client-handler", object : SimpleChannelInboundHandler<FullBinaryMemcacheResponse>() {
|
||||||
|
override fun channelRead0(
|
||||||
|
ctx: ChannelHandlerContext,
|
||||||
|
msg: FullBinaryMemcacheResponse
|
||||||
|
) {
|
||||||
|
pipeline.removeLast()
|
||||||
|
pool.release(channel)
|
||||||
|
msg.touch("The method's caller must remember to release this")
|
||||||
|
response.complete(msg.retain())
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable) {
|
||||||
|
val ex = when (cause) {
|
||||||
|
is DecoderException -> cause.cause!!
|
||||||
|
else -> cause
|
||||||
|
}
|
||||||
|
ctx.close()
|
||||||
|
pipeline.removeLast()
|
||||||
|
pool.release(channel)
|
||||||
|
response.completeExceptionally(ex)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
request.touch()
|
||||||
|
channel.writeAndFlush(request)
|
||||||
|
} else {
|
||||||
|
response.completeExceptionally(channelFuture.cause())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun encodeExpiry(expiry: Duration): Int {
|
||||||
|
val expirySeconds = expiry.toSeconds()
|
||||||
|
return expirySeconds.toInt().takeIf { it.toLong() == expirySeconds }
|
||||||
|
?: Instant.ofEpochSecond(expirySeconds).epochSecond.toInt()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun get(key: String): CompletableFuture<ReadableByteChannel?> {
|
||||||
|
val request = (cfg.digestAlgorithm
|
||||||
|
?.let(MessageDigest::getInstance)
|
||||||
|
?.let { md ->
|
||||||
|
digest(key.toByteArray(), md)
|
||||||
|
} ?: key.toByteArray(Charsets.UTF_8)).let { digest ->
|
||||||
|
DefaultFullBinaryMemcacheRequest(Unpooled.wrappedBuffer(digest), null).apply {
|
||||||
|
setOpcode(BinaryMemcacheOpcodes.GET)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sendRequest(request).thenApply { response ->
|
||||||
|
try {
|
||||||
|
when (val status = response.status()) {
|
||||||
|
BinaryMemcacheResponseStatus.SUCCESS -> {
|
||||||
|
val compressionMode = cfg.compressionMode
|
||||||
|
val content = response.content().retain()
|
||||||
|
content.touch()
|
||||||
|
if (compressionMode != null) {
|
||||||
|
when (compressionMode) {
|
||||||
|
MemcacheCacheConfiguration.CompressionMode.GZIP -> {
|
||||||
|
GZIPInputStream(ByteBufInputStream(content))
|
||||||
|
}
|
||||||
|
|
||||||
|
MemcacheCacheConfiguration.CompressionMode.DEFLATE -> {
|
||||||
|
InflaterInputStream(ByteBufInputStream(content))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ByteBufInputStream(content)
|
||||||
|
}.let(Channels::newChannel)
|
||||||
|
}
|
||||||
|
|
||||||
|
BinaryMemcacheResponseStatus.KEY_ENOENT -> {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> throw MemcacheException(status)
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
response.release()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun put(key: String, content: ByteBuf, expiry: Duration, cas: Long? = null): CompletableFuture<Void> {
|
||||||
|
val request = (cfg.digestAlgorithm
|
||||||
|
?.let(MessageDigest::getInstance)
|
||||||
|
?.let { md ->
|
||||||
|
digest(key.toByteArray(), md)
|
||||||
|
} ?: key.toByteArray(Charsets.UTF_8)).let { digest ->
|
||||||
|
val extras = Unpooled.buffer(8, 8)
|
||||||
|
extras.writeInt(0)
|
||||||
|
extras.writeInt(encodeExpiry(expiry))
|
||||||
|
val compressionMode = cfg.compressionMode
|
||||||
|
content.retain()
|
||||||
|
val payload = if (compressionMode != null) {
|
||||||
|
val inputStream = ByteBufInputStream(content)
|
||||||
|
val buf = content.alloc().buffer()
|
||||||
|
buf.retain()
|
||||||
|
val outputStream = when (compressionMode) {
|
||||||
|
MemcacheCacheConfiguration.CompressionMode.GZIP -> {
|
||||||
|
GZIPOutputStream(ByteBufOutputStream(buf))
|
||||||
|
}
|
||||||
|
|
||||||
|
MemcacheCacheConfiguration.CompressionMode.DEFLATE -> {
|
||||||
|
DeflaterOutputStream(ByteBufOutputStream(buf), Deflater(Deflater.DEFAULT_COMPRESSION, false))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
inputStream.use { i ->
|
||||||
|
outputStream.use { o ->
|
||||||
|
JWO.copy(i, o)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
buf
|
||||||
|
} else {
|
||||||
|
content
|
||||||
|
}
|
||||||
|
DefaultFullBinaryMemcacheRequest(Unpooled.wrappedBuffer(digest), extras, payload).apply {
|
||||||
|
setOpcode(BinaryMemcacheOpcodes.SET)
|
||||||
|
cas?.let(this::setCas)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sendRequest(request).thenApply { response ->
|
||||||
|
try {
|
||||||
|
when (val status = response.status()) {
|
||||||
|
BinaryMemcacheResponseStatus.SUCCESS -> null
|
||||||
|
else -> throw MemcacheException(status)
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
response.release()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
fun shutDown(): NettyFuture<*> {
|
||||||
|
return group.shutdownGracefully()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun close() {
|
||||||
|
shutDown().sync()
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1 @@
|
|||||||
|
net.woggioni.rbcs.server.memcache.MemcacheCacheProvider
|
@@ -0,0 +1,37 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
|
<xs:schema targetNamespace="urn:net.woggioni.rbcs.server.memcache"
|
||||||
|
xmlns:rbcs-memcache="urn:net.woggioni.rbcs.server.memcache"
|
||||||
|
xmlns:rbcs="urn:net.woggioni.rbcs.server"
|
||||||
|
xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
||||||
|
|
||||||
|
<xs:import schemaLocation="jpms://net.woggioni.rbcs.server/net/woggioni/rbcs/server/schema/rbcs.xsd" namespace="urn:net.woggioni.rbcs.server"/>
|
||||||
|
|
||||||
|
<xs:complexType name="memcacheServerType">
|
||||||
|
<xs:attribute name="host" type="xs:token" use="required"/>
|
||||||
|
<xs:attribute name="port" type="xs:positiveInteger" use="required"/>
|
||||||
|
<xs:attribute name="connection-timeout" type="xs:duration"/>
|
||||||
|
<xs:attribute name="max-connections" type="xs:positiveInteger" default="1"/>
|
||||||
|
</xs:complexType>
|
||||||
|
|
||||||
|
<xs:complexType name="memcacheCacheType">
|
||||||
|
<xs:complexContent>
|
||||||
|
<xs:extension base="rbcs:cacheType">
|
||||||
|
<xs:sequence maxOccurs="unbounded">
|
||||||
|
<xs:element name="server" type="rbcs-memcache:memcacheServerType"/>
|
||||||
|
</xs:sequence>
|
||||||
|
<xs:attribute name="max-age" type="xs:duration" default="P1D"/>
|
||||||
|
<xs:attribute name="max-size" type="xs:unsignedInt" default="1048576"/>
|
||||||
|
<xs:attribute name="digest" type="xs:token" />
|
||||||
|
<xs:attribute name="compression-mode" type="rbcs-memcache:compressionType"/>
|
||||||
|
</xs:extension>
|
||||||
|
</xs:complexContent>
|
||||||
|
</xs:complexType>
|
||||||
|
|
||||||
|
<xs:simpleType name="compressionType">
|
||||||
|
<xs:restriction base="xs:token">
|
||||||
|
<xs:enumeration value="deflate"/>
|
||||||
|
<xs:enumeration value="gzip"/>
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
|
||||||
|
</xs:schema>
|
42
rbcs-server/build.gradle
Normal file
42
rbcs-server/build.gradle
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
alias catalog.plugins.kotlin.jvm
|
||||||
|
id 'jacoco'
|
||||||
|
id 'maven-publish'
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation catalog.jwo
|
||||||
|
implementation catalog.slf4j.api
|
||||||
|
implementation catalog.netty.codec.http
|
||||||
|
implementation catalog.netty.handler
|
||||||
|
implementation catalog.netty.buffer
|
||||||
|
implementation catalog.netty.transport
|
||||||
|
|
||||||
|
api project(':rbcs-common')
|
||||||
|
api project(':rbcs-api')
|
||||||
|
|
||||||
|
// runtimeOnly catalog.slf4j.jdk14
|
||||||
|
testRuntimeOnly catalog.logback.classic
|
||||||
|
|
||||||
|
testImplementation catalog.bcprov.jdk18on
|
||||||
|
testImplementation catalog.bcpkix.jdk18on
|
||||||
|
|
||||||
|
testRuntimeOnly project(":rbcs-server-memcache")
|
||||||
|
}
|
||||||
|
|
||||||
|
test {
|
||||||
|
systemProperty("io.netty.leakDetectionLevel", "PARANOID")
|
||||||
|
systemProperty("jdk.httpclient.redirects.retrylimit", "1")
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
maven(MavenPublication) {
|
||||||
|
from(components["java"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
29
rbcs-server/src/main/java/module-info.java
Normal file
29
rbcs-server/src/main/java/module-info.java
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import net.woggioni.rbcs.api.CacheProvider;
|
||||||
|
import net.woggioni.rbcs.server.cache.FileSystemCacheProvider;
|
||||||
|
import net.woggioni.rbcs.server.cache.InMemoryCacheProvider;
|
||||||
|
|
||||||
|
module net.woggioni.rbcs.server {
|
||||||
|
requires java.sql;
|
||||||
|
requires java.xml;
|
||||||
|
requires java.logging;
|
||||||
|
requires java.naming;
|
||||||
|
requires kotlin.stdlib;
|
||||||
|
requires io.netty.buffer;
|
||||||
|
requires io.netty.transport;
|
||||||
|
requires io.netty.codec.http;
|
||||||
|
requires io.netty.common;
|
||||||
|
requires io.netty.handler;
|
||||||
|
requires io.netty.codec;
|
||||||
|
requires org.slf4j;
|
||||||
|
requires net.woggioni.jwo;
|
||||||
|
requires net.woggioni.rbcs.common;
|
||||||
|
requires net.woggioni.rbcs.api;
|
||||||
|
|
||||||
|
exports net.woggioni.rbcs.server;
|
||||||
|
|
||||||
|
opens net.woggioni.rbcs.server;
|
||||||
|
opens net.woggioni.rbcs.server.schema;
|
||||||
|
|
||||||
|
uses CacheProvider;
|
||||||
|
provides CacheProvider with FileSystemCacheProvider, InMemoryCacheProvider;
|
||||||
|
}
|
@@ -1,4 +1,4 @@
|
|||||||
package net.woggioni.gbcs
|
package net.woggioni.rbcs.server
|
||||||
|
|
||||||
import io.netty.channel.ChannelHandlerContext
|
import io.netty.channel.ChannelHandlerContext
|
||||||
import org.slf4j.Logger
|
import org.slf4j.Logger
|
@@ -0,0 +1,454 @@
|
|||||||
|
package net.woggioni.rbcs.server
|
||||||
|
|
||||||
|
import io.netty.bootstrap.ServerBootstrap
|
||||||
|
import io.netty.buffer.ByteBuf
|
||||||
|
import io.netty.channel.Channel
|
||||||
|
import io.netty.channel.ChannelFuture
|
||||||
|
import io.netty.channel.ChannelHandler.Sharable
|
||||||
|
import io.netty.channel.ChannelHandlerContext
|
||||||
|
import io.netty.channel.ChannelInboundHandlerAdapter
|
||||||
|
import io.netty.channel.ChannelInitializer
|
||||||
|
import io.netty.channel.ChannelOption
|
||||||
|
import io.netty.channel.ChannelPromise
|
||||||
|
import io.netty.channel.nio.NioEventLoopGroup
|
||||||
|
import io.netty.channel.socket.nio.NioServerSocketChannel
|
||||||
|
import io.netty.handler.codec.compression.CompressionOptions
|
||||||
|
import io.netty.handler.codec.http.DefaultHttpContent
|
||||||
|
import io.netty.handler.codec.http.HttpContentCompressor
|
||||||
|
import io.netty.handler.codec.http.HttpHeaderNames
|
||||||
|
import io.netty.handler.codec.http.HttpObjectAggregator
|
||||||
|
import io.netty.handler.codec.http.HttpRequest
|
||||||
|
import io.netty.handler.codec.http.HttpServerCodec
|
||||||
|
import io.netty.handler.ssl.ClientAuth
|
||||||
|
import io.netty.handler.ssl.SslContext
|
||||||
|
import io.netty.handler.ssl.SslContextBuilder
|
||||||
|
import io.netty.handler.ssl.SslHandler
|
||||||
|
import io.netty.handler.stream.ChunkedWriteHandler
|
||||||
|
import io.netty.handler.timeout.IdleState
|
||||||
|
import io.netty.handler.timeout.IdleStateEvent
|
||||||
|
import io.netty.handler.timeout.IdleStateHandler
|
||||||
|
import io.netty.util.AttributeKey
|
||||||
|
import io.netty.util.concurrent.DefaultEventExecutorGroup
|
||||||
|
import io.netty.util.concurrent.EventExecutorGroup
|
||||||
|
import net.woggioni.jwo.JWO
|
||||||
|
import net.woggioni.jwo.Tuple2
|
||||||
|
import net.woggioni.rbcs.api.Configuration
|
||||||
|
import net.woggioni.rbcs.api.exception.ConfigurationException
|
||||||
|
import net.woggioni.rbcs.common.PasswordSecurity.decodePasswordHash
|
||||||
|
import net.woggioni.rbcs.common.PasswordSecurity.hashPassword
|
||||||
|
import net.woggioni.rbcs.common.RBCS.toUrl
|
||||||
|
import net.woggioni.rbcs.common.Xml
|
||||||
|
import net.woggioni.rbcs.common.contextLogger
|
||||||
|
import net.woggioni.rbcs.common.debug
|
||||||
|
import net.woggioni.rbcs.common.info
|
||||||
|
import net.woggioni.rbcs.server.auth.AbstractNettyHttpAuthenticator
|
||||||
|
import net.woggioni.rbcs.server.auth.Authorizer
|
||||||
|
import net.woggioni.rbcs.server.auth.ClientCertificateValidator
|
||||||
|
import net.woggioni.rbcs.server.auth.RoleAuthorizer
|
||||||
|
import net.woggioni.rbcs.server.configuration.Parser
|
||||||
|
import net.woggioni.rbcs.server.configuration.Serializer
|
||||||
|
import net.woggioni.rbcs.server.exception.ExceptionHandler
|
||||||
|
import net.woggioni.rbcs.server.handler.ServerHandler
|
||||||
|
import net.woggioni.rbcs.server.throttling.ThrottlingHandler
|
||||||
|
import java.io.OutputStream
|
||||||
|
import java.net.InetSocketAddress
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Path
|
||||||
|
import java.security.KeyStore
|
||||||
|
import java.security.PrivateKey
|
||||||
|
import java.security.cert.X509Certificate
|
||||||
|
import java.util.Arrays
|
||||||
|
import java.util.Base64
|
||||||
|
import java.util.concurrent.Future
|
||||||
|
import java.util.concurrent.TimeUnit
|
||||||
|
import java.util.regex.Matcher
|
||||||
|
import java.util.regex.Pattern
|
||||||
|
import javax.naming.ldap.LdapName
|
||||||
|
import javax.net.ssl.SSLPeerUnverifiedException
|
||||||
|
|
||||||
|
class RemoteBuildCacheServer(private val cfg: Configuration) {
|
||||||
|
private val log = contextLogger()
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
|
||||||
|
val userAttribute: AttributeKey<Configuration.User> = AttributeKey.valueOf("user")
|
||||||
|
val groupAttribute: AttributeKey<Set<Configuration.Group>> = AttributeKey.valueOf("group")
|
||||||
|
|
||||||
|
val DEFAULT_CONFIGURATION_URL by lazy { "classpath:net/woggioni/rbcs/server/rbcs-default.xml".toUrl() }
|
||||||
|
private const val SSL_HANDLER_NAME = "sslHandler"
|
||||||
|
|
||||||
|
fun loadConfiguration(configurationFile: Path): Configuration {
|
||||||
|
val doc = Files.newInputStream(configurationFile).use {
|
||||||
|
Xml.parseXml(configurationFile.toUri().toURL(), it)
|
||||||
|
}
|
||||||
|
return Parser.parse(doc)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun dumpConfiguration(conf: Configuration, outputStream: OutputStream) {
|
||||||
|
Xml.write(Serializer.serialize(conf), outputStream)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class HttpChunkContentCompressor(
|
||||||
|
threshold: Int,
|
||||||
|
vararg compressionOptions: CompressionOptions = emptyArray()
|
||||||
|
) : HttpContentCompressor(threshold, *compressionOptions) {
|
||||||
|
override fun write(ctx: ChannelHandlerContext, msg: Any, promise: ChannelPromise) {
|
||||||
|
var message: Any? = msg
|
||||||
|
if (message is ByteBuf) {
|
||||||
|
// convert ByteBuf to HttpContent to make it work with compression. This is needed as we use the
|
||||||
|
// ChunkedWriteHandler to send files when compression is enabled.
|
||||||
|
val buff = message
|
||||||
|
if (buff.isReadable) {
|
||||||
|
// We only encode non empty buffers, as empty buffers can be used for determining when
|
||||||
|
// the content has been flushed and it confuses the HttpContentCompressor
|
||||||
|
// if we let it go
|
||||||
|
message = DefaultHttpContent(buff)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
super.write(ctx, message, promise)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Sharable
|
||||||
|
private class ClientCertificateAuthenticator(
|
||||||
|
authorizer: Authorizer,
|
||||||
|
private val anonymousUserGroups: Set<Configuration.Group>?,
|
||||||
|
private val userExtractor: Configuration.UserExtractor?,
|
||||||
|
private val groupExtractor: Configuration.GroupExtractor?,
|
||||||
|
) : AbstractNettyHttpAuthenticator(authorizer) {
|
||||||
|
|
||||||
|
override fun authenticate(ctx: ChannelHandlerContext, req: HttpRequest): AuthenticationResult? {
|
||||||
|
return try {
|
||||||
|
val sslHandler = (ctx.pipeline().get(SSL_HANDLER_NAME) as? SslHandler)
|
||||||
|
?: throw ConfigurationException("Client certificate authentication cannot be used when TLS is disabled")
|
||||||
|
val sslEngine = sslHandler.engine()
|
||||||
|
sslEngine.session.peerCertificates.takeIf {
|
||||||
|
it.isNotEmpty()
|
||||||
|
}?.let { peerCertificates ->
|
||||||
|
val clientCertificate = peerCertificates.first() as X509Certificate
|
||||||
|
val user = userExtractor?.extract(clientCertificate)
|
||||||
|
val group = groupExtractor?.extract(clientCertificate)
|
||||||
|
val allGroups =
|
||||||
|
((user?.groups ?: emptySet()).asSequence() + sequenceOf(group).filterNotNull()).toSet()
|
||||||
|
AuthenticationResult(user, allGroups)
|
||||||
|
} ?: anonymousUserGroups?.let { AuthenticationResult(null, it) }
|
||||||
|
} catch (es: SSLPeerUnverifiedException) {
|
||||||
|
anonymousUserGroups?.let { AuthenticationResult(null, it) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Sharable
|
||||||
|
private class NettyHttpBasicAuthenticator(
|
||||||
|
private val users: Map<String, Configuration.User>, authorizer: Authorizer
|
||||||
|
) : AbstractNettyHttpAuthenticator(authorizer) {
|
||||||
|
private val log = contextLogger()
|
||||||
|
|
||||||
|
override fun authenticate(ctx: ChannelHandlerContext, req: HttpRequest): AuthenticationResult? {
|
||||||
|
val authorizationHeader = req.headers()[HttpHeaderNames.AUTHORIZATION] ?: let {
|
||||||
|
log.debug(ctx) {
|
||||||
|
"Missing Authorization header"
|
||||||
|
}
|
||||||
|
return users[""]?.let { AuthenticationResult(it, it.groups) }
|
||||||
|
}
|
||||||
|
val cursor = authorizationHeader.indexOf(' ')
|
||||||
|
if (cursor < 0) {
|
||||||
|
log.debug(ctx) {
|
||||||
|
"Invalid Authorization header: '$authorizationHeader'"
|
||||||
|
}
|
||||||
|
return users[""]?.let { AuthenticationResult(it, it.groups) }
|
||||||
|
}
|
||||||
|
val authenticationType = authorizationHeader.substring(0, cursor)
|
||||||
|
if ("Basic" != authenticationType) {
|
||||||
|
log.debug(ctx) {
|
||||||
|
"Invalid authentication type header: '$authenticationType'"
|
||||||
|
}
|
||||||
|
return users[""]?.let { AuthenticationResult(it, it.groups) }
|
||||||
|
}
|
||||||
|
val (username, password) = Base64.getDecoder().decode(authorizationHeader.substring(cursor + 1))
|
||||||
|
.let(::String)
|
||||||
|
.let {
|
||||||
|
val colon = it.indexOf(':')
|
||||||
|
if (colon < 0) {
|
||||||
|
log.debug(ctx) {
|
||||||
|
"Missing colon from authentication"
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
it.substring(0, colon) to it.substring(colon + 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
return username.let(users::get)?.takeIf { user ->
|
||||||
|
user.password?.let { passwordAndSalt ->
|
||||||
|
val (_, salt) = decodePasswordHash(passwordAndSalt)
|
||||||
|
hashPassword(password, Base64.getEncoder().encodeToString(salt)) == passwordAndSalt
|
||||||
|
} ?: false
|
||||||
|
}?.let { user ->
|
||||||
|
AuthenticationResult(user, user.groups)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ServerInitializer(
|
||||||
|
private val cfg: Configuration,
|
||||||
|
private val eventExecutorGroup: EventExecutorGroup
|
||||||
|
) : ChannelInitializer<Channel>(), AutoCloseable {
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private fun createSslCtx(tls: Configuration.Tls): SslContext {
|
||||||
|
val keyStore = tls.keyStore
|
||||||
|
return if (keyStore == null) {
|
||||||
|
throw IllegalArgumentException("No keystore configured")
|
||||||
|
} else {
|
||||||
|
val javaKeyStore = loadKeystore(keyStore.file, keyStore.password)
|
||||||
|
val serverKey = javaKeyStore.getKey(
|
||||||
|
keyStore.keyAlias, (keyStore.keyPassword ?: "").let(String::toCharArray)
|
||||||
|
) as PrivateKey
|
||||||
|
val serverCert: Array<X509Certificate> =
|
||||||
|
Arrays.stream(javaKeyStore.getCertificateChain(keyStore.keyAlias))
|
||||||
|
.map { it as X509Certificate }
|
||||||
|
.toArray { size -> Array<X509Certificate?>(size) { null } }
|
||||||
|
SslContextBuilder.forServer(serverKey, *serverCert).apply {
|
||||||
|
val clientAuth = tls.trustStore?.let { trustStore ->
|
||||||
|
val ts = loadKeystore(trustStore.file, trustStore.password)
|
||||||
|
trustManager(
|
||||||
|
ClientCertificateValidator.getTrustManager(ts, trustStore.isCheckCertificateStatus)
|
||||||
|
)
|
||||||
|
if (trustStore.isRequireClientCertificate) ClientAuth.REQUIRE
|
||||||
|
else ClientAuth.OPTIONAL
|
||||||
|
} ?: ClientAuth.NONE
|
||||||
|
clientAuth(clientAuth)
|
||||||
|
}.build()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun loadKeystore(file: Path, password: String?): KeyStore {
|
||||||
|
val ext = JWO.splitExtension(file)
|
||||||
|
.map(Tuple2<String, String>::get_2)
|
||||||
|
.orElseThrow {
|
||||||
|
IllegalArgumentException(
|
||||||
|
"Keystore file '${file}' must have .jks, .p12, .pfx extension"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
val keystore = when (ext.substring(1).lowercase()) {
|
||||||
|
"jks" -> KeyStore.getInstance("JKS")
|
||||||
|
"p12", "pfx" -> KeyStore.getInstance("PKCS12")
|
||||||
|
else -> throw IllegalArgumentException(
|
||||||
|
"Keystore file '${file}' must have .jks, .p12, .pfx extension"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Files.newInputStream(file).use {
|
||||||
|
keystore.load(it, password?.let(String::toCharArray))
|
||||||
|
}
|
||||||
|
return keystore
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private val log = contextLogger()
|
||||||
|
|
||||||
|
private val cache = cfg.cache.materialize()
|
||||||
|
|
||||||
|
private val serverHandler = let {
|
||||||
|
val prefix = Path.of("/").resolve(Path.of(cfg.serverPath ?: "/"))
|
||||||
|
ServerHandler(cache, prefix)
|
||||||
|
}
|
||||||
|
|
||||||
|
private val exceptionHandler = ExceptionHandler()
|
||||||
|
private val throttlingHandler = ThrottlingHandler(cfg)
|
||||||
|
|
||||||
|
private val authenticator = when (val auth = cfg.authentication) {
|
||||||
|
is Configuration.BasicAuthentication -> NettyHttpBasicAuthenticator(cfg.users, RoleAuthorizer())
|
||||||
|
is Configuration.ClientCertificateAuthentication -> {
|
||||||
|
ClientCertificateAuthenticator(
|
||||||
|
RoleAuthorizer(),
|
||||||
|
cfg.users[""]?.groups,
|
||||||
|
userExtractor(auth),
|
||||||
|
groupExtractor(auth)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
|
||||||
|
private val sslContext: SslContext? = cfg.tls?.let(Companion::createSslCtx)
|
||||||
|
|
||||||
|
private fun userExtractor(authentication: Configuration.ClientCertificateAuthentication) =
|
||||||
|
authentication.userExtractor?.let { extractor ->
|
||||||
|
val pattern = Pattern.compile(extractor.pattern)
|
||||||
|
val rdnType = extractor.rdnType
|
||||||
|
Configuration.UserExtractor { cert: X509Certificate ->
|
||||||
|
val userName = LdapName(cert.subjectX500Principal.name).rdns.find {
|
||||||
|
it.type == rdnType
|
||||||
|
}?.let {
|
||||||
|
pattern.matcher(it.value.toString())
|
||||||
|
}?.takeIf(Matcher::matches)?.group(1)
|
||||||
|
cfg.users[userName] ?: throw java.lang.RuntimeException("Failed to extract user")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun groupExtractor(authentication: Configuration.ClientCertificateAuthentication) =
|
||||||
|
authentication.groupExtractor?.let { extractor ->
|
||||||
|
val pattern = Pattern.compile(extractor.pattern)
|
||||||
|
val rdnType = extractor.rdnType
|
||||||
|
Configuration.GroupExtractor { cert: X509Certificate ->
|
||||||
|
val groupName = LdapName(cert.subjectX500Principal.name).rdns.find {
|
||||||
|
it.type == rdnType
|
||||||
|
}?.let {
|
||||||
|
pattern.matcher(it.value.toString())
|
||||||
|
}?.takeIf(Matcher::matches)?.group(1)
|
||||||
|
cfg.groups[groupName] ?: throw java.lang.RuntimeException("Failed to extract group")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun initChannel(ch: Channel) {
|
||||||
|
log.debug {
|
||||||
|
"Created connection ${ch.id().asShortText()} with ${ch.remoteAddress()}"
|
||||||
|
}
|
||||||
|
ch.closeFuture().addListener {
|
||||||
|
log.debug {
|
||||||
|
"Closed connection ${ch.id().asShortText()} with ${ch.remoteAddress()}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val pipeline = ch.pipeline()
|
||||||
|
cfg.connection.also { conn ->
|
||||||
|
val readTimeout = conn.readTimeout.toMillis()
|
||||||
|
val writeTimeout = conn.writeTimeout.toMillis()
|
||||||
|
if (readTimeout > 0 || writeTimeout > 0) {
|
||||||
|
pipeline.addLast(
|
||||||
|
IdleStateHandler(
|
||||||
|
false,
|
||||||
|
readTimeout,
|
||||||
|
writeTimeout,
|
||||||
|
0,
|
||||||
|
TimeUnit.MILLISECONDS
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
val readIdleTimeout = conn.readIdleTimeout.toMillis()
|
||||||
|
val writeIdleTimeout = conn.writeIdleTimeout.toMillis()
|
||||||
|
val idleTimeout = conn.idleTimeout.toMillis()
|
||||||
|
if (readIdleTimeout > 0 || writeIdleTimeout > 0 || idleTimeout > 0) {
|
||||||
|
pipeline.addLast(
|
||||||
|
IdleStateHandler(
|
||||||
|
true,
|
||||||
|
readIdleTimeout,
|
||||||
|
writeIdleTimeout,
|
||||||
|
idleTimeout,
|
||||||
|
TimeUnit.MILLISECONDS
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pipeline.addLast(object : ChannelInboundHandlerAdapter() {
|
||||||
|
override fun userEventTriggered(ctx: ChannelHandlerContext, evt: Any) {
|
||||||
|
if (evt is IdleStateEvent) {
|
||||||
|
when (evt.state()) {
|
||||||
|
IdleState.READER_IDLE -> log.debug {
|
||||||
|
"Read timeout reached on channel ${ch.id().asShortText()}, closing the connection"
|
||||||
|
}
|
||||||
|
|
||||||
|
IdleState.WRITER_IDLE -> log.debug {
|
||||||
|
"Write timeout reached on channel ${ch.id().asShortText()}, closing the connection"
|
||||||
|
}
|
||||||
|
|
||||||
|
IdleState.ALL_IDLE -> log.debug {
|
||||||
|
"Idle timeout reached on channel ${ch.id().asShortText()}, closing the connection"
|
||||||
|
}
|
||||||
|
|
||||||
|
null -> throw IllegalStateException("This should never happen")
|
||||||
|
}
|
||||||
|
ctx.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
sslContext?.newHandler(ch.alloc())?.also {
|
||||||
|
pipeline.addLast(SSL_HANDLER_NAME, it)
|
||||||
|
}
|
||||||
|
pipeline.addLast(HttpServerCodec())
|
||||||
|
pipeline.addLast(HttpChunkContentCompressor(1024))
|
||||||
|
pipeline.addLast(ChunkedWriteHandler())
|
||||||
|
pipeline.addLast(HttpObjectAggregator(cfg.connection.maxRequestSize))
|
||||||
|
authenticator?.let {
|
||||||
|
pipeline.addLast(it)
|
||||||
|
}
|
||||||
|
pipeline.addLast(throttlingHandler)
|
||||||
|
pipeline.addLast(eventExecutorGroup, serverHandler)
|
||||||
|
pipeline.addLast(exceptionHandler)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun close() {
|
||||||
|
cache.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ServerHandle(
|
||||||
|
httpChannelFuture: ChannelFuture,
|
||||||
|
private val executorGroups: Iterable<EventExecutorGroup>,
|
||||||
|
private val serverInitializer: AutoCloseable
|
||||||
|
) : AutoCloseable {
|
||||||
|
private val httpChannel: Channel = httpChannelFuture.channel()
|
||||||
|
private val closeFuture: ChannelFuture = httpChannel.closeFuture()
|
||||||
|
private val log = contextLogger()
|
||||||
|
|
||||||
|
fun shutdown(): Future<Void> {
|
||||||
|
return httpChannel.close()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun close() {
|
||||||
|
try {
|
||||||
|
closeFuture.sync()
|
||||||
|
} catch (ex: Throwable) {
|
||||||
|
log.error(ex.message, ex)
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
serverInitializer.close()
|
||||||
|
} catch (ex: Throwable) {
|
||||||
|
log.error(ex.message, ex)
|
||||||
|
}
|
||||||
|
executorGroups.forEach {
|
||||||
|
try {
|
||||||
|
it.shutdownGracefully().sync()
|
||||||
|
} catch (ex: Throwable) {
|
||||||
|
log.error(ex.message, ex)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
log.info {
|
||||||
|
"RemoteBuildCacheServer has been gracefully shut down"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun run(): ServerHandle {
|
||||||
|
// Create the multithreaded event loops for the server
|
||||||
|
val bossGroup = NioEventLoopGroup(1)
|
||||||
|
val serverSocketChannel = NioServerSocketChannel::class.java
|
||||||
|
val workerGroup = NioEventLoopGroup(0)
|
||||||
|
val eventExecutorGroup = run {
|
||||||
|
val threadFactory = if (cfg.eventExecutor.isUseVirtualThreads) {
|
||||||
|
Thread.ofVirtual().factory()
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
DefaultEventExecutorGroup(Runtime.getRuntime().availableProcessors(), threadFactory)
|
||||||
|
}
|
||||||
|
val serverInitializer = ServerInitializer(cfg, eventExecutorGroup)
|
||||||
|
val bootstrap = ServerBootstrap().apply {
|
||||||
|
// Configure the server
|
||||||
|
group(bossGroup, workerGroup)
|
||||||
|
channel(serverSocketChannel)
|
||||||
|
childHandler(serverInitializer)
|
||||||
|
option(ChannelOption.SO_BACKLOG, cfg.incomingConnectionsBacklogSize)
|
||||||
|
childOption(ChannelOption.SO_KEEPALIVE, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Bind and start to accept incoming connections.
|
||||||
|
val bindAddress = InetSocketAddress(cfg.host, cfg.port)
|
||||||
|
val httpChannel = bootstrap.bind(bindAddress).sync()
|
||||||
|
log.info {
|
||||||
|
"RemoteBuildCacheServer is listening on ${cfg.host}:${cfg.port}"
|
||||||
|
}
|
||||||
|
return ServerHandle(httpChannel, setOf(bossGroup, workerGroup, eventExecutorGroup), serverInitializer)
|
||||||
|
}
|
||||||
|
}
|
@@ -1,4 +1,4 @@
|
|||||||
package net.woggioni.gbcs.auth
|
package net.woggioni.rbcs.server.auth
|
||||||
|
|
||||||
import io.netty.buffer.Unpooled
|
import io.netty.buffer.Unpooled
|
||||||
import io.netty.channel.ChannelFutureListener
|
import io.netty.channel.ChannelFutureListener
|
||||||
@@ -11,32 +11,48 @@ import io.netty.handler.codec.http.HttpRequest
|
|||||||
import io.netty.handler.codec.http.HttpResponseStatus
|
import io.netty.handler.codec.http.HttpResponseStatus
|
||||||
import io.netty.handler.codec.http.HttpVersion
|
import io.netty.handler.codec.http.HttpVersion
|
||||||
import io.netty.util.ReferenceCountUtil
|
import io.netty.util.ReferenceCountUtil
|
||||||
import net.woggioni.gbcs.api.Role
|
import net.woggioni.rbcs.api.Configuration
|
||||||
|
import net.woggioni.rbcs.api.Configuration.Group
|
||||||
|
import net.woggioni.rbcs.api.Role
|
||||||
|
import net.woggioni.rbcs.server.RemoteBuildCacheServer
|
||||||
|
|
||||||
|
|
||||||
abstract class AbstractNettyHttpAuthenticator(private val authorizer : Authorizer)
|
abstract class AbstractNettyHttpAuthenticator(private val authorizer: Authorizer) : ChannelInboundHandlerAdapter() {
|
||||||
: ChannelInboundHandlerAdapter() {
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
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"
|
||||||
}
|
}
|
||||||
|
|
||||||
private val NOT_AUTHORIZED: FullHttpResponse = DefaultFullHttpResponse(
|
private val NOT_AUTHORIZED: FullHttpResponse = DefaultFullHttpResponse(
|
||||||
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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class AuthenticationResult(val user: Configuration.User?, val groups: Set<Group>)
|
||||||
|
|
||||||
abstract fun authenticate(ctx : ChannelHandlerContext, req : HttpRequest) : Set<Role>?
|
abstract fun authenticate(ctx: ChannelHandlerContext, req: HttpRequest): AuthenticationResult?
|
||||||
|
|
||||||
override fun channelRead(ctx: ChannelHandlerContext, msg: Any) {
|
override fun channelRead(ctx: ChannelHandlerContext, msg: Any) {
|
||||||
if(msg is HttpRequest) {
|
if (msg is HttpRequest) {
|
||||||
val roles = authenticate(ctx, msg) ?: return authenticationFailure(ctx, msg)
|
val result = authenticate(ctx, msg) ?: return authenticationFailure(ctx, msg)
|
||||||
|
ctx.channel().attr(RemoteBuildCacheServer.userAttribute).set(result.user)
|
||||||
|
ctx.channel().attr(RemoteBuildCacheServer.groupAttribute).set(result.groups)
|
||||||
|
|
||||||
|
val roles = (
|
||||||
|
(result.user?.let { user ->
|
||||||
|
user.groups.asSequence().flatMap { group ->
|
||||||
|
group.roles.asSequence()
|
||||||
|
}
|
||||||
|
} ?: emptySequence<Role>()) +
|
||||||
|
result.groups.asSequence().flatMap { it.roles.asSequence() }
|
||||||
|
).toSet()
|
||||||
val authorized = authorizer.authorize(roles, msg)
|
val authorized = authorizer.authorize(roles, msg)
|
||||||
if(authorized) {
|
if (authorized) {
|
||||||
super.channelRead(ctx, msg)
|
super.channelRead(ctx, msg)
|
||||||
} else {
|
} else {
|
||||||
authorizationFailure(ctx, msg)
|
authorizationFailure(ctx, msg)
|
@@ -1,7 +1,7 @@
|
|||||||
package net.woggioni.gbcs.auth
|
package net.woggioni.rbcs.server.auth
|
||||||
|
|
||||||
import io.netty.handler.codec.http.HttpRequest
|
import io.netty.handler.codec.http.HttpRequest
|
||||||
import net.woggioni.gbcs.api.Role
|
import net.woggioni.rbcs.api.Role
|
||||||
|
|
||||||
fun interface Authorizer {
|
fun interface Authorizer {
|
||||||
fun authorize(roles : Set<Role>, request: HttpRequest) : Boolean
|
fun authorize(roles : Set<Role>, request: HttpRequest) : Boolean
|
@@ -1,24 +1,27 @@
|
|||||||
package net.woggioni.gbcs.auth
|
package net.woggioni.rbcs.server.auth
|
||||||
|
|
||||||
|
import io.netty.channel.ChannelHandlerContext
|
||||||
|
import io.netty.channel.ChannelInboundHandlerAdapter
|
||||||
|
import io.netty.handler.ssl.SslHandler
|
||||||
|
import io.netty.handler.ssl.SslHandshakeCompletionEvent
|
||||||
import java.security.KeyStore
|
import java.security.KeyStore
|
||||||
import java.security.cert.CertPathValidator
|
import java.security.cert.CertPathValidator
|
||||||
|
import java.security.cert.CertPathValidatorException
|
||||||
|
import java.security.cert.CertificateException
|
||||||
import java.security.cert.CertificateFactory
|
import java.security.cert.CertificateFactory
|
||||||
import java.security.cert.PKIXParameters
|
import java.security.cert.PKIXParameters
|
||||||
import java.security.cert.PKIXRevocationChecker
|
import java.security.cert.PKIXRevocationChecker
|
||||||
import java.security.cert.X509Certificate
|
import java.security.cert.X509Certificate
|
||||||
import java.util.EnumSet
|
import java.util.EnumSet
|
||||||
import io.netty.channel.ChannelHandlerContext
|
|
||||||
import io.netty.channel.ChannelInboundHandlerAdapter
|
|
||||||
import io.netty.handler.ssl.SslHandler
|
|
||||||
import io.netty.handler.ssl.SslHandshakeCompletionEvent
|
|
||||||
import javax.net.ssl.SSLSession
|
import javax.net.ssl.SSLSession
|
||||||
import javax.net.ssl.TrustManagerFactory
|
import javax.net.ssl.TrustManagerFactory
|
||||||
import javax.net.ssl.X509TrustManager
|
import javax.net.ssl.X509TrustManager
|
||||||
|
|
||||||
|
|
||||||
class ClientCertificateValidator private constructor(
|
class ClientCertificateValidator private constructor(
|
||||||
private val sslHandler : SslHandler,
|
private val sslHandler: SslHandler,
|
||||||
private val x509TrustManager: X509TrustManager) : ChannelInboundHandlerAdapter() {
|
private val x509TrustManager: X509TrustManager
|
||||||
|
) : ChannelInboundHandlerAdapter() {
|
||||||
override fun userEventTriggered(ctx: ChannelHandlerContext, evt: Any) {
|
override fun userEventTriggered(ctx: ChannelHandlerContext, evt: Any) {
|
||||||
if (evt is SslHandshakeCompletionEvent) {
|
if (evt is SslHandshakeCompletionEvent) {
|
||||||
if (evt.isSuccess) {
|
if (evt.isSuccess) {
|
||||||
@@ -34,13 +37,14 @@ class ClientCertificateValidator private constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
fun getTrustManager(trustStore : KeyStore?, certificateRevocationEnabled : Boolean) : X509TrustManager {
|
fun getTrustManager(trustStore: KeyStore?, certificateRevocationEnabled: Boolean): X509TrustManager {
|
||||||
return if(trustStore != null) {
|
return if (trustStore != null) {
|
||||||
val certificateFactory = CertificateFactory.getInstance("X.509")
|
val certificateFactory = CertificateFactory.getInstance("X.509")
|
||||||
val validator = CertPathValidator.getInstance("PKIX").apply {
|
val validator = CertPathValidator.getInstance("PKIX").apply {
|
||||||
val rc = revocationChecker as PKIXRevocationChecker
|
val rc = revocationChecker as PKIXRevocationChecker
|
||||||
rc.options = EnumSet.of(
|
rc.options = EnumSet.of(
|
||||||
PKIXRevocationChecker.Option.NO_FALLBACK)
|
PKIXRevocationChecker.Option.NO_FALLBACK
|
||||||
|
)
|
||||||
}
|
}
|
||||||
val params = PKIXParameters(trustStore).apply {
|
val params = PKIXParameters(trustStore).apply {
|
||||||
isRevocationEnabled = certificateRevocationEnabled
|
isRevocationEnabled = certificateRevocationEnabled
|
||||||
@@ -48,7 +52,11 @@ class ClientCertificateValidator private constructor(
|
|||||||
object : X509TrustManager {
|
object : X509TrustManager {
|
||||||
override fun checkClientTrusted(chain: Array<out X509Certificate>, authType: String) {
|
override fun checkClientTrusted(chain: Array<out X509Certificate>, authType: String) {
|
||||||
val clientCertificateChain = certificateFactory.generateCertPath(chain.toList())
|
val clientCertificateChain = certificateFactory.generateCertPath(chain.toList())
|
||||||
validator.validate(clientCertificateChain, params)
|
try {
|
||||||
|
validator.validate(clientCertificateChain, params)
|
||||||
|
} catch (ex: CertPathValidatorException) {
|
||||||
|
throw CertificateException(ex)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun checkServerTrusted(chain: Array<out X509Certificate>, authType: String) {
|
override fun checkServerTrusted(chain: Array<out X509Certificate>, authType: String) {
|
||||||
@@ -56,7 +64,7 @@ class ClientCertificateValidator private constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private val acceptedIssuers = trustStore.aliases().asSequence()
|
private val acceptedIssuers = trustStore.aliases().asSequence()
|
||||||
.filter (trustStore::isCertificateEntry)
|
.filter(trustStore::isCertificateEntry)
|
||||||
.map(trustStore::getCertificate)
|
.map(trustStore::getCertificate)
|
||||||
.map { it as X509Certificate }
|
.map { it as X509Certificate }
|
||||||
.toList()
|
.toList()
|
||||||
@@ -66,11 +74,16 @@ class ClientCertificateValidator private constructor(
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
|
val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
|
||||||
trustManagerFactory.trustManagers.asSequence().filter { it is X509TrustManager }.single() as X509TrustManager
|
trustManagerFactory.trustManagers.asSequence().filter { it is X509TrustManager }
|
||||||
|
.single() as X509TrustManager
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun of(sslHandler : SslHandler, trustStore : KeyStore?, certificateRevocationEnabled : Boolean) : ClientCertificateValidator {
|
fun of(
|
||||||
|
sslHandler: SslHandler,
|
||||||
|
trustStore: KeyStore?,
|
||||||
|
certificateRevocationEnabled: Boolean
|
||||||
|
): ClientCertificateValidator {
|
||||||
return ClientCertificateValidator(sslHandler, getTrustManager(trustStore, certificateRevocationEnabled))
|
return ClientCertificateValidator(sslHandler, getTrustManager(trustStore, certificateRevocationEnabled))
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -1,14 +1,14 @@
|
|||||||
package net.woggioni.gbcs.auth
|
package net.woggioni.rbcs.server.auth
|
||||||
|
|
||||||
import io.netty.handler.codec.http.HttpMethod
|
import io.netty.handler.codec.http.HttpMethod
|
||||||
import io.netty.handler.codec.http.HttpRequest
|
import io.netty.handler.codec.http.HttpRequest
|
||||||
import net.woggioni.gbcs.api.Role
|
import net.woggioni.rbcs.api.Role
|
||||||
|
|
||||||
class RoleAuthorizer : Authorizer {
|
class RoleAuthorizer : Authorizer {
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private val METHOD_MAP = mapOf(
|
private val METHOD_MAP = mapOf(
|
||||||
Role.Reader to setOf(HttpMethod.GET, HttpMethod.HEAD),
|
Role.Reader to setOf(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.TRACE),
|
||||||
Role.Writer to setOf(HttpMethod.PUT, HttpMethod.POST)
|
Role.Writer to setOf(HttpMethod.PUT, HttpMethod.POST)
|
||||||
)
|
)
|
||||||
}
|
}
|
147
rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCache.kt
vendored
Normal file
147
rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/FileSystemCache.kt
vendored
Normal file
@@ -0,0 +1,147 @@
|
|||||||
|
package net.woggioni.rbcs.server.cache
|
||||||
|
|
||||||
|
import io.netty.buffer.ByteBuf
|
||||||
|
import net.woggioni.jwo.JWO
|
||||||
|
import net.woggioni.rbcs.api.Cache
|
||||||
|
import net.woggioni.rbcs.common.ByteBufInputStream
|
||||||
|
import net.woggioni.rbcs.common.RBCS.digestString
|
||||||
|
import net.woggioni.rbcs.common.contextLogger
|
||||||
|
import java.nio.channels.Channels
|
||||||
|
import java.nio.channels.FileChannel
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Path
|
||||||
|
import java.nio.file.StandardCopyOption
|
||||||
|
import java.nio.file.StandardOpenOption
|
||||||
|
import java.nio.file.attribute.BasicFileAttributes
|
||||||
|
import java.security.MessageDigest
|
||||||
|
import java.time.Duration
|
||||||
|
import java.time.Instant
|
||||||
|
import java.util.concurrent.CompletableFuture
|
||||||
|
import java.util.zip.Deflater
|
||||||
|
import java.util.zip.DeflaterOutputStream
|
||||||
|
import java.util.zip.Inflater
|
||||||
|
import java.util.zip.InflaterInputStream
|
||||||
|
|
||||||
|
class FileSystemCache(
|
||||||
|
val root: Path,
|
||||||
|
val maxAge: Duration,
|
||||||
|
val digestAlgorithm: String?,
|
||||||
|
val compressionEnabled: Boolean,
|
||||||
|
val compressionLevel: Int
|
||||||
|
) : Cache {
|
||||||
|
|
||||||
|
private companion object {
|
||||||
|
@JvmStatic
|
||||||
|
private val log = contextLogger()
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
Files.createDirectories(root)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Volatile
|
||||||
|
private var running = true
|
||||||
|
|
||||||
|
private var nextGc = Instant.now()
|
||||||
|
|
||||||
|
override fun get(key: String) = (digestAlgorithm
|
||||||
|
?.let(MessageDigest::getInstance)
|
||||||
|
?.let { md ->
|
||||||
|
digestString(key.toByteArray(), md)
|
||||||
|
} ?: key).let { digest ->
|
||||||
|
root.resolve(digest).takeIf(Files::exists)
|
||||||
|
?.let { file ->
|
||||||
|
file.takeIf(Files::exists)?.let { file ->
|
||||||
|
if (compressionEnabled) {
|
||||||
|
val inflater = Inflater()
|
||||||
|
Channels.newChannel(
|
||||||
|
InflaterInputStream(
|
||||||
|
Channels.newInputStream(
|
||||||
|
FileChannel.open(
|
||||||
|
file,
|
||||||
|
StandardOpenOption.READ
|
||||||
|
)
|
||||||
|
), inflater
|
||||||
|
)
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
FileChannel.open(file, StandardOpenOption.READ)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}.let {
|
||||||
|
CompletableFuture.completedFuture(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun put(key: String, content: ByteBuf): CompletableFuture<Void> {
|
||||||
|
(digestAlgorithm
|
||||||
|
?.let(MessageDigest::getInstance)
|
||||||
|
?.let { md ->
|
||||||
|
digestString(key.toByteArray(), md)
|
||||||
|
} ?: key).let { digest ->
|
||||||
|
val file = root.resolve(digest)
|
||||||
|
val tmpFile = Files.createTempFile(root, null, ".tmp")
|
||||||
|
try {
|
||||||
|
Files.newOutputStream(tmpFile).let {
|
||||||
|
if (compressionEnabled) {
|
||||||
|
val deflater = Deflater(compressionLevel)
|
||||||
|
DeflaterOutputStream(it, deflater)
|
||||||
|
} else {
|
||||||
|
it
|
||||||
|
}
|
||||||
|
}.use {
|
||||||
|
JWO.copy(ByteBufInputStream(content), it)
|
||||||
|
}
|
||||||
|
Files.move(tmpFile, file, StandardCopyOption.ATOMIC_MOVE)
|
||||||
|
} catch (t: Throwable) {
|
||||||
|
Files.delete(tmpFile)
|
||||||
|
throw t
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return CompletableFuture.completedFuture(null)
|
||||||
|
}
|
||||||
|
|
||||||
|
private val garbageCollector = Thread.ofVirtual().name("file-system-cache-gc").start {
|
||||||
|
while (running) {
|
||||||
|
gc()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun gc() {
|
||||||
|
val now = Instant.now()
|
||||||
|
if (nextGc < now) {
|
||||||
|
val oldestEntry = actualGc(now)
|
||||||
|
nextGc = (oldestEntry ?: now).plus(maxAge)
|
||||||
|
}
|
||||||
|
Thread.sleep(minOf(Duration.between(now, nextGc), Duration.ofSeconds(1)))
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the creation timestamp of the oldest cache entry (if any)
|
||||||
|
*/
|
||||||
|
private fun actualGc(now: Instant) : Instant? {
|
||||||
|
var result :Instant? = null
|
||||||
|
Files.list(root)
|
||||||
|
.filter { path ->
|
||||||
|
JWO.splitExtension(path)
|
||||||
|
.map { it._2 }
|
||||||
|
.map { it != ".tmp" }
|
||||||
|
.orElse(true)
|
||||||
|
}
|
||||||
|
.filter {
|
||||||
|
val creationTimeStamp = Files.readAttributes(it, BasicFileAttributes::class.java)
|
||||||
|
.creationTime()
|
||||||
|
.toInstant()
|
||||||
|
if(result == null || creationTimeStamp < result) {
|
||||||
|
result = creationTimeStamp
|
||||||
|
}
|
||||||
|
now > creationTimeStamp.plus(maxAge)
|
||||||
|
}.forEach(Files::delete)
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun close() {
|
||||||
|
running = false
|
||||||
|
garbageCollector.join()
|
||||||
|
}
|
||||||
|
}
|
@@ -1,7 +1,7 @@
|
|||||||
package net.woggioni.gbcs.cache
|
package net.woggioni.rbcs.server.cache
|
||||||
|
|
||||||
import net.woggioni.gbcs.api.Configuration
|
import net.woggioni.rbcs.api.Configuration
|
||||||
import net.woggioni.gbcs.base.GBCS
|
import net.woggioni.rbcs.common.RBCS
|
||||||
import net.woggioni.jwo.Application
|
import net.woggioni.jwo.Application
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import java.time.Duration
|
import java.time.Duration
|
||||||
@@ -14,14 +14,14 @@ data class FileSystemCacheConfiguration(
|
|||||||
val compressionLevel: Int,
|
val compressionLevel: Int,
|
||||||
) : Configuration.Cache {
|
) : Configuration.Cache {
|
||||||
override fun materialize() = FileSystemCache(
|
override fun materialize() = FileSystemCache(
|
||||||
root ?: Application.builder("gbcs").build().computeCacheDirectory(),
|
root ?: Application.builder("rbcs").build().computeCacheDirectory(),
|
||||||
maxAge,
|
maxAge,
|
||||||
digestAlgorithm,
|
digestAlgorithm,
|
||||||
compressionEnabled,
|
compressionEnabled,
|
||||||
compressionLevel
|
compressionLevel
|
||||||
)
|
)
|
||||||
|
|
||||||
override fun getNamespaceURI() = GBCS.GBCS_NAMESPACE_URI
|
override fun getNamespaceURI() = RBCS.RBCS_NAMESPACE_URI
|
||||||
|
|
||||||
override fun getTypeName() = "fileSystemCacheType"
|
override fun getTypeName() = "fileSystemCacheType"
|
||||||
}
|
}
|
@@ -1,8 +1,9 @@
|
|||||||
package net.woggioni.gbcs.cache
|
package net.woggioni.rbcs.server.cache
|
||||||
|
|
||||||
import net.woggioni.gbcs.api.CacheProvider
|
import net.woggioni.rbcs.api.CacheProvider
|
||||||
import net.woggioni.gbcs.base.GBCS
|
import net.woggioni.rbcs.common.RBCS
|
||||||
import net.woggioni.gbcs.base.Xml
|
import net.woggioni.rbcs.common.Xml
|
||||||
|
import net.woggioni.rbcs.common.Xml.Companion.renderAttribute
|
||||||
import org.w3c.dom.Document
|
import org.w3c.dom.Document
|
||||||
import org.w3c.dom.Element
|
import org.w3c.dom.Element
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
@@ -11,29 +12,25 @@ import java.util.zip.Deflater
|
|||||||
|
|
||||||
class FileSystemCacheProvider : CacheProvider<FileSystemCacheConfiguration> {
|
class FileSystemCacheProvider : CacheProvider<FileSystemCacheConfiguration> {
|
||||||
|
|
||||||
override fun getXmlSchemaLocation() = "classpath:net/woggioni/gbcs/schema/gbcs.xsd"
|
override fun getXmlSchemaLocation() = "classpath:net/woggioni/rbcs/server/schema/rbcs.xsd"
|
||||||
|
|
||||||
override fun getXmlType() = "fileSystemCacheType"
|
override fun getXmlType() = "fileSystemCacheType"
|
||||||
|
|
||||||
override fun getXmlNamespace() = "urn:net.woggioni.gbcs"
|
override fun getXmlNamespace() = "urn:net.woggioni.rbcs.server"
|
||||||
|
|
||||||
override fun deserialize(el: Element): FileSystemCacheConfiguration {
|
override fun deserialize(el: Element): FileSystemCacheConfiguration {
|
||||||
val path = el.getAttribute("path")
|
val path = el.renderAttribute("path")
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
?.let(Path::of)
|
?.let(Path::of)
|
||||||
val maxAge = el.getAttribute("max-age")
|
val maxAge = el.renderAttribute("max-age")
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
?.let(Duration::parse)
|
?.let(Duration::parse)
|
||||||
?: Duration.ofDays(1)
|
?: Duration.ofDays(1)
|
||||||
val enableCompression = el.getAttribute("enable-compression")
|
val enableCompression = el.renderAttribute("enable-compression")
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
?.let(String::toBoolean)
|
?.let(String::toBoolean)
|
||||||
?: true
|
?: true
|
||||||
val compressionLevel = el.getAttribute("compression-level")
|
val compressionLevel = el.renderAttribute("compression-level")
|
||||||
.takeIf(String::isNotEmpty)
|
|
||||||
?.let(String::toInt)
|
?.let(String::toInt)
|
||||||
?: Deflater.DEFAULT_COMPRESSION
|
?: Deflater.DEFAULT_COMPRESSION
|
||||||
val digestAlgorithm = el.getAttribute("digest").takeIf(String::isNotEmpty) ?: "MD5"
|
val digestAlgorithm = el.renderAttribute("digest") ?: "MD5"
|
||||||
|
|
||||||
return FileSystemCacheConfiguration(
|
return FileSystemCacheConfiguration(
|
||||||
path,
|
path,
|
||||||
@@ -47,8 +44,8 @@ class FileSystemCacheProvider : CacheProvider<FileSystemCacheConfiguration> {
|
|||||||
override fun serialize(doc: Document, cache : FileSystemCacheConfiguration) = cache.run {
|
override fun serialize(doc: Document, cache : FileSystemCacheConfiguration) = cache.run {
|
||||||
val result = doc.createElement("cache")
|
val result = doc.createElement("cache")
|
||||||
Xml.of(doc, result) {
|
Xml.of(doc, result) {
|
||||||
val prefix = doc.lookupPrefix(GBCS.GBCS_NAMESPACE_URI)
|
val prefix = doc.lookupPrefix(RBCS.RBCS_NAMESPACE_URI)
|
||||||
attr("xs:type", "${prefix}:fileSystemCacheType", GBCS.XML_SCHEMA_NAMESPACE_URI)
|
attr("xs:type", "${prefix}:fileSystemCacheType", RBCS.XML_SCHEMA_NAMESPACE_URI)
|
||||||
attr("path", root.toString())
|
attr("path", root.toString())
|
||||||
attr("max-age", maxAge.toString())
|
attr("max-age", maxAge.toString())
|
||||||
digestAlgorithm?.let { digestAlgorithm ->
|
digestAlgorithm?.let { digestAlgorithm ->
|
150
rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCache.kt
vendored
Normal file
150
rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCache.kt
vendored
Normal file
@@ -0,0 +1,150 @@
|
|||||||
|
package net.woggioni.rbcs.server.cache
|
||||||
|
|
||||||
|
import io.netty.buffer.ByteBuf
|
||||||
|
import net.woggioni.jwo.JWO
|
||||||
|
import net.woggioni.rbcs.api.Cache
|
||||||
|
import net.woggioni.rbcs.common.ByteBufInputStream
|
||||||
|
import net.woggioni.rbcs.common.ByteBufOutputStream
|
||||||
|
import net.woggioni.rbcs.common.RBCS.digestString
|
||||||
|
import net.woggioni.rbcs.common.contextLogger
|
||||||
|
import java.nio.channels.Channels
|
||||||
|
import java.security.MessageDigest
|
||||||
|
import java.time.Duration
|
||||||
|
import java.time.Instant
|
||||||
|
import java.util.concurrent.CompletableFuture
|
||||||
|
import java.util.concurrent.ConcurrentHashMap
|
||||||
|
import java.util.concurrent.PriorityBlockingQueue
|
||||||
|
import java.util.concurrent.atomic.AtomicLong
|
||||||
|
import java.util.zip.Deflater
|
||||||
|
import java.util.zip.DeflaterOutputStream
|
||||||
|
import java.util.zip.Inflater
|
||||||
|
import java.util.zip.InflaterInputStream
|
||||||
|
|
||||||
|
class InMemoryCache(
|
||||||
|
val maxAge: Duration,
|
||||||
|
val maxSize: Long,
|
||||||
|
val digestAlgorithm: String?,
|
||||||
|
val compressionEnabled: Boolean,
|
||||||
|
val compressionLevel: Int
|
||||||
|
) : Cache {
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
@JvmStatic
|
||||||
|
private val log = contextLogger()
|
||||||
|
}
|
||||||
|
|
||||||
|
private val size = AtomicLong()
|
||||||
|
private val map = ConcurrentHashMap<String, ByteBuf>()
|
||||||
|
|
||||||
|
private class RemovalQueueElement(val key: String, val value : ByteBuf, val expiry : Instant) : Comparable<RemovalQueueElement> {
|
||||||
|
override fun compareTo(other: RemovalQueueElement) = expiry.compareTo(other.expiry)
|
||||||
|
}
|
||||||
|
|
||||||
|
private val removalQueue = PriorityBlockingQueue<RemovalQueueElement>()
|
||||||
|
|
||||||
|
@Volatile
|
||||||
|
private var running = true
|
||||||
|
|
||||||
|
private val garbageCollector = Thread.ofVirtual().name("in-memory-cache-gc").start {
|
||||||
|
while(running) {
|
||||||
|
val el = removalQueue.take()
|
||||||
|
val buf = el.value
|
||||||
|
val now = Instant.now()
|
||||||
|
if(now > el.expiry) {
|
||||||
|
val removed = map.remove(el.key, buf)
|
||||||
|
if(removed) {
|
||||||
|
updateSizeAfterRemoval(buf)
|
||||||
|
//Decrease the reference count for map
|
||||||
|
buf.release()
|
||||||
|
}
|
||||||
|
//Decrease the reference count for removalQueue
|
||||||
|
buf.release()
|
||||||
|
} else {
|
||||||
|
removalQueue.put(el)
|
||||||
|
Thread.sleep(minOf(Duration.between(now, el.expiry), Duration.ofSeconds(1)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun removeEldest() : Long {
|
||||||
|
while(true) {
|
||||||
|
val el = removalQueue.take()
|
||||||
|
val buf = el.value
|
||||||
|
val removed = map.remove(el.key, buf)
|
||||||
|
//Decrease the reference count for removalQueue
|
||||||
|
buf.release()
|
||||||
|
if(removed) {
|
||||||
|
val newSize = updateSizeAfterRemoval(buf)
|
||||||
|
//Decrease the reference count for map
|
||||||
|
buf.release()
|
||||||
|
return newSize
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun updateSizeAfterRemoval(removed: ByteBuf) : Long {
|
||||||
|
return size.updateAndGet { currentSize : Long ->
|
||||||
|
currentSize - removed.readableBytes()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun close() {
|
||||||
|
running = false
|
||||||
|
garbageCollector.join()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun get(key: String) =
|
||||||
|
(digestAlgorithm
|
||||||
|
?.let(MessageDigest::getInstance)
|
||||||
|
?.let { md ->
|
||||||
|
digestString(key.toByteArray(), md)
|
||||||
|
} ?: key
|
||||||
|
).let { digest ->
|
||||||
|
map[digest]
|
||||||
|
?.let { value ->
|
||||||
|
val copy = value.retainedDuplicate()
|
||||||
|
copy.touch("This has to be released by the caller of the cache")
|
||||||
|
if (compressionEnabled) {
|
||||||
|
val inflater = Inflater()
|
||||||
|
Channels.newChannel(InflaterInputStream(ByteBufInputStream(copy), inflater))
|
||||||
|
} else {
|
||||||
|
Channels.newChannel(ByteBufInputStream(copy))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}.let {
|
||||||
|
CompletableFuture.completedFuture(it)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun put(key: String, content: ByteBuf) =
|
||||||
|
(digestAlgorithm
|
||||||
|
?.let(MessageDigest::getInstance)
|
||||||
|
?.let { md ->
|
||||||
|
digestString(key.toByteArray(), md)
|
||||||
|
} ?: key).let { digest ->
|
||||||
|
content.retain()
|
||||||
|
val value = if (compressionEnabled) {
|
||||||
|
val deflater = Deflater(compressionLevel)
|
||||||
|
val buf = content.alloc().buffer()
|
||||||
|
buf.retain()
|
||||||
|
DeflaterOutputStream(ByteBufOutputStream(buf), deflater).use { outputStream ->
|
||||||
|
ByteBufInputStream(content).use { inputStream ->
|
||||||
|
JWO.copy(inputStream, outputStream)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
buf
|
||||||
|
} else {
|
||||||
|
content
|
||||||
|
}
|
||||||
|
val old = map.put(digest, value)
|
||||||
|
val delta = value.readableBytes() - (old?.readableBytes() ?: 0)
|
||||||
|
var newSize = size.updateAndGet { currentSize : Long ->
|
||||||
|
currentSize + delta
|
||||||
|
}
|
||||||
|
removalQueue.put(RemovalQueueElement(digest, value.retain(), Instant.now().plus(maxAge)))
|
||||||
|
while(newSize > maxSize) {
|
||||||
|
newSize = removeEldest()
|
||||||
|
}
|
||||||
|
}.let {
|
||||||
|
CompletableFuture.completedFuture<Void>(null)
|
||||||
|
}
|
||||||
|
}
|
25
rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheConfiguration.kt
vendored
Normal file
25
rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheConfiguration.kt
vendored
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
package net.woggioni.rbcs.server.cache
|
||||||
|
|
||||||
|
import net.woggioni.rbcs.api.Configuration
|
||||||
|
import net.woggioni.rbcs.common.RBCS
|
||||||
|
import java.time.Duration
|
||||||
|
|
||||||
|
data class InMemoryCacheConfiguration(
|
||||||
|
val maxAge: Duration,
|
||||||
|
val maxSize: Long,
|
||||||
|
val digestAlgorithm : String?,
|
||||||
|
val compressionEnabled: Boolean,
|
||||||
|
val compressionLevel: Int,
|
||||||
|
) : Configuration.Cache {
|
||||||
|
override fun materialize() = InMemoryCache(
|
||||||
|
maxAge,
|
||||||
|
maxSize,
|
||||||
|
digestAlgorithm,
|
||||||
|
compressionEnabled,
|
||||||
|
compressionLevel
|
||||||
|
)
|
||||||
|
|
||||||
|
override fun getNamespaceURI() = RBCS.RBCS_NAMESPACE_URI
|
||||||
|
|
||||||
|
override fun getTypeName() = "inMemoryCacheType"
|
||||||
|
}
|
63
rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheProvider.kt
vendored
Normal file
63
rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCacheProvider.kt
vendored
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
package net.woggioni.rbcs.server.cache
|
||||||
|
|
||||||
|
import net.woggioni.rbcs.api.CacheProvider
|
||||||
|
import net.woggioni.rbcs.common.RBCS
|
||||||
|
import net.woggioni.rbcs.common.Xml
|
||||||
|
import net.woggioni.rbcs.common.Xml.Companion.renderAttribute
|
||||||
|
import org.w3c.dom.Document
|
||||||
|
import org.w3c.dom.Element
|
||||||
|
import java.time.Duration
|
||||||
|
import java.util.zip.Deflater
|
||||||
|
|
||||||
|
class InMemoryCacheProvider : CacheProvider<InMemoryCacheConfiguration> {
|
||||||
|
|
||||||
|
override fun getXmlSchemaLocation() = "classpath:net/woggioni/rbcs/server/schema/rbcs.xsd"
|
||||||
|
|
||||||
|
override fun getXmlType() = "inMemoryCacheType"
|
||||||
|
|
||||||
|
override fun getXmlNamespace() = "urn:net.woggioni.rbcs.server"
|
||||||
|
|
||||||
|
override fun deserialize(el: Element): InMemoryCacheConfiguration {
|
||||||
|
val maxAge = el.renderAttribute("max-age")
|
||||||
|
?.let(Duration::parse)
|
||||||
|
?: Duration.ofDays(1)
|
||||||
|
val maxSize = el.renderAttribute("max-size")
|
||||||
|
?.let(java.lang.Long::decode)
|
||||||
|
?: 0x1000000
|
||||||
|
val enableCompression = el.renderAttribute("enable-compression")
|
||||||
|
?.let(String::toBoolean)
|
||||||
|
?: true
|
||||||
|
val compressionLevel = el.renderAttribute("compression-level")
|
||||||
|
?.let(String::toInt)
|
||||||
|
?: Deflater.DEFAULT_COMPRESSION
|
||||||
|
val digestAlgorithm = el.renderAttribute("digest") ?: "MD5"
|
||||||
|
|
||||||
|
return InMemoryCacheConfiguration(
|
||||||
|
maxAge,
|
||||||
|
maxSize,
|
||||||
|
digestAlgorithm,
|
||||||
|
enableCompression,
|
||||||
|
compressionLevel
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun serialize(doc: Document, cache : InMemoryCacheConfiguration) = cache.run {
|
||||||
|
val result = doc.createElement("cache")
|
||||||
|
Xml.of(doc, result) {
|
||||||
|
val prefix = doc.lookupPrefix(RBCS.RBCS_NAMESPACE_URI)
|
||||||
|
attr("xs:type", "${prefix}:inMemoryCacheType", RBCS.XML_SCHEMA_NAMESPACE_URI)
|
||||||
|
attr("max-age", maxAge.toString())
|
||||||
|
attr("max-size", maxSize.toString())
|
||||||
|
digestAlgorithm?.let { digestAlgorithm ->
|
||||||
|
attr("digest", digestAlgorithm)
|
||||||
|
}
|
||||||
|
attr("enable-compression", compressionEnabled.toString())
|
||||||
|
compressionLevel.takeIf {
|
||||||
|
it != Deflater.DEFAULT_COMPRESSION
|
||||||
|
}?.let {
|
||||||
|
attr("compression-level", it.toString())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
}
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user