Skip to content

Commit fb632f2

Browse files
committed
Restrict user search/import to cf admins
All users can still enumerate local users, but the functionality to search the central database is restricted to admins only. Reported by Benjamin Flesch
1 parent 65eef28 commit fb632f2

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

pgcommitfest/commitfest/ajax.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,19 @@ def detachThread(request):
223223

224224

225225
def searchUsers(request):
226+
if not request.user.is_staff:
227+
return []
228+
226229
if request.GET.get('s', ''):
227230
return user_search(request.GET['s'])
228231
else:
229232
return []
230233

231234

232235
def importUser(request):
236+
if not request.user.is_staff:
237+
raise Http404()
238+
233239
if request.GET.get('u', ''):
234240
u = user_search(userid=request.GET['u'])
235241
if len(u) != 1:

pgcommitfest/commitfest/templates/base_form.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
{%include "thread_attach.inc" %}
4141
{%endif%}
4242

43+
{%if user.is_staff%}
4344
<div class="modal fade" id="searchUserModal" role="dialog">
4445
<div class="modal-dialog modal-lg">
4546
<div class="modal-content">
@@ -66,6 +67,7 @@ <h3>Search user</h3>
6667
</div>
6768
</div>
6869
</div>
70+
{%endif%}
6971
{%endblock%}
7072

7173
{%block extrahead%}
@@ -97,6 +99,7 @@ <h3>Search user</h3>
9799
}
98100
});
99101
{%endfor%}
102+
{%if user.is_staff%}
100103
$('.selectize-control').after(
101104
$('<a href="#" class="btn btn-default btn-sm">Import user not listed</a>').click(function () {
102105
search_and_store_user();
@@ -106,6 +109,7 @@ <h3>Search user</h3>
106109
$('#searchUserModal').on('shown.bs.modal', function() {
107110
$('#searchUserSearchField').focus();
108111
});
112+
{%endif%}
109113

110114
/* Build our button callbacks */
111115
$(document).ready(function() {

0 commit comments

Comments
 (0)