Skip to content

[pull] master from kevoreilly:master #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Jun 15, 2026
+3 −6
Merged

[pull] master from kevoreilly:master #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5cdd12d
Update docs to reflect guac being handled by the main web app after #…
josh-feather Jun 12, 2026
363a913
Revert "Update web/web/guac_settings.py"
josh-feather Jun 12, 2026
b369cae
Revert "Update web/web/guac_settings.py"
josh-feather Jun 12, 2026
16d5a20
Revert "guac: add AuthenticationMiddleware for login_required"
josh-feather Jun 12, 2026
238e4a8
Revert "guac: define WEB_AUTHENTICATION in guac_settings"
josh-feather Jun 12, 2026
1255b18
Merge pull request #3071 from josh-feather/update-guac-config-after-a…
enzok Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extra/guac related/nginx-site-config.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 2 additions & 5 deletions web/web/guac_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
from pathlib import Path

from django.utils.log import DEFAULT_LOGGING

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

Expand Down Expand Up @@ -39,8 +38,6 @@

LOGGING_CONFIG = None

WEB_AUTHENTICATION = getattr(Config("web"), "web_auth", {}).get("enabled", False)

ALLOWED_HOSTS = [
"*",
]
Expand All @@ -58,7 +55,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",
Expand Down Expand Up @@ -183,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)

Loading