Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update raw mode formatting

Browse source
This commit is contained in:
Jordan Blasenhauer 2024-08-08 17:16:54 +02:00
parent 09983cdcca
commit 428169dcd4
4 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ui/client/dashboard/pages/modes/index.html
View file

File diff suppressed because one or more lines are too long

53
src/ui/client/tests/builder/utils/form.py
View file

@ -2,6 +2,17 @@ import copy
from typing import Union
def get_setting_data(template_settings: dict, settings: dict, setting: str, value: dict) -> tuple:
template_value = template_settings.get(setting, None)
current_value = settings[setting].get("value", None)
default_value = value.get("default")
is_disabled_method = settings.get(setting, {}).get("method", "ui") not in ("ui", "default", "manual")
is_current_from_template = settings[setting].get("template", None) and template_value is not None
is_current_default = current_value is not None and current_value == default_value
setting_value = current_value if current_value is not None else default_value
return template_value, current_value, default_value, is_disabled_method, is_current_from_template, is_current_default, setting_value
def get_service_settings(service_name: str, global_config: dict, total_config: dict) -> dict:
"""
total_config is a dict that contains global settings and services settings (format SERVICE_NAME_SETTING - www.example.com_USE_ANTIBOT for example -).
@ -154,43 +165,27 @@ def set_raw(template: list, plugins_base: list, settings: dict, is_new: bool) ->
for plugin in plugins:
for setting, value in plugin.get("settings").items():
# we want to show disabled method on raw mode
# Avoid issue with multiple settings
if not setting in settings:
continue
# if setting in settings and settings[setting].get("method", "ui") not in ("ui", "default", "manual") and :
template_value, current_value, default_value, is_disabled_method, is_current_from_template, is_current_default, setting_value = get_setting_data(
template_settings, settings, setting, value
)
# We want to show any methods on raw mode
# if is_disabled_method :
# continue
template_value = template_settings.get(setting, None)
current_value = settings[setting].get("value", None)
default_value = value.get("default")
is_disabled_method = settings.get(setting, {}).get("method", "ui") not in ("ui", "default", "manual")
is_current_from_template = settings[setting].get("template", None) and template_value is not None
is_current_default = current_value is not None and current_value == default_value
# setting value is the current (custom one) if exists or fallback to default
setting_value = current_value if current_value is not None else default_value
# Cases we set the setting value
# 1 - the value is from a disabled method
# 2 - no template value
if is_disabled_method or not is_disabled_method and template_value is None:
raw_settings[setting] = setting_value
if current_value is not None and not is_current_default:
raw_settings[setting] = current_value
continue
# Cases we can override by template value
# 1 - the current value is default and from template
# 2 - the current value is default and not from template
# 3 - the current value is not default but from template
if template_value is not None and (
(is_current_default and is_current_from_template)
or (not is_current_from_template and is_current_default)
or (is_current_from_template and not is_current_default)
):
if template_value is not None:
raw_settings[setting] = template_value
continue
# Case the current value is not default and not from template, we can't override
# Or any others cases, we set this fallback
raw_settings[setting] = setting_value
return raw_settings

8
src/ui/client/tests/raw.json
View file

@ -52,6 +52,12 @@
"USE_ANTIBOT": "yes",
"ANTIBOT_URI": "/challenge",
"ANTIBOT_RECAPTCHA_SCORE": "0.7",
"ANTIBOT_RECAPTCHA_SITEKEY": "",
"ANTIBOT_RECAPTCHA_SECRET": "",
"ANTIBOT_HCAPTCHA_SITEKEY": "",
"ANTIBOT_HCAPTCHA_SECRET": "",
"ANTIBOT_TURNSTILE_SITEKEY": "",
"ANTIBOT_TURNSTILE_SECRET": "",
"USE_BAD_BEHAVIOR": "yes",
"BAD_BEHAVIOR_STATUS_CODES": "400 401 403 404 405 429 444",
"BAD_BEHAVIOR_THRESHOLD": "30",
@ -71,6 +77,7 @@
"KEEP_UPSTREAM_HEADERS": "Content-Security-Policy Permissions-Policy X-Frame-Options",
"STRICT_TRANSPORT_SECURITY": "max-age=31536000; includeSubDomains; preload",
"COOKIE_FLAGS": "* SameSite=Lax",
"CONTENT_SECURITY_POLICY": "",
"REFERRER_POLICY": "no-referrer-when-downgrade",
"PERMISSIONS_POLICY": "accelerometer=(), ambient-light-sensor=(), attribution-reporting=(), autoplay=(), battery=(), bluetooth=(), browsing-topics=(), camera=(), compute-pressure=(), display-capture=(), document-domain=(), encrypted-media=(), execution-while-not-rendered=(), execution-while-out-of-viewport=(), fullscreen=(), gamepad=(), geolocation=(), gyroscope=(), hid=(), identity-credentials-get=(), idle-detection=(), local-fonts=(), magnetometer=(), microphone=(), midi=(), otp-credentials=(), payment=(), picture-in-picture=(), publickey-credentials-create=(), publickey-credentials-get=(), screen-wake-lock=(), serial=(), speaker-selection=(), storage-access=(), usb=(), web-share=(), window-management=(), xr-spatial-tracking=()",
"AUTO_LETS_ENCRYPT": "yes",
@ -89,6 +96,7 @@
"HTTP3": "yes",
"MODSECURITY_CRS_VERSION": "4",
"USE_REVERSE_PROXY": "yes",
"REVERSE_PROXY_CUSTOM_HOST": "",
"REVERSE_PROXY_HOST": "http://app1:8080",
"REVERSE_PROXY_URL": "/",
"REVERSE_PROXY_WS": "no",

2
src/ui/client/tests/raw.txt
View file

File diff suppressed because one or more lines are too long