moved validate_webhook and authenticate out in to a client of their own

Author: Callum Oakley

.DS_Store

@@ -153,7 +153,7 @@ pusher.trigger_batch([
 
 ## Push Notifications (BETA)
 
-Pusher now allows sending native notifications to iOS and Android devices. Check out the [documentation](https://pusher.com/docs/push_notifications) for information on how to set up push notifications on Android and iOS. There is no additional setup required to use it with this library. It works out of the box wit the same Pusher instance. All you need are the same pusher credentials.
+Pusher now allows sending native notifications to iOS and Android devices. Check out the [documentation](https://pusher.com/docs/push_notifications) for information on how to set up push notifications on Android and iOS. There is no additional setup required to use it with this library. It works out of the box with the same Pusher instance. All you need are the same pusher credentials.
 
 ### Sending native pushes
 

README.md

@@ -0,0 +1,111 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (
+    print_function,
+    unicode_literals,
+    absolute_import,
+    division)
+
+from pusher.util import (
+    ensure_text,
+    validate_channel,
+    validate_socket_id,
+    data_to_string)
+
+from pusher.client import Client
+from pusher.http import GET, POST, Request, request_method
+
+import collections
+import hashlib
+import json
+import os
+import re
+import six
+import time
+
+
+class AuthenticationClient(Client):
+    def __init__(
+            self, app_id, key, secret, ssl=True, host=None, port=None,
+            timeout=5, cluster=None, json_encoder=None, json_decoder=None,
+            backend=None, **backend_options):
+        super(AuthenticationClient, self).__init__(
+            app_id, key, secret, ssl, host, port, timeout, cluster,
+            json_encoder, json_decoder, backend, **backend_options)
+
+        if host:
+            self._host = ensure_text(host, "host")
+
+        elif cluster:
+            self._host = (
+                six.text_type("api-%s.pusher.com") %
+                ensure_text(cluster, "cluster"))
+        else:
+            self._host = six.text_type("api.pusherapp.com")
+
+
+    def authenticate(self, channel, socket_id, custom_data=None):
+        """Used to generate delegated client subscription token.
+
+        :param channel: name of the channel to authorize subscription to
+        :param socket_id: id of the socket that requires authorization
+        :param custom_data: used on presence channels to provide user info
+        """
+        channel = validate_channel(channel)
+
+        if not channel_name_re.match(channel):
+            raise ValueError('Channel should be a valid channel, got: %s' % channel)
+
+        socket_id = validate_socket_id(socket_id)
+
+        if custom_data:
+            custom_data = json.dumps(custom_data, cls=self._json_encoder)
+
+        string_to_sign = "%s:%s" % (socket_id, channel)
+
+        if custom_data:
+            string_to_sign += ":%s" % custom_data
+
+        signature = sign(self.secret, string_to_sign)
+
+        auth = "%s:%s" % (self.key, signature)
+        result = {'auth': auth}
+
+        if custom_data:
+            result['channel_data'] = custom_data
+
+        return result
+
+
+    def validate_webhook(self, key, signature, body):
+        """Used to validate incoming webhook messages. When used it guarantees
+        that the sender is Pusher and not someone else impersonating it.
+
+        :param key: key used to sign the body
+        :param signature: signature that was given with the body
+        :param body: content that needs to be verified
+        """
+        key = ensure_text(key, "key")
+        signature = ensure_text(signature, "signature")
+        body = ensure_text(body, "body")
+
+        if key != self.key:
+            return None
+
+        if not verify(self.secret, body, signature):
+            return None
+
+        try:
+            body_data = json.loads(body, cls=self._json_decoder)
+
+        except ValueError:
+            return None
+
+        time_ms = body_data.get('time_ms')
+        if not time_ms:
+            return None
+
+        if abs(time.time()*1000 - time_ms) > 300000:
+            return None
+
+        return body_data

pusher/authentication_client.py

@@ -17,6 +17,7 @@
 from pusher.signature import sign, verify
 from pusher.pusher_client import PusherClient
 from pusher.notification_client import NotificationClient
+from pusher.authentication_client import AuthenticationClient
 
 import collections
 import hashlib
@@ -55,6 +56,10 @@ def __init__(
             app_id, key, secret, ssl, host, port, timeout, cluster,
             json_encoder, json_decoder, backend, **backend_options)
 
+        self._authentication_client = AuthenticationClient(
+            app_id, key, secret, ssl, host, port, timeout, cluster,
+            json_encoder, json_decoder, backend, **backend_options)
+
         self._notification_client = NotificationClient(
             app_id, key, secret, notification_ssl, notification_host, port,
             timeout, cluster, json_encoder, json_decoder, backend,
@@ -63,7 +68,7 @@ def __init__(
 
     @classmethod
     def from_url(cls, url, **options):
-        """Alternate constructor that extracts the information from a URL.
+        """Alternative constructor that extracts the information from a URL.
 
         :param url: String containing a URL
 
@@ -93,7 +98,7 @@ def from_url(cls, url, **options):
 
     @classmethod
     def from_env(cls, env='PUSHER_URL', **options):
-        """Alternate constructor that extracts the information from an URL
+        """Alternative constructor that extracts the information from an URL
         stored in an environment variable. The pusher heroku addon will set
         the PUSHER_URL automatically when installed for example.
 
@@ -121,6 +126,7 @@ def trigger(self, channels, event_name, data, socket_id=None):
     def trigger_batch(self, batch=[], already_encoded=False):
         return self._pusher_client.trigger_batch(batch, already_encoded)
 
+
     @doc_string(PusherClient.channels_info.__doc__)
     def channels_info(self, prefix_filter=None, attributes=[]):
         return self._pusher_client.channels_info(prefix_filter, attributes)
@@ -136,14 +142,16 @@ def users_info(self, channel):
         return self._pusher_client.users_info(channel)
 
 
-    @doc_string(PusherClient.authenticate.__doc__)
+    @doc_string(AuthenticationClient.authenticate.__doc__)
     def authenticate(self, channel, socket_id, custom_data=None):
-        return self.pusher_client.authenticate(channel, socket_id, custom_data)
+        return self._authentication_client.authenticate(
+            channel, socket_id, custom_data)
 
 
-    @doc_string(PusherClient.validate_webhook.__doc__)
-    def authenticate(self, key, signature, body):
-        return self.pusher_client.validate_webhook(key, signature, body)
+    @doc_string(AuthenticationClient.validate_webhook.__doc__)
+    def validate_webhook(self, key, signature, body):
+        return self._authentication_client.validate_webhook(
+            key, signature, body)
 
 
     @doc_string(NotificationClient.notify.__doc__)

pusher/pusher.py

@@ -29,8 +29,7 @@ class PusherClient(Client):
     def __init__(
             self, app_id, key, secret, ssl=True, host=None, port=None,
             timeout=5, cluster=None, json_encoder=None, json_decoder=None,
-            backend=None, notification_host=None, notification_ssl=True,
-            **backend_options):
+            backend=None, **backend_options):
         super(PusherClient, self).__init__(
             app_id, key, secret, ssl, host, port, timeout, cluster,
             json_encoder, json_decoder, backend, **backend_options)
@@ -147,70 +146,3 @@ def users_info(self, channel):
 
         return Request(
             self, GET, "/apps/%s/channels/%s/users" % (self.app_id, channel))
-
-
-    def authenticate(self, channel, socket_id, custom_data=None):
-        """Used to generate delegated client subscription token.
-
-        :param channel: name of the channel to authorize subscription to
-        :param socket_id: id of the socket that requires authorization
-        :param custom_data: used on presence channels to provide user info
-        """
-        channel = validate_channel(channel)
-
-        if not channel_name_re.match(channel):
-            raise ValueError('Channel should be a valid channel, got: %s' % channel)
-
-        socket_id = validate_socket_id(socket_id)
-
-        if custom_data:
-            custom_data = json.dumps(custom_data, cls=self._json_encoder)
-
-        string_to_sign = "%s:%s" % (socket_id, channel)
-
-        if custom_data:
-            string_to_sign += ":%s" % custom_data
-
-        signature = sign(self.secret, string_to_sign)
-
-        auth = "%s:%s" % (self.key, signature)
-        result = {'auth': auth}
-
-        if custom_data:
-            result['channel_data'] = custom_data
-
-        return result
-
-
-    def validate_webhook(self, key, signature, body):
-        """Used to validate incoming webhook messages. When used it guarantees
-        that the sender is Pusher and not someone else impersonating it.
-
-        :param key: key used to sign the body
-        :param signature: signature that was given with the body
-        :param body: content that needs to be verified
-        """
-        key = ensure_text(key, "key")
-        signature = ensure_text(signature, "signature")
-        body = ensure_text(body, "body")
-
-        if key != self.key:
-            return None
-
-        if not verify(self.secret, body, signature):
-            return None
-
-        try:
-            body_data = json.loads(body, cls=self._json_decoder)
-
-        except ValueError:
-            return None
-
-        time_ms = body_data.get('time_ms')
-        if not time_ms:
-            return None
-
-        if abs(time.time()*1000 - time_ms) > 300000:
-            return None
-
-        return body_data