Compare commits

..

1 Commits

Author SHA1 Message Date
4a2fb750a0 Testing with real IP 2026-04-01 12:22:38 +02:00
3 changed files with 11 additions and 11 deletions

View File

@@ -46,7 +46,7 @@ jobs:
needs: [prepare_context] needs: [prepare_context]
if: github.event_name == 'pull_request' && github.event.action != 'closed' if: github.event_name == 'pull_request' && github.event.action != 'closed'
steps: steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
- name: Deploy via Rsync & Docker - name: Deploy via Rsync & Docker
uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1 uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1
@@ -75,7 +75,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.ref == 'refs/heads/main' if: github.ref == 'refs/heads/main'
steps: steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
- name: Deploy via Rsync & Docker - name: Deploy via Rsync & Docker
uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1 uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1
@@ -102,7 +102,7 @@ jobs:
needs: [deploy_staging] needs: [deploy_staging]
if: github.ref == 'refs/heads/main' if: github.ref == 'refs/heads/main'
steps: steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
- name: Deploy via Rsync & Docker - name: Deploy via Rsync & Docker
uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1 uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1
@@ -139,7 +139,7 @@ jobs:
if: github.event_name == 'pull_request' && (github.event.action == 'closed' || github.event.pull_request.merged == true) if: github.event_name == 'pull_request' && (github.event.action == 'closed' || github.event.pull_request.merged == true)
steps: steps:
- name: Remove Remote Environment - name: Remove Remote Environment
uses: appleboy/ssh-action@0ff4204d59e8e51228ff73bce53f80d53301dee2 # v1.2.5 uses: appleboy/ssh-action@823bd89e131d8d508129f9443cad5855e9ba96f0 # v1.2.4
with: with:
host: ${{ env.SSH_HOST }} host: ${{ env.SSH_HOST }}
username: ${{ env.SSH_USER }} username: ${{ env.SSH_USER }}

View File

@@ -1,6 +1,6 @@
services: services:
traefik: traefik:
image: "traefik:v3.6@sha256:5d1de6bc6984699e4447787a0e7904437aaea542fecf0fccb79c8c743c7248c8" image: "traefik:v3.6@sha256:67622638cd88dbfcfba40159bc652ecf0aea0e032f8a3c7e3134ae7c037b9910"
restart: unless-stopped restart: unless-stopped
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true

View File

@@ -7,8 +7,8 @@ DOMAIN = os.getenv("DOMAIN", "dev.kovagoadi.hu")
PORT = os.getenv("PORT", "898") PORT = os.getenv("PORT", "898")
HTTPS_PORT = os.getenv("HTTPS_PORT", "446") HTTPS_PORT = os.getenv("HTTPS_PORT", "446")
BASE_URL = f"http://127.0.0.1:{PORT}" BASE_URL = f"http://192.168.1.85:{PORT}"
HTTPS_BASE_URL = f"https://127.0.0.1:{HTTPS_PORT}" HTTPS_BASE_URL = f"https://192.168.1.85:{HTTPS_PORT}"
HOST_HEADER = f"test-whoami.{DOMAIN}" HOST_HEADER = f"test-whoami.{DOMAIN}"
@pytest.fixture(scope="session", autouse=True) @pytest.fixture(scope="session", autouse=True)
@@ -122,7 +122,7 @@ def test_whoami_https_reachable():
# We use curl because requests doesn't support --resolve easily to force SNI with custom IP # We use curl because requests doesn't support --resolve easily to force SNI with custom IP
cmd = [ cmd = [
"curl", "-s", "-k", "--fail", "curl", "-s", "-k", "--fail",
"--resolve", f"{HOST_HEADER}:{HTTPS_PORT}:127.0.0.1", "--resolve", f"{HOST_HEADER}:{HTTPS_PORT}:192.168.1.85",
f"https://{HOST_HEADER}:{HTTPS_PORT}" f"https://{HOST_HEADER}:{HTTPS_PORT}"
] ]
try: try:
@@ -159,7 +159,7 @@ def test_unknown_host_https_passthrough():
# unknown.com should hit the catch-all SNI router # unknown.com should hit the catch-all SNI router
cmd = [ cmd = [
"curl", "-s", "-k", "-i", "--fail", "curl", "-s", "-k", "-i", "--fail",
"--resolve", f"tar.kovagoadi.hu:{HTTPS_PORT}:127.0.0.1", "--resolve", f"tar.kovagoadi.hu:{HTTPS_PORT}:192.168.1.85",
f"https://tar.kovagoadi.hu:{HTTPS_PORT}/login" f"https://tar.kovagoadi.hu:{HTTPS_PORT}/login"
] ]
try: try:
@@ -193,7 +193,7 @@ def test_staging_https_routing():
host = "test-whoami.staging.kovagoadi.hu" host = "test-whoami.staging.kovagoadi.hu"
cmd = [ cmd = [
"curl", "-s", "-k", "-i", "--fail", "curl", "-s", "-k", "-i", "--fail",
"--resolve", f"{host}:{HTTPS_PORT}:127.0.0.1", "--resolve", f"{host}:{HTTPS_PORT}:192.168.1.85",
f"https://{host}:{HTTPS_PORT}" f"https://{host}:{HTTPS_PORT}"
] ]
try: try:
@@ -209,7 +209,7 @@ def test_dev_https_routing():
host = "test-whoami.dev.kovagoadi.hu" host = "test-whoami.dev.kovagoadi.hu"
cmd = [ cmd = [
"curl", "-s", "-k", "-i", "--fail", "curl", "-s", "-k", "-i", "--fail",
"--resolve", f"{host}:{HTTPS_PORT}:127.0.0.1", "--resolve", f"{host}:{HTTPS_PORT}:192.168.1.85",
f"https://{host}:{HTTPS_PORT}" f"https://{host}:{HTTPS_PORT}"
] ]
try: try: