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

Fixing view challenges before CTF started if view_after_ctf is enabled

Browse Source
This commit is contained in:
Kevin Chung
2016-11-04 21:02:27 -04:00
parent a6f641dda3
commit 11e3ef66b4
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CTFd/challenges.py
View File

@@ -26,7 +26,6 @@ def challenges_view():
else: # We are NOT allowed to view after the CTF ends else: # We are NOT allowed to view after the CTF ends
errors.append('{} has ended'.format(ctf_name())) errors.append('{} has ended'.format(ctf_name()))
return render_template('chals.html', errors=errors, start=int(start), end=int(end)) return render_template('chals.html', errors=errors, start=int(start), end=int(end))
return redirect(url_for('views.static_html'))
if get_config('verify_emails') and not is_verified(): # User is not confirmed if get_config('verify_emails') and not is_verified(): # User is not confirmed
return redirect(url_for('auth.confirm_user')) return redirect(url_for('auth.confirm_user'))
if user_can_view_challenges(): # Do we allow unauthenticated users? if user_can_view_challenges(): # Do we allow unauthenticated users?
@@ -47,7 +46,7 @@ def chals():
pass pass
else: else:
return redirect(url_for('views.static_html')) return redirect(url_for('views.static_html'))
if user_can_view_challenges(): if user_can_view_challenges() and (ctf_started() or is_admin()):
chals = Challenges.query.filter(or_(Challenges.hidden != True, Challenges.hidden == None)).add_columns('id', 'name', 'value', 'description', 'category').order_by(Challenges.value).all() chals = Challenges.query.filter(or_(Challenges.hidden != True, Challenges.hidden == None)).add_columns('id', 'name', 'value', 'description', 'category').order_by(Challenges.value).all()
json = {'game':[]} json = {'game':[]}