Add error checking on cron validation

app/classes/web/routes/api/servers/server/tasks/index.py

@@ -3,6 +3,7 @@
 import json
 import logging
 
+from croniter import croniter
 from jsonschema import ValidationError, validate
 from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.web.base_api_handler import BaseApiHandler
@@ -89,6 +90,22 @@ class ApiServersServerTasksIndexHandler(BaseApiHandler):
         data["server_id"] = server_id
         if not data.get("start_time"):
             data["start_time"] = "00:00"
+
+        # validate cron string
+        if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]):
+            return self.finish_json(
+                405,
+                {
+                    "status": "error",
+                    "error": self.helper.translation.translate(
+                        "error",
+                        "cronFormat",
+                        self.controller.users.get_user_lang_by_id(
+                            auth_data[4]["user_id"]
+                        ),
+                    ),
+                },
+            )
         task_id = self.tasks_manager.schedule_job(data)
 
         self.controller.management.add_to_audit_log(

app/classes/web/routes/api/servers/server/tasks/task/index.py

@@ -3,6 +3,7 @@
 import json
 import logging
 
+from croniter import croniter
 from jsonschema import ValidationError, validate
 from app.classes.models.server_permissions import EnumPermissionsServer
 
@@ -135,6 +136,20 @@ class ApiServersServerTasksTaskIndexHandler(BaseApiHandler):
             data["parent"] = None
 
         data["server_id"] = server_id
+        if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]):
+            return self.finish_json(
+                405,
+                {
+                    "status": "error",
+                    "error": self.helper.translation.translate(
+                        "error",
+                        "cronFormat",
+                        self.controller.users.get_user_lang_by_id(
+                            auth_data[4]["user_id"]
+                        ),
+                    ),
+                },
+            )
         self.tasks_manager.update_job(task_id, data)
 
         self.controller.management.add_to_audit_log(

app/frontend/templates/panel/server_config.html

@@ -622,9 +622,15 @@
         },
         body: formDataJsonString,
       });
-      let responseData = await res;
+      let responseData = await res.json();
-      if (responseData.statusText === "OK") {
+      if (responseData.status === "ok") {
         window.location.reload();
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+          });
       } 
     });
   });

app/frontend/templates/panel/server_schedule_edit.html

@@ -278,13 +278,20 @@
       let res = await fetch(`/api/v2/servers/${serverId}/tasks/`, {
         method: 'POST',
         headers: {
-          'X-XSRFToken': token
+          'X-XSRFToken': token,
+          "Content-Type": "application/json",
         },
         body: formDataJsonString,
       });
-      let responseData = await res;
+      let responseData = await res.json();
-      if (responseData.statusText === "OK") {
+      if (responseData.status === "ok") {
         window.location.href = `/panel/server_detail?id=${serverId}&subpage=schedules`;
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+          });
       } 
     });
 
@@ -315,13 +322,20 @@
       let res = await fetch(`/api/v2/servers/${serverId}/tasks/${schId}`, {
         method: 'PATCH',
         headers: {
-          'X-XSRFToken': token
+          'X-XSRFToken': token,
+          "Content-Type": "application/json", 
         },
         body: formDataJsonString,
       });
-      let responseData = await res;
+      let responseData = await res.json();
-      if (responseData.statusText === "OK") {
+      if (responseData.status === "ok") {
         window.location.href = `/panel/server_detail?id=${serverId}&subpage=schedules`;
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+          });
       } 
     });
 

app/translations/en_EN.json

@@ -186,7 +186,8 @@
         "terribleFailure": "What a Terrible Failure!",
         "superError": "You must be a super user to complete this action.",
         "fileError": "File type must be an image.",
-        "migration": "Crafty's main server storage is being mirgated to a new location. All server starts have been suspended during this time. Please wait while we finish this migration"
+        "migration": "Crafty's main server storage is being mirgated to a new location. All server starts have been suspended during this time. Please wait while we finish this migration",
+        "cronFormat": "Invalid Cron format detected"
     },
     "footer": {
         "allRightsReserved": "All rights reserved",