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

Improve import_ctf reliability (#1419)

Browse Source 
* Improve `import_ctf()` reliability by closing all connections before dropping & recreating database
* Close database session in IP tracking code in failure situations
This commit is contained in:
Kevin Chung
2020-05-18 11:46:15 -04:00
committed by GitHub
parent ac24b83a86
commit 148bdccf26
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,6 +123,11 @@ def import_ctf(backup, erase=True):
) )
if erase: if erase:
# Clear out existing connections to release any locks
db.session.close()
db.engine.dispose()
# Drop database and recreate it to get to a clean state
drop_database() drop_database()
create_database() create_database()
# We explicitly do not want to upgrade or stamp here. # We explicitly do not want to upgrade or stamp here.

1
CTFd/utils/initialization/__init__.py
View File

@@ -201,6 +201,7 @@ def init_request_processors(app):
db.session.commit() db.session.commit()
except (InvalidRequestError, IntegrityError): except (InvalidRequestError, IntegrityError):
db.session.rollback() db.session.rollback()
db.session.close()
logout_user() logout_user()
else: else:
clear_user_recent_ips(user_id=session["id"]) clear_user_recent_ips(user_id=session["id"])