Addition of upstream proxy to resolve slice redirect errors (302 Playstation) (#156)

Addition of Upstream proxy from #60 to test 302 cache impact on PS5
caching
Refactored upstream proxy into lancache standard structure.
Simplified both location blocks into a single file rather than further
delegated folders
Fixed spacing & indents

Dockerfile

@@ -3,6 +3,9 @@ LABEL version=3
 LABEL description="Single caching container for caching game content at LAN parties."
 LABEL maintainer="LanCache.Net Team <team@lancache.net>"
 
+RUN	apt-get update							;\
+	apt-get install -y jq git				;
+
 ENV GENERICCACHE_VERSION=2 \
     CACHE_MODE=monolithic \
     WEBUSER=www-data \
@@ -31,12 +34,10 @@ RUN rm /etc/nginx/sites-enabled/* /etc/nginx/stream-enabled/* ;\
     chown -R ${WEBUSER}:${WEBUSER} /data/	;\
     mkdir -p /etc/nginx/sites-enabled	;\
     ln -s /etc/nginx/sites-available/10_cache.conf /etc/nginx/sites-enabled/10_generic.conf; \
-	ln -s /etc/nginx/stream-available/10_sni.conf /etc/nginx/stream-enabled/10_sni.conf
-
-RUN mkdir -m 755 -p /data/cachedomains		;\
-	mkdir -m 755 -p /tmp/nginx				;\
-	apt-get update							;\
-	apt-get install -y jq git				;
+    ln -s /etc/nginx/sites-available/20_upstream.conf /etc/nginx/sites-enabled/20_upstream.conf; \
+    ln -s /etc/nginx/stream-available/10_sni.conf /etc/nginx/stream-enabled/10_sni.conf; \
+    mkdir -m 755 -p /data/cachedomains		;\
+    mkdir -m 755 -p /tmp/nginx
 
 RUN git clone --depth=1 --no-single-branch https://github.com/uklans/cache-domains/ /data/cachedomains
 

overlay/etc/nginx/nginx.conf

@@ -25,6 +25,7 @@ http {
   error_log /var/log/nginx/error.log;
 
 
+
   gzip on;
 
   include /etc/nginx/conf.d/*.conf;
@@ -37,3 +38,4 @@ stream {
   include /etc/nginx/stream.d/*.conf; 
   include /etc/nginx/stream-enabled/*;
 }                                       
+

overlay/etc/nginx/sites-available/10_cache.conf

@@ -1,3 +1,5 @@
+# Primary monolithic cache engine
+
 server {
   listen 80 reuseport;
 

overlay/etc/nginx/sites-available/20_upstream.conf

@@ -0,0 +1,17 @@
+# Upstream server to proxy and handle inconsistent 302 redirects
+# All cache traffic is passed through this proxy to allow rewriting of redirects without caching
+
+# This is particularly important for sony / ps5 as upstreams redirect between them which confuses slice map on caching
+
+server {
+
+  # Internal bind on 3128, this should not be externally mapped
+  listen localhost:3128 reuseport;
+
+  # No access_log tracking as all requests to this instance are already logged through monolithic
+
+  # access_log /data/logs/upstream-access.log cachelog;
+  error_log /data/logs/upstream-error.log;
+
+  include /etc/nginx/sites-available/upstream.conf.d/*.conf;
+}

overlay/etc/nginx/sites-available/cache.conf.d/root/20_cache.conf

@@ -31,5 +31,3 @@
 
     # 40G max file
     proxy_max_temp_file_size 40960m;
-
-

overlay/etc/nginx/sites-available/cache.conf.d/root/90_upstream.conf

@@ -1,6 +1,9 @@
     # Upstream Configuration
     proxy_next_upstream error timeout http_404;
-    proxy_pass http://$host$request_uri;
+
+    # Proxy into the redirect handler
+    proxy_pass http://127.0.0.1:3128$request_uri;
+
     proxy_redirect off;
     proxy_ignore_client_abort on;
 

overlay/etc/nginx/sites-available/upstream.conf.d/10_resolver.conf

@@ -0,0 +1,2 @@
+  resolver UPSTREAM_DNS ipv6=off;
+

overlay/etc/nginx/sites-available/upstream.conf.d/20_tracking.conf

@@ -0,0 +1,2 @@
+  # Header to track if resolved from upstream or 302 redirect
+  set $orig_loc 'upstream';

overlay/etc/nginx/sites-available/upstream.conf.d/30_primary_proxy.conf

@@ -0,0 +1,9 @@
+  # Proxy all requests to upstream
+  location / {
+    # Simple proxy the request
+    proxy_pass http://$host$request_uri;
+
+    # Catch the errors to process the redirects
+    proxy_intercept_errors on;
+    error_page 301 302 307 = @upstream_redirect;
+  }

overlay/etc/nginx/sites-available/upstream.conf.d/40_redirect_proxy.conf

@@ -0,0 +1,11 @@
+  # Special location block to handle 302 redirects
+  location @upstream_redirect {
+    # Upstream_http_location contains the Location: redirection from the upstream server
+    set $saved_upstream_location '$upstream_http_location';
+
+    # Set debug header
+    set $orig_loc 'upstream-302';
+
+    # Pass to proxy and reproxy the request
+    proxy_pass $saved_upstream_location;
+  }

overlay/hooks/entrypoint-pre.d/10_setup.sh

@@ -17,4 +17,5 @@ sed -i "s/CACHE_MAX_AGE/${CACHE_MAX_AGE}/" /etc/nginx/conf.d/20_proxy_cache_path
 sed -i "s/CACHE_MAX_AGE/${CACHE_MAX_AGE}/"    /etc/nginx/sites-available/cache.conf.d/root/20_cache.conf
 sed -i "s/slice 1m;/slice ${CACHE_SLICE_SIZE};/" /etc/nginx/sites-available/cache.conf.d/root/20_cache.conf
 sed -i "s/UPSTREAM_DNS/${UPSTREAM_DNS}/"    /etc/nginx/sites-available/cache.conf.d/10_root.conf
+sed -i "s/UPSTREAM_DNS/${UPSTREAM_DNS}/"    /etc/nginx/sites-available/upstream.conf.d/10_resolver.conf
 sed -i "s/UPSTREAM_DNS/${UPSTREAM_DNS}/"    /etc/nginx/stream-available/10_sni.conf