improved logging

.gitea/workflows/build-dev.yaml

@@ -5,7 +5,7 @@ on:
       - 'dev'
 jobs:
   build:
-    runs-on: hostinger
+    runs-on: woryzen
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -18,12 +18,6 @@ jobs:
       - name: Get project version
         id: retrieve-version
         run: ./gradlew -q version >> "$GITHUB_OUTPUT"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver: docker-container
       - name: Login to Gitea container registry
         uses: docker/login-action@v3
         with:
@@ -34,6 +28,7 @@ jobs:
         name: Build rbcs Docker image
         uses: docker/build-push-action@v5.3.0
         with:
+          builder: "multiplatform-builder"
           context: "docker/build/docker"
           platforms: linux/amd64,linux/arm64
           push: true
@@ -41,11 +36,11 @@ jobs:
           tags: |
             gitea.woggioni.net/woggioni/rbcs:vanilla-dev
           target: release-vanilla
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/rbcs:buildx
       -
         name: Build rbcs memcache Docker image
         uses: docker/build-push-action@v5.3.0
         with:
+          builder: "multiplatform-builder"
           context: "docker/build/docker"
           platforms: linux/amd64,linux/arm64
           push: true
@@ -53,12 +48,11 @@ jobs:
           tags: |
             gitea.woggioni.net/woggioni/rbcs:memcache-dev
           target: release-memcache
-          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/rbcs:buildx
       -
         name: Build rbcs native Docker image
         uses: docker/build-push-action@v5.3.0
         with:
+          builder: "multiplatform-builder"
           context: "docker/build/docker"
           platforms: linux/amd64
           push: true
@@ -70,6 +64,7 @@ jobs:
         name: Build rbcs jlink Docker image
         uses: docker/build-push-action@v5.3.0
         with:
+          builder: "multiplatform-builder"
           context: "docker/build/docker"
           platforms: linux/amd64
           push: true

.gitea/workflows/build.yaml

@@ -18,12 +18,6 @@ jobs:
       - name: Get project version
         id: retrieve-version
         run: ./gradlew -q version >> "$GITHUB_OUTPUT"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver: docker-container
       - name: Login to Gitea container registry
         uses: docker/login-action@v3
         with:
@@ -34,6 +28,7 @@ jobs:
         name: Build rbcs Docker image
         uses: docker/build-push-action@v5.3.0
         with:
+          builder: "multiplatform-builder"
           context: "docker/build/docker"
           platforms: linux/amd64,linux/arm64
           push: true
@@ -42,11 +37,11 @@ jobs:
             gitea.woggioni.net/woggioni/rbcs:vanilla
             gitea.woggioni.net/woggioni/rbcs:vanilla-${{ steps.retrieve-version.outputs.VERSION }}
           target: release-vanilla
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/rbcs:buildx
       -
         name: Build rbcs memcache Docker image
         uses: docker/build-push-action@v5.3.0
         with:
+          builder: "multiplatform-builder"
           context: "docker/build/docker"
           platforms: linux/amd64,linux/arm64
           push: true
@@ -57,12 +52,11 @@ jobs:
             gitea.woggioni.net/woggioni/rbcs:memcache
             gitea.woggioni.net/woggioni/rbcs:memcache-${{ steps.retrieve-version.outputs.VERSION }}
           target: release-memcache
-          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/rbcs:buildx
       -
         name: Build rbcs native Docker image
         uses: docker/build-push-action@v5.3.0
         with:
+          builder: "multiplatform-builder"
           context: "docker/build/docker"
           platforms: linux/amd64
           push: true
@@ -75,6 +69,7 @@ jobs:
         name: Build rbcs jlink Docker image
         uses: docker/build-push-action@v5.3.0
         with:
+          builder: "multiplatform-builder"
           context: "docker/build/docker"
           platforms: linux/amd64
           push: true

rbcs-cli/native-image/native-image.properties

@@ -1,2 +1,2 @@
-Args=-O3 -march=x86-64-v2 --gc=serial --install-exit-handlers --initialize-at-run-time=io.netty --enable-url-protocols=jpms --initialize-at-build-time=net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory,net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory$JpmsHandler
+Args=-O3 -march=x86-64-v2 --gc=serial --initialize-at-run-time=io.netty --enable-url-protocols=jpms -H:+UnlockExperimentalVMOptions -H:+SharedArenaSupport --initialize-at-build-time=net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory,net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory$JpmsHandler
 #-H:TraceClassInitialization=io.netty.handler.ssl.BouncyCastleAlpnSslUtils

rbcs-common/src/test/kotlin/net/woggioni/rbcs/common/CidrTest.kt

@@ -0,0 +1,17 @@
+package net.woggioni.rbcs.common
+
+import java.net.InetAddress
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+class CidrTest {
+    class CidrTest {
+        @Test
+        fun test() {
+            val cidr = Cidr.from("2a02:4780:12:368b::1/128")
+            Assertions.assertTrue {
+                cidr.contains(InetAddress.ofLiteral("2a02:4780:12:368b::1"))
+            }
+        }
+    }
+}

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/handler/ProxyProtocolHandler.kt

@@ -24,14 +24,21 @@ class ProxyProtocolHandler(private val trustedProxyIPs : List<Cidr>) : SimpleCha
         val sourceAddress = ctx.channel().remoteAddress()
         if (sourceAddress is InetSocketAddress &&
             trustedProxyIPs.isEmpty() ||
-            trustedProxyIPs.any { it.contains((sourceAddress as InetSocketAddress).address) }) {
+            trustedProxyIPs.any { it.contains((sourceAddress as InetSocketAddress).address) }.also {
+                if(!it && log.isTraceEnabled) {
+                    log.trace {
+                        "Received a proxied connection request from $sourceAddress which is not a trusted proxy address, " +
+                                "the proxy server address will be used instead"
+                    }
+                }
+            }) {
             val proxiedClientAddress = InetSocketAddress(
                 InetAddress.ofLiteral(msg.sourceAddress()),
                 msg.sourcePort()
             )
             if(log.isTraceEnabled) {
                 log.trace {
-                    "Received proxied request from $sourceAddress forwarded for $proxiedClientAddress"
+                    "Received proxied connection request from $sourceAddress forwarded for $proxiedClientAddress"
                 }
             }
             ctx.channel().attr(RemoteBuildCacheServer.clientIp).set(proxiedClientAddress)