Przeglądaj źródła

Fix 4549 webhook body encode in utf-8

kobayashi 5 lat temu
rodzic
commit
39ea14202e

+ 1 - 0
docs/release-notes/version-2.8.md

@@ -11,6 +11,7 @@
 ### Bug Fixes
 
 * [#4527](https://github.com/netbox-community/netbox/issues/4527) - Fix assignment of certain tags to config contexts
+* [#4549](https://github.com/netbox-community/netbox/issues/4549) - Fix encoding unicode webhook body data
 
 ---
 

+ 1 - 1
netbox/extras/webhooks.py

@@ -17,7 +17,7 @@ def generate_signature(request_body, secret):
     """
     hmac_prep = hmac.new(
         key=secret.encode('utf8'),
-        msg=request_body.encode('utf8'),
+        msg=request_body,
         digestmod=hashlib.sha512
     )
     return hmac_prep.hexdigest()

+ 1 - 1
netbox/extras/webhooks_worker.py

@@ -46,7 +46,7 @@ def process_webhook(webhook, data, model_name, event, timestamp, username, reque
         'method': webhook.http_method,
         'url': webhook.payload_url,
         'headers': headers,
-        'data': body,
+        'data': body.encode('utf8'),
     }
     logger.info(
         "Sending {} request to {} ({} {})".format(