So much better now

package-lock.json

@@ -361,6 +361,11 @@
         "busboy": "^0.2.14"
       }
     },
+    "express-useragent": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/express-useragent/-/express-useragent-1.0.12.tgz",
+      "integrity": "sha1-W64BCakl7Js1QX8xpOitE/GRJTo="
+    },
     "finalhandler": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",

package.json

@@ -9,6 +9,7 @@
     "bcryptjs": "^2.4.3",
     "express": "^4.16.4",
     "express-fileupload": "^1.1.3-alpha.1",
+    "express-useragent": "^1.0.12",
     "pug": "^2.0.3",
     "touch": "^3.1.0",
     "unzip": "^0.1.11"

server.js

@@ -9,6 +9,7 @@ const pug = require('pug');
 const unzip = require('unzip');
 const touch = require('touch');
 const bcrypt = require('bcryptjs');
+const useragent = require('express-useragent');
 const { port, pythonPath, aisPath, aisPathOld, hashPath } = require('./config');
 
 // Create the directories to store the files
@@ -141,7 +142,8 @@ function readData(req, res, callback) {
     fs.readFile('pytron_run/assets/data.json', 'utf-8', (err, data) => {
         if (err != null) {
             console.log(err);
-            res.render('error', {message: 'It seems like the site is broken :\'('});
+            res.status(400);
+            render(req, res, 'error', {message: 'It seems like the site is broken :\'('});
             return;
         }
         let parsed = parse(data);
@@ -161,7 +163,8 @@ function saveArchiveAndRun(req, res) {
         if (err != null) {
             console.log("Failed to save archive");
             console.log(err);
-            res.render('error', {message: 'Unable to save the ZIP archive to the server'});
+            res.status(400);
+            render(req, res, 'error', {message: 'Unable to save the ZIP archive to the server'});
             return;
         }
         fs.createReadStream(zipfile)
@@ -171,23 +174,36 @@ function saveArchiveAndRun(req, res) {
                 touch(pathtools.join(path, '__init__.py'), () => {
                     // Trigger python_run
                     runPython();
-                    res.redirect('/');
+                    if (req.useragent.isCurl) {
+                        res.send('Success');
+                    } else {
+                        res.redirect('/');
+                    }
                 });
             })
             .on('error', () => {
-                res.render('error', {message: 'Failed to unzip the archive'});
+                render(req, res, 'error', {message: 'Failed to unzip the archive'});
             });
     });
 }
 
+function render(req, res, template, context) {
+    if (req.useragent.isCurl) {
+        res.render("txt/" + template + "_txt", context);
+    } else {
+        res.render("html/" + template + "_html", context);
+    }
+}
+
 function startServer() {
     const app = express();
     app.set('view engine', 'pug');
     app.use(fileUpload());
+    app.use(useragent.express());
 
     app.get('/', (req, res) => {
         readData(req, res, (parsed) => {
-            res.render('index', {
+            render(req, res, 'index', {
                 data: parsed,
                 running: pythonRunning,
             });
@@ -204,7 +220,7 @@ function startServer() {
 
     app.get('/leaderboard', (req, res) => {
         readData(req, res, (parsed) => {
-            res.render('leaderboard', {
+            render(req, res, 'leaderboard', {
                 data: parsed,
                 running: pythonRunning,
             });
@@ -213,7 +229,7 @@ function startServer() {
 
     app.get('/battles', (req, res) => {
         readData(req, res, (parsed) => {
-            res.render('battles', {
+            render(req, res, 'battles', {
                 data: parsed,
                 running: pythonRunning,
             });
@@ -221,28 +237,37 @@ function startServer() {
     });
 
     app.get('/upload', (req, res) => {
-        res.render('upload', {});
+        render(req, res, 'upload', {});
     });
 
     app.post('/upload-target', (req, res) => {
 
         console.log("/upload-target");
 
+        if (!req.body) {
+            res.status(400);
+            render(req, res, 'error', {message: "You have to send the form"});
+        }
+
         if (!req.body.name) {
-            res.render('error', {message: "You have to enter a name in the form"});
+            res.status(400);
+            render(req, res, 'error', {message: "You have to enter a name in the form"});
             return;
         }
 
         if (!req.body.password) {
-            res.render('error', {message: "You have to enter a password in the form"});
+            res.status(400);
+            render(req, res, 'error', {message: "You have to enter a password in the form"});
         }
 
         if (req.body.name.indexOf('.') !== -1) {
-            res.render('error', {message: "The name of your AI can't contain dots"});
+            res.status(400);
+            render(req, res, 'error', {message: "The name of your AI can't contain dots"});
         }
 
         if (!req.files.archive) {
-            res.render('error', {message: "You have to send a ZIP archive"});
+            res.status(400);
+            render(req, res, 'error', {message: "You have to send a ZIP archive"});
             return;
         }
 
@@ -256,7 +281,6 @@ function startServer() {
             fs.mkdirSync(path);
         }
 
-
         if (aiExisted) {
 
             console.log("Ai existed, try to verify password");
@@ -264,7 +288,8 @@ function startServer() {
             fs.readFile(pathtools.join(path, hashPath), 'utf-8', function(err, data) {
 
                 if (err != null) {
-                    res.render('error', {message: "Couldn't read hashed password"});
+                    res.status(400);
+                    render(req, res, 'error', {message: "Couldn't read hashed password"});
                     console.log(err);
                     return;
                 }
@@ -272,13 +297,15 @@ function startServer() {
                 // If the AI already existed, verify the password
                 bcrypt.compare(req.body.password, data, function(err, success) {
                     if (err != null) {
-                        res.render('error', {message: "Couldn't compare password"});
+                        res.status(400);
+                        render(req, res, 'error', {message: "Couldn't compare password"});
                         return;
                     }
 
                     if (!success) {
                         console.log("Authentication failed");
-                        res.render('error', {message: "Authentication failed"});
+                        res.status(400);
+                        render(req, res, 'error', {message: "Authentication failed"});
                         return;
                     }
 
@@ -331,7 +358,8 @@ function startServer() {
 
                 if (err != null) {
                     console.log(err);
-                    res.render('error', {message: "Couldn't hash password"});
+                    res.status(400);
+                    render(req, res, 'error', {message: "Couldn't hash password"});
                     return;
                 }
 
@@ -342,7 +370,8 @@ function startServer() {
 
                     if (err != null) {
                         console.log(err);
-                        res.render('error', {message: "Couldn't save hashed password"});
+                        res.status(400);
+                        render(req, res, 'error', {message: "Couldn't save hashed password"});
                         return;
                     }
 

views/html/error_html.pug

@@ -1,4 +1,4 @@
-extends base
+extends base_html
 
 block content
     section.section

views/html/index_html.pug

@@ -1,4 +1,4 @@
-extends base
+extends base_html
 
 block extracss
     link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.1/css/all.css", integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf", crossorigin="anonymous")

views/html/upload_html.pug

@@ -1,4 +1,4 @@
-extends base
+extends base_html
 
 block content
     section.section

views/txt/error_txt.pug

@@ -0,0 +1,2 @@
+| #{message}
+|