Merge branch 'master' into dependabot/go_modules/golang.org/x/net-0.23.0

google · Oct 14, 2024 · 0564640 · 0564640
2 parents 352d39c + 4f3c733
commit 0564640
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/agent/Dockerfile b/agent/Dockerfile
@@ -26,15 +26,15 @@ ADD ./ /opt/src/github.com/google/inverting-proxy
 WORKDIR /opt/src/github.com/google/inverting-proxy
 
 
-RUN curl -o /opt/go1.21.7.linux-amd64.tar.gz \
-      https://storage.googleapis.com/golang/go1.21.7.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf /opt/go1.21.7.linux-amd64.tar.gz && \
+RUN curl -o /opt/go1.21.11.linux-amd64.tar.gz \
+      https://storage.googleapis.com/golang/go1.21.11.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf /opt/go1.21.11.linux-amd64.tar.gz && \
     export PATH=${PATH}:/usr/local/go/bin/:/opt/bin/ && \
     export GOPATH=/opt/ && \
     echo "Building Proxy Agent" && \
     go build -o ${GOPATH}/bin/proxy-forwarding-agent /opt/src/github.com/google/inverting-proxy/agent/agent.go && \
     echo "Clean up go files and preserve License" && \
-    rm -rf /opt/go1.21.7.linux-amd64.tar.gz && \    
+    rm -rf /opt/go1.21.11.linux-amd64.tar.gz && \    
     find /usr/local/go/ -mindepth 1 ! -name 'LICENSE' -exec rm -rf {} + || true
 
 ENV DEBUG "false"

diff --git a/agent/websockets/shim.go b/agent/websockets/shim.go
@@ -488,6 +488,7 @@ func createShimChannel(ctx context.Context, host, shimPath string, rewriteHost b
 			statusCode := http.StatusBadRequest
 			http.Error(w, fmt.Sprintf("attempt to read data from a closed session: %q", msg.ID), statusCode)
 			metricHandler.WriteResponseCodeMetric(statusCode)
+			connections.Delete(msg.ID)
 			return
 		} else if serverMsgs == nil {
 			statusCode := http.StatusRequestTimeout