tubearchivist/tubearchivist-frontend
1
0
Fork 0
mirror of https://github.com/tubearchivist/tubearchivist-frontend.git synced 2024-11-22 11:50:14 +00:00
Code Issues Projects Releases Wiki Activity

improve scheduler validation with regex, #126

Browse Source
This commit is contained in:
simon 2022-01-08 20:04:51 +07:00
parent c660edd997
commit 1a95797997
No known key found for this signature in database
GPG Key ID: 2C15AA5E89985DD4
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tubearchivist/home/src/config.py
View File

@ -7,6 +7,7 @@ Functionality:
import json import json
import os import os
import re
from celery.schedules import crontab from celery.schedules import crontab
from home.src.helper import RedisArchivist from home.src.helper import RedisArchivist
@ -206,6 +207,10 @@ class ScheduleBuilder:
if to_check == "0": if to_check == "0":
# deactivate this schedule # deactivate this schedule
return False return False
if re.search(r"[\d]{1,2}\/[\d]{1,2}", to_check):
# number/number cron format will fail in celery
print("number/number schedule formatting not supported")
raise ValueError
keys = ["minute", "hour", "day_of_week"] keys = ["minute", "hour", "day_of_week"]
if to_check == "auto": if to_check == "auto":
@ -219,8 +224,11 @@ class ScheduleBuilder:
raise ValueError("invalid input") raise ValueError("invalid input")
to_write = dict(zip(keys, values)) to_write = dict(zip(keys, values))
if "*" in to_write["minute"]: try:
raise ValueError("too frequent: wildcard in minutes not supported") int(to_write["minute"])
except ValueError as error:
print("too frequent: only number in minutes are supported")
raise ValueError("invalid input") from error
return to_write return to_write