Skip to content

Py3 compatibility for signature verification#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fophillips merged 2 commits into from
Feb 19, 2017
Merged

Py3 compatibility for signature verification #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
826b19f
enable py3 compatibility for signature verification
rascalking Feb 3, 2017
b9a84e9
check for none, not just falsiness
rascalking Feb 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion github_webhook/webhook.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import hmac
import logging

import six
from flask import abort, request


Expand All@@ -21,6 +22,8 @@ def __init__(self, app, endpoint='/postreceive', secret=None):

self._hooks = collections.defaultdict(list)
self._logger = logging.getLogger('webhook')
if secret is not None and not isinstance(secret, six.binary_type):
secret = secret.encode('utf-8')
self._secret = secret

def hook(self, event_type='push'):
Expand DownExpand Up@@ -50,9 +53,11 @@ def _postreceive(self):

if digest is not None:
sig_parts = _get_header('X-Hub-Signature').split('=', 1)
if not isinstance(digest, six.text_type):
digest = six.text_type(digest)

if (len(sig_parts) < 2 or sig_parts[0] != 'sha1'
or not hmac.compare_digest(sig_parts[1], unicode(digest))):
or not hmac.compare_digest(sig_parts[1], digest)):
abort(400, 'Invalid signature')

event_type = _get_header('X-Github-Event')
Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@
author_email="[email protected], [email protected], [email protected], [email protected]",
license='Apache 2.0',
packages=["github_webhook"],
install_requires=['flask'],
install_requires=['flask', 'six'],
tests_require=['mock', 'nose'],

classifiers=[
'Development Status :: 4 - Beta',
Expand Down