Remove java domain proxy.

Author: tecarter94

.tekton/domain-proxy-pull-request.yaml

@@ -27,9 +27,9 @@ spec:
   - name: image-expires-after
     value: 5d
   - name: dockerfile
-    value: /java-components/domain-proxy/src/main/docker/Dockerfile.all-in-one
+    value: /domain-proxy/Dockerfile.all-in-one
   - name: path-context
-    value: java-components
+    value: domain-proxy
   pipelineSpec:
     finally:
     - name: show-sbom

.tekton/domain-proxy-push.yaml

@@ -24,9 +24,9 @@ spec:
   - name: output-image
     value: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service/domain-proxy:{{revision}}
   - name: dockerfile
-    value: /java-components/domain-proxy/src/main/docker/Dockerfile.all-in-one
+    value: /domain-proxy/Dockerfile.all-in-one
   - name: path-context
-    value: java-components
+    value: domain-proxy
   pipelineSpec:
     finally:
     - name: show-sbom

Makefile

@@ -69,8 +69,9 @@ dev-image-controller:
 	docker push quay.io/$(QUAY_USERNAME)/hacbs-jvm-controller:"$${JBS_QUAY_IMAGE_TAG:-dev}"
 
 dev: dev-image-controller
-	cd java-components && mvn clean install -Dlocal -DskipTests -Ddev && cd ../domain-proxy-go && go build -o domain-proxy-server domain_proxy_server.go common.go && go build -o domain-proxy-client domain_proxy_client.go common.go && cd ..
-	docker build . -f domain-proxy-go/Dockerfile.local -t quay.io/$(QUAY_USERNAME)/hacbs-jvm-domain-proxy:"$${JBS_QUAY_IMAGE_TAG:-dev}"
+	cd java-components && mvn clean install -Dlocal -DskipTests -Ddev
+	cd domain-proxy && go build -o domain-proxy-server domain_proxy_server.go common.go && go build -o domain-proxy-client domain_proxy_client.go common.go
+	docker build . -f domain-proxy/Dockerfile.local -t quay.io/$(QUAY_USERNAME)/hacbs-jvm-domain-proxy:"$${JBS_QUAY_IMAGE_TAG:-dev}"
 	docker push quay.io/$(QUAY_USERNAME)/hacbs-jvm-domain-proxy:"$${JBS_QUAY_IMAGE_TAG:-dev}"
 
 dev-openshift: dev

domain-proxy-go/go.mod

@@ -11,5 +11,5 @@ USER 0
 RUN microdnf install -y iproute
 WORKDIR /work/
 
-COPY --from=builder /work/domain-proxy-go/domain-proxy-server /app/domain-proxy-server
-COPY --from=builder /work/domain-proxy-go/domain-proxy-client /app/domain-proxy-client
+COPY --from=builder /work/domain-proxy/domain-proxy-server /app/domain-proxy-server
+COPY --from=builder /work/domain-proxy/domain-proxy-client /app/domain-proxy-client

domain-proxy-go/Dockerfile.all-in-one renamed to domain-proxy/Dockerfile.all-in-one

@@ -1,6 +1,6 @@
 FROM quay.io/konflux-ci/buildah-task:latest@sha256:5cbd487022fb7ac476cbfdea25513b810f7e343ec48f89dc6a4e8c3c39fa37a2
 USER 0
 RUN microdnf install -y iproute
-COPY domain-proxy-go/domain-proxy-server /app/domain-proxy-server
-COPY domain-proxy-go/domain-proxy-client /app/domain-proxy-client
+COPY domain-proxy/domain-proxy-server /app/domain-proxy-server
+COPY domain-proxy/domain-proxy-client /app/domain-proxy-client
 

domain-proxy-go/Dockerfile.local renamed to domain-proxy/Dockerfile.local

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"io"
 	"log"
 	"net"
@@ -19,51 +20,55 @@ const (
 	ConnectionTimeoutKey     = "CONNECTION_TIMEOUT"
 	DefaultConnectionTimeout = 1000 * time.Millisecond
 	IdleTimeoutKey           = "IDLE_TIMEOUT"
-	DefaultIdleTimeout       = 10000 * time.Millisecond
+	DefaultIdleTimeout       = 1000 * time.Millisecond
 )
 
-func ChannelToChannelBiDirectionalHandler(leftConn, rightConn net.Conn, byteBufferSize int, idleTimeout time.Duration, executor *sync.WaitGroup) {
+func BiDirectionalTransfer(leftConn, rightConn net.Conn, byteBufferSize int, idleTimeout time.Duration, executor *sync.WaitGroup) {
 	defer executor.Done()
+	defer CloseConnections(leftConn, rightConn)
 	done := make(chan struct{})
-	var mutex sync.Mutex
-	go Transfer(leftConn, rightConn, done, byteBufferSize, idleTimeout, &mutex)
-	go Transfer(rightConn, leftConn, done, byteBufferSize, idleTimeout, &mutex)
+	leftConn.SetDeadline(time.Now().Add(idleTimeout))
+	rightConn.SetDeadline(time.Now().Add(idleTimeout))
+	go Transfer(leftConn, rightConn, done, byteBufferSize, idleTimeout)
+	go Transfer(rightConn, leftConn, done, byteBufferSize, idleTimeout)
 	<-done
 	<-done
-	CloseConnections(leftConn, rightConn)
 }
 
-func Transfer(targetConn, sourceConn net.Conn, done chan struct{}, bufferSize int, idleTimeout time.Duration, mutex *sync.Mutex) {
+func Transfer(targetConn, sourceConn net.Conn, done chan struct{}, bufferSize int, idleTimeout time.Duration) {
 	defer func() {
 		done <- struct{}{}
 	}()
 	buf := make([]byte, bufferSize)
-	mutex.Lock()
-	sourceConn.SetDeadline(time.Now().Add(idleTimeout))
-	targetConn.SetDeadline(time.Now().Add(idleTimeout))
-	mutex.Unlock()
 	for {
 		n, err := sourceConn.Read(buf)
 		if err != nil {
-			if err != io.EOF {
-				log.Printf("Error reading from source: %v", err)
-			}
+			handleConnectionError(err)
 			return
-		}
-		if n > 0 {
-			mutex.Lock()
-			sourceConn.SetDeadline(time.Now().Add(idleTimeout))
-			targetConn.SetDeadline(time.Now().Add(idleTimeout))
-			mutex.Unlock()
-			_, err = targetConn.Write(buf[:n])
+		} else if n > 0 {
+			log.Printf("%d bytes read", n)
+			sourceConn.SetReadDeadline(time.Now().Add(idleTimeout))
+			n, err = targetConn.Write(buf[:n])
 			if err != nil {
-				log.Printf("Error writing to target: %v", err)
+				handleConnectionError(err)
 				return
+			} else if n > 0 {
+				log.Printf("%d bytes written", n)
+				targetConn.SetWriteDeadline(time.Now().Add(idleTimeout))
 			}
 		}
 	}
 }
 
+func handleConnectionError(err error) {
+	var netErr net.Error
+	if errors.As(err, &netErr) && netErr.Timeout() {
+		log.Printf("Connection timed out")
+	} else if err != io.EOF {
+		log.Printf("Error using connection: %v", err)
+	}
+}
+
 func CloseConnections(leftConn, rightConn net.Conn) {
 	if leftConn != nil {
 		leftConn.Close()

domain-proxy-go/common.go renamed to domain-proxy/common.go

@@ -73,7 +73,7 @@ func (dpc *DomainProxyClient) startClient() {
 			continue
 		}
 		dpc.executor.Add(1)
-		go ChannelToChannelBiDirectionalHandler(serverConn, domainConn, dpc.byteBufferSize, dpc.idleTimeout, dpc.executor)
+		go BiDirectionalTransfer(serverConn, domainConn, dpc.byteBufferSize, dpc.idleTimeout, dpc.executor)
 	}
 }
 

domain-proxy-go/domain_proxy_client.go renamed to domain-proxy/domain_proxy_client.go

@@ -100,6 +100,7 @@ func (dps *DomainProxyServer) handleRequest(conn net.Conn) {
 		return
 	}
 	w := &responseWriter{conn: conn}
+	conn.SetDeadline(time.Now().Add(dps.idleTimeout))
 	if req.Method == http.MethodConnect {
 		dps.handleHttpsRequest(conn, w, req)
 	} else {
@@ -173,7 +174,7 @@ func (dps *DomainProxyServer) handleHttpsRequest(sourceConn net.Conn, w http.Res
 			return
 		}
 		dps.executor.Add(1)
-		go ChannelToChannelBiDirectionalHandler(sourceConn, targetConn, dps.byteBufferSize, dps.idleTimeout, dps.executor)
+		go BiDirectionalTransfer(sourceConn, targetConn, dps.byteBufferSize, dps.idleTimeout, dps.executor)
 	}
 }
 

domain-proxy-go/domain_proxy_server.go renamed to domain-proxy/domain_proxy_server.go

@@ -0,0 +1,3 @@
+module domain-proxy
+
+go 1.23