From 728f30eda2af1392555d2ba0637b24845d8b4a5c Mon Sep 17 00:00:00 2001
From: Junwei Zhao <wahyd4@gmail.com>
Date: Mon, 4 Jan 2021 22:46:42 +1100
Subject: [PATCH] removing X-Forwarded headers from incoming requests

---
 .github/workflows/dockerimage.yml | 3 ---
 Caddyfile                         | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 0bb7558..b326509 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -53,18 +53,15 @@ jobs:
         docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
     -
       name: Login to DockerHub
-      if: contains(github.ref, '/heads/master') || contains(github.ref, '/tags/v')
       uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKER_HUB_USER }}
         password: ${{ secrets.DOCKER_HUB_PASS }}
     -
       name: Push docker images to Dockerhub
-      if: contains(github.ref, '/heads/master') || contains(github.ref, '/tags/v')
       run: |
         docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
     -
       name: Inspect image
-      if: contains(github.ref, '/heads/master') || contains(github.ref, '/tags/v')
       run: |
         docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}
diff --git a/Caddyfile b/Caddyfile
index 14a351a..27d2330 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -4,6 +4,11 @@
 
 {$DOMAIN}
 
+request_header -X-Forwarded-Proto
+request_header -X-Forwarded-Port
+request_header -X-Forwarded-Host
+request_header -X-Forwarded-For
+
 redir /ui /ui/ 301
 redir /rclone /rclone/ 301