src/app.py

@@ -4,13 +4,11 @@ from werkzeug.wrappers.response import Response
 from config import init
 from routes.api.download import router as api_download
 from routes.api.upload import router as api_upload
-from routes.file import router as download
 from routes.index import router as index
 
 app = Flask(__name__, static_url_path="/", static_folder="public")
 app.register_blueprint(index, url_prefix="/index")
 app.register_blueprint(api_upload, url_prefix="/api/upload")
-app.register_blueprint(download, url_prefix="/file")
 app.register_blueprint(api_download, url_prefix="/api/download")
 
 init()

src/public/js/main.js

@@ -64,56 +64,20 @@ const update = (element, text, tag = undefined) => {
  */
 const send = (file, element) => {
     file.text().then((content) => {
-        const req = new XMLHttpRequest();
-
         element = update(element, "Génération des clefs...", "H3");
-        gen_RSA_keypair(1024).then(([pub_key, sec_key]) => {
+        gen_RSA_keypair(1024).then(([, sec_key]) => {
             element = update(element, "Chiffrement du fichier...", "H3");
 
             let data = {
                 file: RSA_enc(content, sec_key).map((v) => v.toString()),
             };
 
-            element = update(element, "Téléversement...", "H3");
+            update(element, "Téléversement...", "H3");
+            const req = new XMLHttpRequest();
             req.open("POST", "api/upload");
             req.setRequestHeader("Content-Type", "application/json");
             req.send(JSON.stringify(data));
 
-            req.onload = () => {
-                if (req.status == 200) {
-                    /* Change here the area with the copy link */
-                    let url = window.location.href.split("/");
-                    url.pop();
-                    url.push("file");
-
-                    let main_div = element.parentElement.parentElement;
-                    main_div.textContent = "";
-                    let div = document.createElement("DIV");
-                    div.textContent = "Fichier prêt !";
-                    div.className = "link-area";
-                    main_div.appendChild(div);
-
-                    let message = document.createElement("P");
-                    message.innerHTML = `Copiez le lien pour télécharger <code>${file.name}</code>`;
-                    div.appendChild(message);
-
-                    let input = document.createElement("INPUT");
-                    input.value = `${url.join("/")}/${req.responseText.slice(
-                        1,
-                        -2
-                    )}/${pub_key[0]}:${pub_key[1]}`;
-                    input.readOnly = true;
-                    div.appendChild(input);
-
-                    // TODO: Change button textContent on click
-                    let button = document.createElement("BUTTON");
-                    button.textContent = "Copier le lien";
-                    div.appendChild(button);
-                } else {
-                    console.error("Upload failed.");
-                }
-            };
-
             /* Here we need to store the public key and then wait for a response
              * from the server. When the server send us a hash of the file
              * we redirect the user the a wait page so the uploader can copy

src/public/styles/style.css

@@ -70,8 +70,7 @@ main {
     padding-top: 0.5em;
 }
 
-.upload-area,
-.link-area {
+.upload-area {
     border: 2px dashed var(--border);
     height: 70vh;
     width: 65vw;

src/routes/api/download.py

@@ -4,9 +4,8 @@ from werkzeug.wrappers.response import Response
 router = Blueprint("download", __name__)
 
 
-@router.route("<file_hash>", methods=["POST"])
-def download(file_hash: str) -> Response:
+@router.route("", methods=["POST"])
+def download() -> Response:
     """Download interface"""
     # TODO: Send the encrypted file to the javascript client
-    print("download of file", file_hash)
     return redirect("index")

src/routes/api/upload.py

@@ -1,8 +1,8 @@
 from time import time
 
 from config import Config
-from flask import Blueprint, redirect, request, jsonify
-from utils.misc import hash_data
+from flask import Blueprint, redirect, request
+from utils.misc import h
 from werkzeug.wrappers.response import Response
 
 router = Blueprint("upload", __name__)
@@ -11,16 +11,14 @@ router = Blueprint("upload", __name__)
 @router.route("", methods=["POST"])
 def upload() -> Response:
     """Upload interface (receive file from javascript client)"""
-    json = request.get_json()
-    if json:
-        data = "".join(json["file"])
-        data_hash = hash_data(data)
-        with open(f"{Config.uploads_dir}/{data_hash}", 'w') as f:
-            f.write(data)
+    if request.method == "POST":
+        json = request.get_json()
+        if json:
+            data = "".join(json["file"])
+            data_hash = h(data)
+            with open(f"{Config.uploads_dir}/{data_hash}", 'w') as f:
+                f.write(data)
 
-        Config.database.add_file(data_hash, int(time()))
-
-        # Send the hash to the javascript client
-        return jsonify(data_hash)
+            Config.database.add_file(data_hash, int(time()))
 
     return redirect("/index")

src/routes/file.py

@@ -1,13 +0,0 @@
-from config import Config
-from flask import Blueprint, render_template
-
-router = Blueprint("file", __name__)
-
-
-@router.route("<int:file_hash>/<string:key_data>")
-def file(file_hash: int, key_data: str) -> str:
-    """Download page"""
-    print(f"hash : {file_hash}")
-    key = key_data.split(":")
-    print(f"key : {key}")
-    return render_template("index.html", config=Config, download=True)

src/templates/index.html

@@ -29,7 +29,13 @@
             <p>NPNO</p>
         </footer>
 
-        <script src="https://unpkg.com/node-forge@1.0.0/dist/forge.min.js"></script>
+        <script
+            src="https://cdnjs.cloudflare.com/ajax/libs/forge/1.3.1/forge.min.js"
+            integrity="sha512-95iy0RZIbw3H/FgfAj2wnCQJlzFQ+eaSfUeV/l8WVyGHKSRMzm3M/O+85j9ba/HFphkijrCTDjcuDX0BL2lthA=="
+            crossorigin="anonymous"
+            referrerpolicy="no-referrer"
+        ></script>
+
         <script type="module" src="../js/main.js"></script>
     </body>
 </html>

src/utils/misc.py

@@ -21,7 +21,7 @@ def int_to_bytes(data: int) -> bytes:
     return data.to_bytes((data.bit_length() + 7) // 8, BYTEORDER)
 
 
-def hash_data(string: str) -> str:
+def h(string: str) -> str:
     """Hash a string"""
     # https://docs.python.org/3/library/sys.html#sys.set_int_max_str_digits
     set_int_max_str_digits(len(string))