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

Review upgrade process to optimize a few things and add warns about the new way of handling ui users

Browse source
This commit is contained in:
Théophile Diot 2024-08-02 11:55:49 +01:00
parent 5e258e8b0d
commit 516b654923
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
3 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/common/db/Database.py
View file

@ -394,6 +394,7 @@ class Database:
"last_instances_change": None,
"integration": "unknown",
"version": "1.6.0-beta",
"ui_version": "1.6.0-beta",
"database_version": "Unknown", # ? Extracted from the database
"default": True, # ? Extra field to know if the returned data is the default one
}
@ -562,7 +563,7 @@ class Database:
to_put = []
with self._db_session() as session:
db_plugins = session.query(Plugins).with_entities(Plugins.id).all()
db_plugins = old_data.get("bw_plugins", [])
db_ids = []
if db_plugins:
@ -592,13 +593,9 @@ class Database:
if not isinstance(plugins, list):
plugins = [plugins]
db_values = [
plugin.id
for plugin in session.query(Plugins)
.with_entities(Plugins.id)
.filter(Plugins.id.in_([plugin["id"] for plugin in plugins if "id" in plugin]))
]
missing_values = [plugin for plugin in db_values if plugin not in [plugin["id"] for plugin in plugins if "id" in plugin]]
plugin_filter = [plugin["id"] for plugin in plugins if "id" in plugin]
db_values = [plugin.id for plugin in old_data.get("bw_plugins", []) if plugin.id in plugin_filter]
missing_values = [plugin for plugin in db_values if plugin not in plugin_filter]
if missing_values:
# Remove plugins that are no longer in the list
@ -617,6 +614,12 @@ class Database:
session.query(Global_values).filter(Global_values.setting_id == plugin_setting.id).delete()
session.query(Settings).filter(Settings.id == plugin_setting.id).delete()
if "bw_plugins" in old_data:
indexes = [i for i, plugin in enumerate(old_data["bw_plugins"]) if plugin.id in missing_values]
if indexes:
for i in indexes:
del old_data["bw_plugins"][i]
for plugin in plugins:
settings = {}
jobs = []
@ -694,7 +697,7 @@ class Database:
)
)
db_values = [setting.id for setting in session.query(Settings).with_entities(Settings.id).filter_by(plugin_id=plugin["id"])]
db_values = [old_setting.id for old_setting in old_data.get("bw_settings", []) if old_setting.plugin_id == plugin["id"]]
missing_values = [setting for setting in db_values if setting not in settings]
if missing_values:
@ -706,20 +709,16 @@ class Database:
session.query(Global_values).filter(Global_values.setting_id.in_(missing_values)).delete()
if "bw_settings" in old_data:
indexes = [i for i, setting in enumerate(old_data["bw_settings"]) if setting.plugin_id == plugin["id"]]
indexes = [
i for i, setting in enumerate(old_data["bw_settings"]) if setting.plugin_id == plugin["id"] and setting.id in missing_values
]
if indexes:
for i in indexes:
del old_data["bw_settings"][i]
order = 0
for setting, value in settings.items():
value.update(
{
"plugin_id": plugin["id"],
"name": value["id"],
"id": setting,
}
)
value.update({"plugin_id": plugin["id"], "name": value["id"], "id": setting})
if "bw_settings" in old_data:
found = False
@ -775,42 +774,29 @@ class Database:
self.logger.warning(f'Setting "{setting}" does not exist, creating it')
to_put.append(Settings(**value | {"order": order}))
db_values = [select.value for select in session.query(Selects).with_entities(Selects.value).filter_by(setting_id=value["id"])]
db_values = [select.value for select in old_data.get("bw_selects", []) if select.setting_id == value["id"]]
missing_values = [select for select in db_values if select not in select_values]
if "bw_selects" in old_data and missing_values:
indexes = [i for i, select in enumerate(old_data["bw_selects"]) if select.setting_id == value["id"]]
if indexes:
for i in indexes:
del old_data["bw_selects"][i]
if missing_values:
# Remove selects that are no longer in the list
self.logger.warning(f'Removing {len(missing_values)} selects from setting "{setting}" as they are no longer in the list')
session.query(Selects).filter(Selects.value.in_(missing_values)).delete()
if select_values:
if missing_values:
# Remove selects that are no longer in the list
self.logger.warning(f'Removing {len(missing_values)} selects from setting "{setting}" as they are no longer in the list')
session.query(Selects).filter(Selects.value.in_(missing_values)).delete()
for select in select_values:
if "bw_selects" in old_data:
found = False
for i, old_select in enumerate(old_data["bw_selects"]):
if old_select.value == select:
found = True
break
if found:
if "bw_selects" in old_data:
indexes = [
i for i, select in enumerate(old_data["bw_selects"]) if select.setting_id == value["id"] and select.value in missing_values
]
if indexes:
for i in indexes:
del old_data["bw_selects"][i]
if select not in db_values:
to_put.append(Selects(setting_id=value["id"], value=select))
else:
if missing_values:
self.logger.warning(f'Removing all selects from setting "{setting}" as there are no longer any in the list')
session.query(Selects).filter_by(setting_id=value["id"]).delete()
for select in select_values:
if select not in db_values:
to_put.append(Selects(setting_id=value["id"], value=select))
order += 1
db_names = [job.name for job in session.query(Jobs).with_entities(Jobs.name).filter_by(plugin_id=plugin["id"])]
db_names = [job.name for job in old_data.get("bw_jobs", []) if job.plugin_id == plugin["id"]]
job_names = [job["name"] for job in jobs]
missing_names = [job for job in db_names if job not in job_names]
@ -822,7 +808,7 @@ class Database:
session.query(Jobs_runs).filter(Jobs_runs.job_name.in_(missing_names)).delete()
if "bw_jobs" in old_data:
indexes = [i for i, job in enumerate(old_data["bw_jobs"]) if job.plugin_id == plugin["id"]]
indexes = [i for i, job in enumerate(old_data["bw_jobs"]) if job.plugin_id == plugin["id"] and job.name in missing_names]
if indexes:
for i in indexes:
del old_data["bw_jobs"][i]
@ -976,7 +962,7 @@ class Database:
self.logger.warning(f'Removing page for plugin "{plugin["id"]}" as it no longer exists')
session.query(Plugin_pages).filter_by(plugin_id=plugin["id"]).delete()
db_names = [command.name for command in session.query(BwcliCommands).with_entities(BwcliCommands.name).filter_by(plugin_id=plugin["id"])]
db_names = [command.name for command in old_data.get("bwcli_commands", []) if command.plugin_id == plugin["id"]]
missing_names = [command for command in db_names if command not in commands]
if missing_names:
@ -985,7 +971,9 @@ class Database:
session.query(BwcliCommands).filter(BwcliCommands.name.in_(missing_names), BwcliCommands.plugin_id == plugin["id"]).delete()
if "bwcli_commands" in old_data:
indexes = [i for i, command in enumerate(old_data["bwcli_commands"]) if command.plugin_id == plugin["id"]]
indexes = [
i for i, command in enumerate(old_data["bwcli_commands"]) if command.plugin_id == plugin["id"] and command.name in missing_names
]
if indexes:
for i in indexes:
del old_data["bwcli_commands"][i]
@ -1057,10 +1045,10 @@ class Database:
if table_name == "bw_metadata":
existing_row = session.query(Metadata).filter_by(id=1).first()
if not existing_row:
session.add(Metadata(**row))
session.add(Metadata(**(row | {"ui_version": db_version})))
session.commit()
continue
session.query(Metadata).filter_by(id=1).update(row)
session.query(Metadata).filter_by(id=1).update(row | {"ui_version": db_version})
continue
# Check if the row already exists in the table

1
src/common/db/model.py
View file

@ -266,3 +266,4 @@ class Metadata(Base):
failover = Column(Boolean, default=None, nullable=True)
integration = Column(INTEGRATIONS_ENUM, default="Unknown", nullable=False)
version = Column(String(32), default="1.6.0-beta", nullable=False)
ui_version = Column(String(32), default="1.6.0-beta", nullable=False)

19
src/ui/ui_database.py
View file

@ -1,6 +1,6 @@
from datetime import datetime
from logging import Logger
from os import sep
from os import getenv, sep
from os.path import join
from sys import path as sys_path
from time import sleep
@ -37,12 +37,12 @@ class UIDatabase(Database):
if inspector and len(inspector.get_table_names()):
metadata = self.get_metadata()
db_version = metadata["version"]
db_version = metadata["ui_version"]
if metadata["default"]:
db_version = "error"
if db_version != bunkerweb_version:
self.logger.warning(f"Database version ({db_version}) is different from BunkerWeb version ({bunkerweb_version}), migrating ui tables ...")
self.logger.warning(f"UI tables version ({db_version}) is different from BunkerWeb version ({bunkerweb_version}), migrating them ...")
current_time = datetime.now()
error = True
while error:
@ -103,9 +103,20 @@ class UIDatabase(Database):
self.logger.warning(f'Restoring data for ui table "{table_name}"')
self.logger.debug(f"Data: {data}")
for row in data:
two_factor_enabled = getattr(row, "is_two_factor_enabled", None)
row = {column: getattr(row, column) for column in Base.metadata.tables[table_name].columns.keys() if hasattr(row, column)}
# TODO: Add special handling for newer UI version
if table_name == "bw_ui_users" and two_factor_enabled is not None:
message = "Detected old user model, as we implemented advanced security in the new model (custom salt for passwords, totp, etc.)"
if row["method"] == "ui":
self.logger.warning(message + ", you will have to re create the admin user.")
continue
elif getenv("PASSWORD_SALT", "").isdigit():
self.logger.warning(message + " and you specified a custom PASSWORD_SALT, you will have to re create the admin user.")
continue
elif two_factor_enabled:
self.logger.warning(message + ", you will have to re set the two factor authentication for the admin user.")
row["admin"] = True
with self._db_session() as session:
try: