aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2026-02-19 13:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reorder code and fix tests

Browse Source
This commit is contained in:
Kevin Chung
2020-04-29 18:41:18 -04:00
parent 7e3b1962c4
commit abd8aae84f
3 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,6 +164,27 @@ def init_request_processors(app):
else:
return redirect(url_for("views.setup"))
@app.before_request
def tracker():
if request.endpoint == "views.themes":
return
if authed():
track = Tracking.query.filter_by(ip=get_ip(), user_id=session["id"]).first()
if not track:
visit = Tracking(ip=get_ip(), user_id=session["id"])
db.session.add(visit)
else:
track.date = datetime.datetime.utcnow()
try:
db.session.commit()
except (InvalidRequestError, IntegrityError):
db.session.rollback()
logout_user()
db.session.close()
@app.before_request
def banned():
if request.endpoint == "views.themes":
@@ -190,27 +211,6 @@ def init_request_processors(app):
403,
)
@app.before_request
def tracker():
if request.endpoint == "views.themes":
return
if authed():
track = Tracking.query.filter_by(ip=get_ip(), user_id=session["id"]).first()
if not track:
visit = Tracking(ip=get_ip(), user_id=session["id"])
db.session.add(visit)
else:
track.date = datetime.datetime.utcnow()
try:
db.session.commit()
except (InvalidRequestError, IntegrityError):
db.session.rollback()
logout_user()
db.session.close()
@app.before_request
def tokens():
token = request.headers.get("Authorization")