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

Fixing file deletion

Browse Source
This commit is contained in:
CodeKevin
2015-09-22 23:38:26 -04:00
parent 77c14653b5
commit 478973b4f5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CTFd/admin.py
View File

@@ -276,8 +276,8 @@ def admin_files(chalid):
if request.method == 'POST': if request.method == 'POST':
if request.form['method'] == "delete": if request.form['method'] == "delete":
f = Files.query.filter_by(id=request.form['file']).first_or_404() f = Files.query.filter_by(id=request.form['file']).first_or_404()
if os.path.isfile(f.location): if os.path.exists(os.path.join(app.static_folder, 'uploads', f.location)): ## Some kind of os.path.isfile issue on Windows...
os.unlink(f.location) os.unlink(os.path.join(app.static_folder, 'uploads', f.location))
db.session.delete(f) db.session.delete(f)
db.session.commit() db.session.commit()
db.session.close() db.session.close()
@@ -297,7 +297,7 @@ def admin_files(chalid):
os.makedirs(os.path.join(os.path.normpath(app.static_folder), 'uploads', md5hash)) os.makedirs(os.path.join(os.path.normpath(app.static_folder), 'uploads', md5hash))
f.save(os.path.join(os.path.normpath(app.static_folder), 'uploads', md5hash, filename)) f.save(os.path.join(os.path.normpath(app.static_folder), 'uploads', md5hash, filename))
db_f = Files(chalid, os.path.join(os.path.normpath(app.static_url_path), 'uploads', md5hash, filename)) db_f = Files(chalid, os.path.join(md5hash, filename))
db.session.add(db_f) db.session.add(db_f)
db.session.commit() db.session.commit()
@@ -568,7 +568,7 @@ def admin_create_chal():
os.makedirs(os.path.join(os.path.normpath(app.static_folder), 'uploads', md5hash)) os.makedirs(os.path.join(os.path.normpath(app.static_folder), 'uploads', md5hash))
f.save(os.path.join(os.path.normpath(app.static_folder), 'uploads', md5hash, filename)) f.save(os.path.join(os.path.normpath(app.static_folder), 'uploads', md5hash, filename))
db_f = Files(chal.id, os.path.join(os.path.normpath(app.static_url_path), 'uploads', md5hash, filename)) db_f = Files(chal.id, os.path.join(md5hash, filename))
db.session.add(db_f) db.session.add(db_f)
db.session.commit() db.session.commit()