From c9d4969e2583481c5d51ec29217aa2e472ed88b6 Mon Sep 17 00:00:00 2001 From: Roger Joys Date: Mon, 30 Mar 2026 10:25:19 -0700 Subject: [PATCH] Jinja2 fix, JFHR support, template.render() bypass for cache bug --- .env.example | 0 .gitignore | 0 .idea/.gitignore | 0 .idea/misc.xml | 0 .idea/modules.xml | 0 .idea/unifi-guest-portal.iml | 0 .idea/vcs.xml | 0 Dockerfile | 0 README.md | 0 app/__init__.py | 0 app/auth.py | 0 app/config.py | 0 app/main.py | 24 ++++++++++++++++-------- app/static/pup.jpg | Bin app/templates/base.html | 0 app/templates/enroll-success.html | 0 app/templates/error.html | 0 app/templates/success.html | 0 app/unifi.py | 0 docker-compose.yml | 0 nginx.conf | 0 requirements.txt | 0 22 files changed, 16 insertions(+), 8 deletions(-) mode change 100644 => 100755 .env.example mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .idea/.gitignore mode change 100644 => 100755 .idea/misc.xml mode change 100644 => 100755 .idea/modules.xml mode change 100644 => 100755 .idea/unifi-guest-portal.iml mode change 100644 => 100755 .idea/vcs.xml mode change 100644 => 100755 Dockerfile mode change 100644 => 100755 README.md mode change 100644 => 100755 app/__init__.py mode change 100644 => 100755 app/auth.py mode change 100644 => 100755 app/config.py mode change 100644 => 100755 app/main.py mode change 100644 => 100755 app/static/pup.jpg mode change 100644 => 100755 app/templates/base.html mode change 100644 => 100755 app/templates/enroll-success.html mode change 100644 => 100755 app/templates/error.html mode change 100644 => 100755 app/templates/success.html mode change 100644 => 100755 app/unifi.py mode change 100644 => 100755 docker-compose.yml mode change 100644 => 100755 nginx.conf mode change 100644 => 100755 requirements.txt diff --git a/.env.example b/.env.example old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.idea/.gitignore b/.idea/.gitignore old mode 100644 new mode 100755 diff --git a/.idea/misc.xml b/.idea/misc.xml old mode 100644 new mode 100755 diff --git a/.idea/modules.xml b/.idea/modules.xml old mode 100644 new mode 100755 diff --git a/.idea/unifi-guest-portal.iml b/.idea/unifi-guest-portal.iml old mode 100644 new mode 100755 diff --git a/.idea/vcs.xml b/.idea/vcs.xml old mode 100644 new mode 100755 diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/app/__init__.py b/app/__init__.py old mode 100644 new mode 100755 diff --git a/app/auth.py b/app/auth.py old mode 100644 new mode 100755 diff --git a/app/config.py b/app/config.py old mode 100644 new mode 100755 diff --git a/app/main.py b/app/main.py old mode 100644 new mode 100755 index 224f6ce..d62418a --- a/app/main.py +++ b/app/main.py @@ -114,11 +114,19 @@ async def callback(request: Request, code: str, state: str): "message": "Failed to authorize your device. Please try again or ask for help." }) - return templates.TemplateResponse("success.html", { - "request": request, - "site": site, - "userinfo": userinfo, - "duration_hours": duration // 60, - "original_url": original_url, - "user_agent": user_agent, - }) \ No newline at end of file + + try: + template = templates.env.get_template("success.html") + html = template.render( + request=request, + site={"id": site.id, "name": site.name}, + userinfo=userinfo, + duration_hours=duration // 60, + original_url=original_url, + user_agent=user_agent, + ) + return HTMLResponse(html) + except Exception as e: + logger.error("Success template error: %s", str(e)) + return RedirectResponse(original_url or "http://captive.apple.com/hotspot-detect.html") + diff --git a/app/static/pup.jpg b/app/static/pup.jpg old mode 100644 new mode 100755 diff --git a/app/templates/base.html b/app/templates/base.html old mode 100644 new mode 100755 diff --git a/app/templates/enroll-success.html b/app/templates/enroll-success.html old mode 100644 new mode 100755 diff --git a/app/templates/error.html b/app/templates/error.html old mode 100644 new mode 100755 diff --git a/app/templates/success.html b/app/templates/success.html old mode 100644 new mode 100755 diff --git a/app/unifi.py b/app/unifi.py old mode 100644 new mode 100755 diff --git a/docker-compose.yml b/docker-compose.yml old mode 100644 new mode 100755 diff --git a/nginx.conf b/nginx.conf old mode 100644 new mode 100755 diff --git a/requirements.txt b/requirements.txt old mode 100644 new mode 100755