librewolf
/
bunkerized-nginx
mirror of https://github.com/bunkerity/bunkerized-nginx
4
0
Fork 1
Code Issues Projects Releases Wiki Activity

Fix errors in the UI when a service have multiple domains

This commit is contained in:
Théophile Diot 2023-01-11 10:18:45 +01:00
parent d6d1dd1cef
commit f5d87849a9
No known key found for this signature in database
GPG Key ID: E752C80DB72BB014
2 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/ui/main.py
View File

@ -432,7 +432,9 @@ def services():
request.form["operation"] == "edit"
and variable != "SERVER_NAME"
and value
== config.get(f"{variables['SERVER_NAME']}_{variable}", None)
== config.get(
f"{variables['SERVER_NAME'].split(' ')[0]}_{variable}", None
)
or not value.strip()
):
del variables[variable]
@ -472,8 +474,8 @@ def services():
"services",
request.form["operation"],
variables,
request.form.get("OLD_SERVER_NAME", None),
request.form.get("SERVER_NAME", None),
request.form.get("OLD_SERVER_NAME", "").split(" ")[0],
variables.get("SERVER_NAME", "").split(" ")[0],
),
).start()
@ -482,11 +484,9 @@ def services():
if request.form["operation"] == "new":
message = f"Creating service {variables['SERVER_NAME'].split(' ')[0]}"
elif request.form["operation"] == "edit":
message = (
f"Saving configuration for service {request.form['OLD_SERVER_NAME']}"
)
message = f"Saving configuration for service {request.form['OLD_SERVER_NAME'].split(' ')[0]}"
elif request.form["operation"] == "delete":
message = f"Deleting service {request.form['SERVER_NAME']}"
message = f"Deleting service {request.form['SERVER_NAME'].split(' ')[0]}"
return redirect(url_for("loading", next=url_for("services"), message=message))
@ -496,15 +496,18 @@ def services():
"services.html",
services=[
{
"SERVER_NAME": service["SERVER_NAME"],
"USE_REVERSE_PROXY": service.get("USE_REVERSE_PROXY", "no"),
"SERVE_FILES": service.get("SERVE_FILES", "no"),
"REMOTE_PHP": service.get("REMOTE_PHP", "no"),
"AUTO_LETS_ENCRYPT": service.get("AUTO_LETS_ENCRYPT", "no"),
"USE_MODSECURITY": service.get("USE_MODSECURITY", "no"),
"USE_BAD_BEHAVIOR": service.get("USE_BAD_BEHAVIOR", "no"),
"USE_LIMIT_REQ": service.get("USE_LIMIT_REQ", "no"),
"USE_DNSBL": service.get("USE_DNSBL", "no"),
"SERVER_NAME": {
"value": service["SERVER_NAME"]["value"].split(" ")[0],
"method": service["SERVER_NAME"]["method"],
},
"USE_REVERSE_PROXY": service["USE_REVERSE_PROXY"],
"SERVE_FILES": service["SERVE_FILES"],
"REMOTE_PHP": service["REMOTE_PHP"],
"AUTO_LETS_ENCRYPT": service["AUTO_LETS_ENCRYPT"],
"USE_MODSECURITY": service["USE_MODSECURITY"],
"USE_BAD_BEHAVIOR": service["USE_BAD_BEHAVIOR"],
"USE_LIMIT_REQ": service["USE_LIMIT_REQ"],
"USE_DNSBL": service["USE_DNSBL"],
"settings": dumps(service),
}
for service in services

16
src/ui/src/Config.py
View File

@ -303,13 +303,19 @@ class Config:
"SERVER_NAME"
] in variables["SERVER_NAME"].split(" "):
if edit is False:
return f"Service {service['SERVER_NAME']} already exists.", 1
return (
f"Service {service['SERVER_NAME'].split(' ')[0]} already exists.",
1,
)
services.pop(i)
services.append(variables)
self.__gen_conf(self.get_config(methods=False), services)
return f"Configuration for {variables['SERVER_NAME']} has been generated.", 0
return (
f"Configuration for {variables['SERVER_NAME'].split(' ')[0]} has been generated.",
0,
)
def edit_service(self, old_server_name: str, variables: dict) -> Tuple[str, int]:
"""Edits a service
@ -336,7 +342,10 @@ class Config:
if error:
return message, error
return f"Configuration for {old_server_name} has been edited.", error
return (
f"Configuration for {old_server_name.split(' ')[0]} has been edited.",
error,
)
def edit_global_conf(self, variables: dict) -> str:
"""Edits the global conf
@ -374,6 +383,7 @@ class Config:
Exception
raises this if the service_name given isn't found
"""
service_name = service_name.split(" ")[0]
full_env = self.get_config(methods=False)
services = self.get_services(methods=False)
new_services = []