feat: add gcm endpoint configuration argument

Closes #1315

autopush/config.py

@@ -257,7 +257,8 @@ def from_argparse(cls, ns, **kwargs):
                                   "dryrun": ns.gcm_dryrun,
                                   "max_data": ns.max_data,
                                   "collapsekey": ns.gcm_collapsekey,
-                                  "senderIDs": sender_ids}
+                                  "senderIDs": sender_ids,
+                                  "endpoint": ns.gcm_endpoint}
         client_certs = None
         # endpoint only
         if getattr(ns, 'client_certs', None):

autopush/main_argparse.py

@@ -161,6 +161,9 @@ def _add_external_router_args(parser):
                         env_var="GCM_COLLAPSEKEY")
     parser.add_argument('--senderid_list', help='GCM SenderIDs/auth keys',
                         type=str, default="{}", env_var="SENDERID_LIST")
+    parser.add_argument('--gcm_endpoint', help="%s endpoint to use" % label,
+                        type=str, default="gcm-http.googleapis.com/gcm/send",
+                        env_var="GCM_ENDPOINT")
     # FCM
     parser.add_argument('--fcm_enabled', help="Enable FCM Bridge",
                         action="store_true", default=False,

autopush/router/gcm.py

@@ -30,14 +30,16 @@ def __init__(self, conf, router_conf, metrics):
         timeout = router_conf.get("timeout", DEFAULT_ROUTER_TIMEOUT)
         self.gcmclients = {}
         self.senderIDs = {}
+        self.gcm_endpoint = router_conf["endpoint"]
         # Flatten the SenderID list from human readable and init gcmclient
         if not router_conf.get("senderIDs"):
             raise IOError("SenderIDs not configured.")
         for sid in router_conf.get("senderIDs"):
             auth = router_conf.get("senderIDs").get(sid).get("auth")
             self.senderIDs[sid] = auth
             self.gcmclients[sid] = gcmclient.GCM(auth, timeout=timeout,
-                                                 logger=self.log)
+                                                 logger=self.log,
+                                                 endpoint=self.gcm_endpoint)
         self._base_tags = ["platform:gcm"]
         self.log.debug("Starting GCM router...")
 

autopush/tests/test_endpoint.py

@@ -7,23 +7,18 @@
 from twisted.internet.defer import inlineCallbacks
 from twisted.trial import unittest
 
-
 import autopush.utils as utils
 from autopush.config import AutopushConfig
-from autopush.db import (
-    Message,
-    ItemNotFound,
-    has_connected_this_month,
-    Router
-)
+from autopush.db import (ItemNotFound, Message, Router,
+                         has_connected_this_month)
 from autopush.exceptions import RouterException
 from autopush.http import EndpointHTTPFactory
 from autopush.metrics import SinkMetrics
 from autopush.router import routers_from_config
 from autopush.router.interface import IRouter
 from autopush.tests.client import Client
-from autopush.tests.test_db import make_webpush_notification
 from autopush.tests.support import test_db
+from autopush.tests.test_db import make_webpush_notification
 from autopush.utils import (
     generate_hash,
 )
@@ -286,7 +281,8 @@ def test_post_gcm(self):
         sids = {"182931248179192": {"auth": "aailsjfilajdflijdsilfjsliaj"}}
         gcm = GCMRouter(
             self.conf,
-            {"dryrun": True, "senderIDs": sids},
+            {"dryrun": True, "senderIDs": sids,
+             "endpoint": "gcm-http.googleapis.com/gcm/send"},
             SinkMetrics()
         )
         self.routers["gcm"] = gcm

autopush/tests/test_integration.py

@@ -1666,6 +1666,7 @@ def _add_router(self):
                 "dryrun": True,
                 "max_data": 4096,
                 "collapsekey": "test",
+                "endpoint": "gcm-http.googleapis.com/gcm/send",
                 "senderIDs": {self.senderID:
                               {"auth": "AIzaSyCx9PRtH8ByaJR3Cf"
                                        "Jamz0D2N0uaCgRGiI"}}

autopush/tests/test_router.py

@@ -1,46 +1,37 @@
 # -*- coding: utf-8 -*-
-from unittest import TestCase
-import uuid
-import time
-import json
 import decimal
+import json
 import socket
 import ssl
+import time
+import uuid
+from unittest import TestCase
 
+import hyper.tls
+import pyfcm
 import pytest
 import treq
 from botocore.exceptions import ClientError
+from hyper.http20.exceptions import HTTP20Error
 from mock import Mock, PropertyMock, patch
 from oauth2client.service_account import ServiceAccountCredentials
-from twisted.trial import unittest
-from twisted.internet.error import (
-    ConnectionRefusedError,
-    ConnectError,
-    TimeoutError,
-)
-from twisted.internet.defer import inlineCallbacks, Deferred
+from twisted.internet.defer import Deferred, inlineCallbacks
+from twisted.internet.error import (ConnectError, ConnectionRefusedError,
+                                    TimeoutError)
 from twisted.python.failure import Failure
+from twisted.trial import unittest
 from twisted.web.client import Agent
 from twisted.web.http_headers import Headers
 
-import hyper.tls
-import pyfcm
-from hyper.http20.exceptions import HTTP20Error
-
 from autopush.config import AutopushConfig
 from autopush.db import (
     Message
 )
 from autopush.exceptions import ItemNotFound, RouterException
 from autopush.metrics import SinkMetrics
-from autopush.router import (
-    APNSRouter,
-    GCMRouter,
-    WebPushRouter,
-    FCMRouter,
-    gcmclient,
-    FCMv1Router, fcmv1client)
-from autopush.router.interface import RouterResponse, IRouter
+from autopush.router import (APNSRouter, FCMRouter, FCMv1Router, GCMRouter,
+                             WebPushRouter, fcmv1client, gcmclient)
+from autopush.router.interface import IRouter, RouterResponse
 from autopush.tests import MockAssist
 from autopush.tests.support import test_db
 from autopush.utils import WebPushNotification
@@ -363,7 +354,8 @@ def setUp(self):
         self.gcm_config = {'max_data': 32,
                            'ttl': 60,
                            'senderIDs': {'test123':
-                                         {"auth": "12345678abcdefg"}}}
+                                         {"auth": "12345678abcdefg"}},
+                           'endpoint': 'gcm-http.googleapis.com/gcm/send'}
         self._m_request = Deferred()
         self.response = Mock(spec=treq.response._Response)
         self.response.code = 200
@@ -426,7 +418,9 @@ def test_init(self):
             statsd_host=None,
         )
         with pytest.raises(IOError):
-            GCMRouter(conf, {"senderIDs": {}}, SinkMetrics())
+            GCMRouter(conf, {"senderIDs": {},
+                             "endpoint": "gcm-http.googleapis.com/gcm/send"},
+                      SinkMetrics())
 
     def test_register(self):
         router_data = {"token": "test123"}

autopush/tests/test_z_main.py

@@ -262,6 +262,7 @@ class TestArg(AutopushConfig):
         apns_creds = json.dumps({"firefox": {"cert": "cert.file",
                                              "key": "key.file"}})
         gcm_enabled = True
+        gcm_endpoint = "gcm-http.googleapis.com/gcm/send"
         # less important stuff
         gcm_ttl = 999
         gcm_dryrun = False
@@ -353,6 +354,7 @@ def test_ssl(self):
     def test_bad_senderidlist(self):
         returncode = endpoint_main([
             "--gcm_enabled",
+            "--gcm_endpoint='gcm-http.googleapis.com/gcm/send'"
             "--senderid_list='[Invalid'"
         ], False)
         assert returncode not in (None, 0)
@@ -456,6 +458,7 @@ def test_bad_fcm_senders(self):
     def test_gcm_start(self):
         endpoint_main([
             "--gcm_enabled",
+            "--gcm_endpoint='gcm-http.googleapis.com/gcm/send'",
             """--senderid_list={"123":{"auth":"abcd"}}""",
         ], False, resource=autopush.tests.boto_resource)