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

Clarify Score Visibility and Account Visibility (#2227)

Browse Source 
* Don't show /scoreboard if we do not have account_visibility
* Clarify the behavior of Score Visibility with respect to Account Visibility
This commit is contained in:
Kevin Chung
2022-12-03 12:16:11 -05:00
committed by GitHub
parent 7e575a2e47
commit 800fb8260a
3 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CTFd/scoreboard.py
View File

@@ -2,7 +2,10 @@ from flask import Blueprint, render_template
from CTFd.utils import config
from CTFd.utils.config.visibility import scores_visible
from CTFd.utils.decorators.visibility import check_score_visibility
from CTFd.utils.decorators.visibility import (
check_account_visibility,
check_score_visibility,
)
from CTFd.utils.helpers import get_infos
from CTFd.utils.scores import get_standings
from CTFd.utils.user import is_admin
@@ -11,6 +14,7 @@ scoreboard = Blueprint("scoreboard", __name__)
@scoreboard.route("/scoreboard")
@check_account_visibility
@check_score_visibility
def listing():
infos = get_infos()

47
CTFd/themes/admin/templates/configs/settings.html
View File

@@ -20,6 +20,26 @@
</select>
</div>
<div class="form-group">
<label>
Account Visibility<br>
<small class="form-text text-muted">
Control whether accounts (users &amp; teams) are shown to everyone, only to authenticated users, or only to admins
</small>
</label>
<select class="form-control custom-select" name="account_visibility">
<option value="public" {% if account_visibility == 'public' %}selected{% endif %}>
Public
</option>
<option value="private" {% if account_visibility == 'private' %}selected{% endif %}>
Private
</option>
<option value="admins" {% if account_visibility == 'admins' %}selected{% endif %}>
Admins Only
</option>
</select>
</div>
<div class="form-group">
<label>
Score Visibility<br>
@@ -42,30 +62,9 @@
</option>
</select>
<small class="form-text text-muted">
This setting should generally be the same as Account Visibility to avoid conflicts.
</small>
</div>
<div class="form-group">
<label>
Account Visibility<br>
<small class="form-text text-muted">
Control whether accounts (users &amp; teams) are shown to everyone, only to authenticated users, or only to admins
</small>
</label>
<select class="form-control custom-select" name="account_visibility">
<option value="public" {% if account_visibility == 'public' %}selected{% endif %}>
Public
</option>
<option value="private" {% if account_visibility == 'private' %}selected{% endif %}>
Private
</option>
<option value="admins" {% if account_visibility == 'admins' %}selected{% endif %}>
Admins Only
</option>
</select>
<small class="form-text text-muted">
This setting should generally be the same as Score Visibility to avoid conflicts.
Score Visibility is a subset of Account Visibility.
This means that if accounts are visible to a user then score visibility will control whether they can see the score of that user.
If accounts are not visibile then score visibility has no effect.
</small>
</div>

2
CTFd/themes/core/templates/components/navbar.html
View File

@@ -30,7 +30,7 @@
{% endif %}
{% endif %}
{% if Configs.score_visibility != 'admins' %}
{% if Configs.account_visibility != 'admins' and Configs.score_visibility != 'admins' %}
<li class="nav-item">
<a class="nav-link" href="{{ url_for('scoreboard.listing') }}">Scoreboard</a>
</li>