From 5cdd12dc8de26bd2635902f159727f0aa3e82627 Mon Sep 17 00:00:00 2001 From: Josh Feather Date: Fri, 12 Jun 2026 17:15:56 +0100 Subject: [PATCH 1/5] Update docs to reflect guac being handled by the main web app after #2964 The changes made in #2964 moved most of the guac URL handling to the main web app, leaving only the guacamole web socket being handled by the ASGI handler. This change updates the documentation to reflect the additional changes that need to be made in the CAPE nginx config to ensure correct URL routing --- extra/guac related/nginx-site-config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/guac related/nginx-site-config.txt b/extra/guac related/nginx-site-config.txt index 9ddef0b77a1..cbd1297a15a 100644 --- a/extra/guac related/nginx-site-config.txt +++ b/extra/guac related/nginx-site-config.txt @@ -37,7 +37,7 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } - location /guac/ { + location ^~ /guac/websocket-tunnel/ { proxy_pass http://127.0.0.1:8008; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header Host $host; From 363a9137f22cd8d7ee32172ea48564f27652db31 Mon Sep 17 00:00:00 2001 From: Josh Feather Date: Fri, 12 Jun 2026 17:18:09 +0100 Subject: [PATCH 2/5] Revert "Update web/web/guac_settings.py" This reverts commit 3b5c2dd68b261b51a59a2d6cbf7588929bc31da6. --- web/web/guac_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/web/guac_settings.py b/web/web/guac_settings.py index 62d38265166..6989cb05e97 100644 --- a/web/web/guac_settings.py +++ b/web/web/guac_settings.py @@ -39,7 +39,7 @@ LOGGING_CONFIG = None -WEB_AUTHENTICATION = getattr(Config("web"), "web_auth", {}).get("enabled", False) +WEB_AUTHENTICATION = Config("web").web_auth.get("enabled", False) ALLOWED_HOSTS = [ "*", From b369caee0a4c7a7fb7f5613c7daa7fbcec86e575 Mon Sep 17 00:00:00 2001 From: Josh Feather Date: Fri, 12 Jun 2026 17:18:34 +0100 Subject: [PATCH 3/5] Revert "Update web/web/guac_settings.py" This reverts commit 756dde858cf7ef5fcd43990b005e93f27d4b158f. --- web/web/guac_settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/web/guac_settings.py b/web/web/guac_settings.py index 6989cb05e97..475a7d3a3d9 100644 --- a/web/web/guac_settings.py +++ b/web/web/guac_settings.py @@ -4,11 +4,11 @@ from pathlib import Path from django.utils.log import DEFAULT_LOGGING +from lib.cuckoo.common.config import Config + CUCKOO_PATH = os.path.join(Path.cwd(), "..") sys.path.append(CUCKOO_PATH) -from lib.cuckoo.common.config import Config - # Build paths inside the project like this: BASE_DIR / "subdir". BASE_DIR = Path(__file__).resolve().parent.parent From 16d5a205483a18f87b6619268afb9551b9f191f6 Mon Sep 17 00:00:00 2001 From: Josh Feather Date: Fri, 12 Jun 2026 17:18:46 +0100 Subject: [PATCH 4/5] Revert "guac: add AuthenticationMiddleware for login_required" This reverts commit 640e93752d24be7b95c3664c391d113a8f9aecd2. --- web/web/guac_settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/web/guac_settings.py b/web/web/guac_settings.py index 475a7d3a3d9..ec3290c4c93 100644 --- a/web/web/guac_settings.py +++ b/web/web/guac_settings.py @@ -58,7 +58,6 @@ MIDDLEWARE = [ "django.contrib.sessions.middleware.SessionMiddleware", - "django.contrib.auth.middleware.AuthenticationMiddleware", "django.middleware.common.CommonMiddleware", "django.middleware.csrf.CsrfViewMiddleware", "django.contrib.messages.middleware.MessageMiddleware", From 238e4a88ad7fce1735480b12b69ffa5ee7eb3ee1 Mon Sep 17 00:00:00 2001 From: Josh Feather Date: Fri, 12 Jun 2026 17:18:56 +0100 Subject: [PATCH 5/5] Revert "guac: define WEB_AUTHENTICATION in guac_settings" This reverts commit 4912006daeb452431da91ea20cf4b9cc4d92901b. --- web/web/guac_settings.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/web/guac_settings.py b/web/web/guac_settings.py index ec3290c4c93..7d67608b652 100644 --- a/web/web/guac_settings.py +++ b/web/web/guac_settings.py @@ -4,7 +4,6 @@ from pathlib import Path from django.utils.log import DEFAULT_LOGGING -from lib.cuckoo.common.config import Config CUCKOO_PATH = os.path.join(Path.cwd(), "..") sys.path.append(CUCKOO_PATH) @@ -39,8 +38,6 @@ LOGGING_CONFIG = None -WEB_AUTHENTICATION = Config("web").web_auth.get("enabled", False) - ALLOWED_HOSTS = [ "*", ] @@ -182,3 +179,4 @@ from lib.cuckoo.core.data.guac_session import GuacSession # noqa: F401 from lib.cuckoo.core.data.db_common import Base Base.metadata.create_all(_db.engine) +