From 2f33e9724d615b8bb7e32bd124d9dd9c3ded7a87 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Tue, 31 Jul 2018 16:17:24 -0400 Subject: [PATCH] force webhooks to use the same JSONEncoder class as DRF - fixes #2137 --- netbox/extras/webhooks_worker.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/netbox/extras/webhooks_worker.py b/netbox/extras/webhooks_worker.py index 0cd89bd0a..91e95baa1 100644 --- a/netbox/extras/webhooks_worker.py +++ b/netbox/extras/webhooks_worker.py @@ -1,8 +1,10 @@ import hashlib import hmac - import requests +import json + from django_rq import job +from rest_framework.utils.encoders import JSONEncoder from extras.constants import WEBHOOK_CT_JSON, WEBHOOK_CT_X_WWW_FORM_ENCODED, OBJECTCHANGE_ACTION_CHOICES @@ -13,9 +15,9 @@ def process_webhook(webhook, data, model_class, event, timestamp): Make a POST request to the defined Webhook """ payload = { - 'event': dict(OBJECTCHANGE_ACTION_CHOICES)[event], + 'event': dict(OBJECTCHANGE_ACTION_CHOICES)[event].lower(), 'timestamp': timestamp, - 'model': model_class.__name__, + 'model': model_class._meta.model_name, 'data': data } headers = { @@ -28,7 +30,7 @@ def process_webhook(webhook, data, model_class, event, timestamp): } if webhook.http_content_type == WEBHOOK_CT_JSON: - params.update({'json': payload}) + params.update({'data': json.dumps(payload, cls=JSONEncoder)}) elif webhook.http_content_type == WEBHOOK_CT_X_WWW_FORM_ENCODED: params.update({'data': payload})