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

Use strings for key type (#409)

Browse Source 
* Store key_type as string in the database
* Give keys plugin the ability to know where the modals are stored and pass this information to the client
This commit is contained in:
Kevin Chung
2017-10-14 16:37:41 -04:00
committed by GitHub
parent b4bdef966c
commit 6117699260
16 changed files with 115 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CTFd/admin/challenges.py
View File

@@ -199,11 +199,13 @@ def admin_get_values(chalid, prop):
chal_keys = Keys.query.filter_by(chal=challenge.id).all()
json_data = {'keys': []}
for x in chal_keys:
key_class = get_key_class(x.key_type)
json_data['keys'].append({
'id': x.id,
'key': x.flag,
'type': x.key_type,
'type_name': get_key_class(x.key_type).name
'type_name': key_class.name,
'templates': key_class.templates,
})
return jsonify(json_data)
elif prop == 'tags':
@@ -257,7 +259,7 @@ def admin_create_chal():
db.session.add(chal)
db.session.flush()
flag = Keys(chal.id, request.form['key'], int(request.form['key_type[0]']))
flag = Keys(chal.id, request.form['key'], request.form['key_type[0]'])
if request.form.get('keydata'):
flag.data = request.form.get('keydata')
db.session.add(flag)