pluralkit changes

Author: alyssa

.github/workflows/docker-publish-tags.yml

@@ -7,7 +7,7 @@ name: Docker
 
 on:
   push:
-    branches: [ main, dev ]
+    branches: [ main, dev, sliding-window-ratelimiter ]
     # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
   pull_request:
@@ -65,5 +65,5 @@ jobs:
           context: .
           platforms: "linux/amd64,linux/arm64/v8"
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ghcr.io/pluralkit/nirn-proxy:${{ github.sha }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -7,11 +7,8 @@ ARG TARGETARCH
 
 RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags '-extldflags "-static"' -tags timetzdata -buildvcs=false
 
-FROM scratch
+FROM alpine:latest
 COPY --from=app-builder /go/src/app/nirn-proxy /nirn-proxy
-# the tls certificates:
-# NB: this pulls directly from the upstream image, which already has ca-certificates:
-COPY --from=alpine:latest /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 EXPOSE 9000
 EXPOSE 8080
 ENTRYPOINT ["/nirn-proxy"]

lib/queue_manager.go

@@ -283,6 +283,17 @@ func (m *QueueManager) fulfillRequest(resp *http.ResponseWriter, req *http.Reque
 	routeToHeader := req.Header.Get("nirn-routed-to")
 	req.Header.Del("nirn-routed-to")
 
+	// clean up fp headers
+	for _, header := range []string{"x-forwarded-for", "x-forwarded-port", "x-forwarded-proto", "x-forwarded-ssl"} {
+		req.Header.Del(header)
+	}
+
+	for header, _ := range req.Header {
+		if strings.HasPrefix(header, "fly") {
+			req.Header.Del(header)
+		}
+	}
+
 	if routeToHeader != "" {
 		RequestsRoutedRecv.Inc()
 	}