Fix file upload

.gitignore

@@ -2,7 +2,7 @@
 .secret_key
 .bundle/config
 logs/
-uploads/
+files/
 
 # Object files
 *.o

server/api/problem.py

@@ -37,14 +37,9 @@ def problem_add():
         if len(filename) == 0:
             continue
 
-        folder = problem.name.replace(" ", "-")
+        file_path = os.path.join(app.config["UPLOAD_FOLDER"], filename)
-        folder_path = os.path.join(os.path.normpath(app.config["UPLOAD_FOLDER"]), folder)
-        if not os.path.exists(folder_path):
-            os.makedirs(folder_path)
-
-        file_path = os.path.join(folder_path, filename)
         _file.save(file_path)
-        db_file = Files(problem.pid, file_path)
+        db_file = Files(problem.pid, "/".join(file_path.split("/")[2:]))
         db.session.add(db_file)
 
     db.session.commit()

server/config.py

@@ -15,7 +15,7 @@ SECRET_KEY = key
 SQLALCHEMY_DATABASE_URI = "mysql://root:i_hate_passwords@localhost/easyctf"
 SQLALCHEMY_TRACK_MODIFICATIONS = False
 
-UPLOAD_FOLDER = os.path.normpath("files")
+UPLOAD_FOLDER = os.path.normpath("../web/files")
 
 CTF_BEGIN = 0 # To be used later
 CTF_END = 0 # To be used later

web/files/Binary.txt

@@ -1 +0,0 @@
-This is hard! I'm telling you!

web/files/Binary2.txt

@@ -1 +0,0 @@
-Binary is not fun at all!

web/files/example.txt

@@ -1 +0,0 @@
-This is an example file, and should be removed before the tournament starts.

web/files/example2.txt

@@ -1 +0,0 @@
-Hello World! How art thou?