mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fix 4549 webhook body encode in utf-8

Browse Source
This commit is contained in:
kobayashi
2020-04-29 00:06:26 -04:00
parent 4971054c34
commit 39ea14202e
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.8.md
View File

@ -11,6 +11,7 @@
### Bug Fixes ### Bug Fixes
* [#4527](https://github.com/netbox-community/netbox/issues/4527) - Fix assignment of certain tags to config contexts * [#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
--- ---

2
netbox/extras/webhooks.py
View File

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

2
netbox/extras/webhooks_worker.py
View File

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