tailscale-proxy: unify HTTP+SOCKS on 3proxy with LAN-free / external-password auth

Retire the tinyproxy HTTP container (tinyproxy has no per-source-IP
conditional auth) and serve both the HTTP proxy (:3128) and SOCKS5 (:1080)
from a single 3proxy instance. LAN (192.168.0.0/22) stays passwordless;
any non-LAN source (i.e. external clients via the router port-forward) must
authenticate. Credentials live in a host-only /etc/3proxy/3proxy.secret
(0600, not in git), included by 3proxy.cfg. A deny rule on the gateway IP
makes the proxy fail closed if the port-forward ever SNATs to 192.168.0.1.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
2026-07-24 09:38:59 +03:00
co-authored by Claude Opus 4.8
parent 36376e60a1
commit 07c4495a03
3 changed files with 51 additions and 27 deletions
+11 -19
View File
@@ -15,13 +15,20 @@ services:
volumes: ["/mnt/containers/tailscale-proxy/state:/var/lib/tailscale:z"]
networks: [proxynet]
tinyproxy:
image: vimagick/tinyproxy:latest
# Unified 3proxy front: HTTP proxy (:3128) + SOCKS5 (:1080), LAN passwordless
# and external password-authenticated. Replaces the former tinyproxy HTTP
# container (tinyproxy cannot do per-source-IP conditional auth).
proxy:
image: ghcr.io/3proxy/3proxy:latest
container_name: ts-lan-proxy
restart: unless-stopped
depends_on: [ts-proxy]
volumes: ["/mnt/containers/tailscale-proxy/tinyproxy.conf:/etc/tinyproxy/tinyproxy.conf:ro,z"]
ports: ["192.168.0.35:3128:3128"]
volumes:
- "/mnt/containers/tailscale-proxy/3proxy.cfg:/etc/3proxy/3proxy.cfg:ro,z"
- "/mnt/containers/tailscale-proxy/3proxy.secret:/etc/3proxy/3proxy.secret:ro,z"
ports:
- "192.168.0.35:3128:3128"
- "192.168.0.35:1080:1080"
logging:
driver: syslog
options:
@@ -30,21 +37,6 @@ services:
tag: tailscale-proxy
networks: [proxynet]
socks5:
image: ghcr.io/3proxy/3proxy:latest
container_name: ts-lan-socks5
restart: unless-stopped
depends_on: [ts-proxy]
volumes: ["/mnt/containers/tailscale-proxy/3proxy.cfg:/etc/3proxy/3proxy.cfg:ro,z"]
ports: ["192.168.0.35:1080:1080"]
logging:
driver: syslog
options:
syslog-address: "udp://192.168.0.35:514"
syslog-format: rfc3164
tag: tailscale-socks5
networks: [proxynet]
networks:
proxynet:
name: tailscale-proxynet