fix: add some redirects to root_post

- If a user already has a job running, just redirect to it.
- If too many workloads are running, show an error.

Signed-off-by: Nicholas Farshidmehr <nicholas@profian.com>

Author: definitelynobody

src/main.rs

@@ -6,6 +6,7 @@
 
 mod auth;
 mod jobs;
+mod redirect;
 mod reference;
 mod secret;
 mod templates;
@@ -20,7 +21,7 @@ use std::time::Duration;
 
 use axum::extract::Multipart;
 use axum::http::StatusCode;
-use axum::response::IntoResponse;
+use axum::response::{IntoResponse, Redirect};
 use axum::routing::{get, post};
 use axum::{Router, Server};
 
@@ -257,8 +258,13 @@ async fn root_post(
     jobs: usize,
 ) -> impl IntoResponse {
     let (ttl, size) = limits.decide(user.read().await.is_starred("enarx/enarx").await);
-    if user.read().await.data.job.is_some() || jobs::Job::count() >= jobs {
-        return Err(StatusCode::TOO_MANY_REQUESTS.into_response());
+
+    if user.read().await.data.job.is_some() {
+        return Err(Redirect::to("/").into_response());
+    }
+
+    if jobs::Job::count() >= jobs {
+        return Err(redirect::too_many_workloads().into_response());
     }
 
     let mut wasm = None;
@@ -341,8 +347,12 @@ async fn root_post(
     let uuid = {
         let mut lock = user.write().await;
 
-        if lock.data.job.is_some() || jobs::Job::count() >= jobs {
-            return Err(StatusCode::TOO_MANY_REQUESTS.into_response());
+        if lock.data.job.is_some() {
+            return Err(Redirect::to("/").into_response());
+        }
+
+        if jobs::Job::count() >= jobs {
+            return Err(redirect::too_many_workloads().into_response());
         }
 
         let job = jobs::Job::new(command, wasm, toml).map_err(|e| {

src/redirect.rs

@@ -0,0 +1,9 @@
+// SPDX-FileCopyrightText: 2022 Profian Inc. <opensource@profian.com>
+// SPDX-License-Identifier: AGPL-3.0-only
+
+use axum::response::Redirect;
+
+/// The server is already running too many jobs.
+pub fn too_many_workloads() -> Redirect {
+    Redirect::to("/?message=too_many_workloads")
+}

templates/idx.html

@@ -131,34 +131,10 @@
 
         // SECURITY: Do not put query parameter values in messageHTML.
         switch (messageCode) {
-            case 'no_session': {
-                if (!authenticated) {
-                    messageHTML.push("It looks like you have been logged out.");
-                }
-                break;
-            }
-            case 'workload_not_found': {
-                if (authenticated) {
-                    messageHTML.push("The workload was not found or you are not permitted to view it.");
-                } else {
-                    messageHTML.push("You need to be logged in to view workloads.");
-                }
-                break;
-            }
             case 'too_many_workloads': {
                 messageHTML.push("Too many workloads are running on this server! Please try again later.");
                 break;
             }
-            case 'workload_killed': {
-                // Users probably don't care if the workload was killed.
-                // This is just here for testing.
-                // messageHTML.push("Workload killed successfully.");
-                break;
-            }
-            case 'internal_error': {
-                messageHTML.push("An internal error occurred handling your request. Please try again or contact an administrator.");
-                break;
-            }
             default: {
                 break;
             }