Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add webhook patch

Browse Source
This commit is contained in:
amcmanu3
2023-06-03 15:24:28 -04:00
parent 0877f650f4
commit 0a2b8694ac
1 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
View File

@ -13,7 +13,7 @@ from app.classes.web.base_api_handler import BaseApiHandler
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
task_patch_schema = { webhook_patch_schema = {
"type": "object", "type": "object",
"properties": { "properties": {
"webhook_type": {"type": "string", "enum": WebhookHandler.get_providers()}, "webhook_type": {"type": "string", "enum": WebhookHandler.get_providers()},
@ -82,7 +82,7 @@ class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
return self.finish_json(200, {"status": "ok"}) return self.finish_json(200, {"status": "ok"})
def patch(self, server_id: str, task_id: str): def patch(self, server_id: str, webhook_id: str):
auth_data = self.authenticate_user() auth_data = self.authenticate_user()
if not auth_data: if not auth_data:
return return
@ -95,7 +95,7 @@ class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
) )
try: try:
validate(data, task_patch_schema) validate(data, webhook_patch_schema)
except ValidationError as e: except ValidationError as e:
return self.finish_json( return self.finish_json(
400, 400,
@ -111,7 +111,7 @@ class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"}) return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
if ( if (
EnumPermissionsServer.SCHEDULE EnumPermissionsServer.CONFIG
not in self.controller.server_perms.get_user_id_permissions_list( not in self.controller.server_perms.get_user_id_permissions_list(
auth_data[4]["user_id"], server_id auth_data[4]["user_id"], server_id
) )
@ -119,34 +119,14 @@ class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
# if the user doesn't have Schedule permission, return an error # if the user doesn't have Schedule permission, return an error
return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"}) return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
# Checks to make sure some doofus didn't actually make the newly
# created task a child of itself.
if str(data.get("parent")) == str(task_id) and data.get("parent") is not None:
data["parent"] = None
data["server_id"] = server_id data["server_id"] = server_id
if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]): self.controller.management.modify_webhook(webhook_id, data)
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( self.controller.management.add_to_audit_log(
auth_data[4]["user_id"], auth_data[4]["user_id"],
f"Edited server {server_id}: updated schedule", f"Edited server {server_id}: updated webhook",
server_id, server_id,
self.get_remote_ip(), self.get_remote_ip(),
) )
self.tasks_manager.reload_schedule_from_db()
self.finish_json(200, {"status": "ok"}) self.finish_json(200, {"status": "ok"})