aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2025-12-17 14:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix miscellaneous issues for importer (#2151)

Browse Source 
* Fix issue where `field_entries` could not be imported under MariaDB
* Fix issue where `config` entries sometimes would be recreated for some reason causing an import to fail
This commit is contained in:
Kevin Chung
2022-06-29 18:41:16 -04:00
committed by GitHub
parent 3b39a9e679
commit 3c3a33b893
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CTFd/utils/exports/__init__.py
View File

@@ -13,7 +13,7 @@ import dataset
from flask import current_app as app from flask import current_app as app
from flask_migrate import upgrade as migration_upgrade from flask_migrate import upgrade as migration_upgrade
from sqlalchemy.engine.url import make_url from sqlalchemy.engine.url import make_url
from sqlalchemy.exc import ProgrammingError from sqlalchemy.exc import IntegrityError, ProgrammingError
from sqlalchemy.sql import sqltypes from sqlalchemy.sql import sqltypes
from CTFd import __version__ as CTFD_VERSION from CTFd import __version__ as CTFD_VERSION
@@ -341,7 +341,7 @@ def import_ctf(backup, erase=True):
# we need to have an edge case here. # we need to have an edge case here.
if member == "db/field_entries.json": if member == "db/field_entries.json":
value = entry.get("value") value = entry.get("value")
if value: if value is not None:
try: try:
# Attempt to convert anything to its original Python value # Attempt to convert anything to its original Python value
entry["value"] = str(json.loads(value)) entry["value"] = str(json.loads(value))
@@ -362,6 +362,16 @@ def import_ctf(backup, erase=True):
if requirements and isinstance(requirements, dict): if requirements and isinstance(requirements, dict):
entry["requirements"] = json.dumps(requirements) entry["requirements"] = json.dumps(requirements)
table.insert(entry) table.insert(entry)
except IntegrityError:
# Catch odd situation where for some reason config keys are reinserted before import completes
if member == "db/config.json":
config_id = int(entry["id"])
side_db.query(
f"DELETE FROM config WHERE id={config_id}"
)
table.insert(entry)
else:
raise
db.session.commit() db.session.commit()
if postgres: if postgres: