Merge pull request #522 from bunkerity/dev

Merge branch "dev" into branch "staging"
This commit is contained in:
Théophile Diot 2023-06-17 09:28:04 -04:00 committed by GitHub
commit 0836d4ee9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 33 deletions

View file

@ -70,7 +70,7 @@ RUN apk add --no-cache pcre bash python3 && \
ln -s /proc/1/fd/1 /var/log/nginx/access.log
# Fix CVEs
RUN apk add "libcrypto3>=3.0.8-r4" "libssl3>=3.0.8-r4" "curl>=8.1.0-r0" "libcurl>=8.1.0-r0" "libwebp>=1.2.4-r2" "ncurses-libs>=6.3_p20221119-r1" "ncurses-terminfo-base>=6.3_p20221119-r1"
RUN apk add "libx11>=1.8.4-r1"
VOLUME /data /etc/nginx

View file

@ -289,8 +289,9 @@ class Database:
except BaseException:
return format_exc()
def checked_changes(self) -> str:
def checked_changes(self, changes: Optional[List[str]] = None) -> str:
"""Set that the config, the custom configs and the plugins didn't change"""
changes = changes or ["config", "custom_configs", "external_plugins"]
with self.__db_session() as session:
try:
metadata = session.query(Metadata).get(1)
@ -298,9 +299,12 @@ class Database:
if not metadata:
return "The metadata are not set yet, try again"
metadata.config_changed = False
metadata.custom_configs_changed = False
metadata.external_plugins_changed = False
if "config" in changes:
metadata.config_changed = False
if "custom_configs" in changes:
metadata.custom_configs_changed = False
if "external_plugins" in changes:
metadata.external_plugins_changed = False
session.commit()
except BaseException:
return format_exc()
@ -669,7 +673,6 @@ class Database:
if not metadata.first_config_saved:
metadata.first_config_saved = True
metadata.config_changed = bool(to_put)
metadata.ui_config_changed = bool(to_put)
try:
session.add_all(to_put)
@ -762,11 +765,10 @@ class Database:
)
)
if to_put:
with suppress(ProgrammingError, OperationalError):
metadata = session.query(Metadata).get(1)
if metadata is not None:
metadata.custom_configs_changed = True
with suppress(ProgrammingError, OperationalError):
metadata = session.query(Metadata).get(1)
if metadata is not None:
metadata.custom_configs_changed = True
try:
session.add_all(to_put)
@ -1460,11 +1462,10 @@ class Database:
Plugin_pages.plugin_id == plugin["id"]
).update(updates)
if to_put:
with suppress(ProgrammingError, OperationalError):
metadata = session.query(Metadata).get(1)
if metadata is not None:
metadata.external_plugins_changed = True
with suppress(ProgrammingError, OperationalError):
metadata = session.query(Metadata).get(1)
if metadata is not None:
metadata.external_plugins_changed = True
try:
session.add_all(to_put)

View file

@ -117,14 +117,14 @@ def generate_custom_configs(
tmp_path.parent.mkdir(parents=True, exist_ok=True)
tmp_path.write_bytes(custom_config["data"])
if SCHEDULER.apis:
logger.info("Sending custom configs to BunkerWeb")
ret = SCHEDULER.send_files(original_path, "/custom_configs")
if SCHEDULER and SCHEDULER.apis:
logger.info("Sending custom configs to BunkerWeb")
ret = SCHEDULER.send_files(original_path, "/custom_configs")
if not ret:
logger.error(
"Sending custom configs failed, configuration will not work as expected...",
)
if not ret:
logger.error(
"Sending custom configs failed, configuration will not work as expected...",
)
def generate_external_plugins(
@ -159,14 +159,14 @@ def generate_external_plugins(
st = Path(job_file).stat()
chmod(job_file, st.st_mode | S_IEXEC)
if SCHEDULER.apis:
logger.info("Sending plugins to BunkerWeb")
ret = SCHEDULER.send_files(original_path, "/plugins")
if SCHEDULER and SCHEDULER.apis:
logger.info("Sending plugins to BunkerWeb")
ret = SCHEDULER.send_files(original_path, "/plugins")
if not ret:
logger.error(
"Sending plugins failed, configuration will not work as expected...",
)
if not ret:
logger.error(
"Sending plugins failed, configuration will not work as expected...",
)
if __name__ == "__main__":
@ -388,8 +388,9 @@ if __name__ == "__main__":
)
FIRST_RUN = True
CHANGES = []
while True:
ret = db.checked_changes()
ret = db.checked_changes(CHANGES)
if ret:
logger.error(
@ -439,7 +440,7 @@ if __name__ == "__main__":
"Config saver failed, configuration will not work as expected...",
)
ret = db.checked_changes()
ret = db.checked_changes(["external_plugins"])
if ret:
logger.error(
@ -552,6 +553,7 @@ if __name__ == "__main__":
GENERATE = True
SCHEDULER.setup()
NEED_RELOAD = False
CONFIG_NEED_GENERATION = False
CONFIGS_NEED_GENERATION = False
PLUGINS_NEED_GENERATION = False
FIRST_RUN = False
@ -588,21 +590,28 @@ if __name__ == "__main__":
# check if the config have changed since last time
if changes["config_changed"]:
logger.info("Config changed, generating ...")
CONFIG_NEED_GENERATION = True
NEED_RELOAD = True
if NEED_RELOAD:
CHANGES.clear()
if CONFIGS_NEED_GENERATION:
CHANGES.append("custom_configs")
generate_custom_configs(
db.get_custom_configs(), original_path=configs_path
)
if PLUGINS_NEED_GENERATION:
CHANGES.append("external_plugins")
generate_external_plugins(
db.get_plugins(external=True, with_data=True),
original_path=plugins_dir,
)
env = db.get_config()
if CONFIG_NEED_GENERATION:
CHANGES.append("config")
env = db.get_config()
except:
logger.error(
f"Exception while executing scheduler : {format_exc()}",