bug: Normalize encryption headers.

autopush/router/webpush.py

@@ -53,7 +53,8 @@ def _crypto_headers(self, notification):
         # they're present to avoid empty strings.
         for name in ["encryption-key", "crypto-key"]:
             if name in headers:
-                data[name] = headers[name]
+                # Normalize hyphens in header names.
+                data[name.replace("-", "_")] = headers[name]
         return data
 
     @inlineCallbacks

autopush/tests/test_integration.py

@@ -598,6 +598,10 @@ def test_webpush_data_delivery_to_disconnected_client(self):
             chan = result["channelID"]
             test = tests[chan]
             eq_(result["data"], test["result"])
+            headers = result["headers"]
+            ok_("crypto_key" in headers)
+            ok_("encryption" in headers)
+            ok_("encoding" in headers)
             yield client.ack(chan, result["version"])
 
         yield self.shut_down(client)

autopush/tests/test_router.py

@@ -717,7 +717,7 @@ def verify_deliver(result):
             eq_(result.status_code, 201)
             t_h = self.message_mock.store_message.call_args[1].get('headers')
             eq_(t_h.get('encryption'), self.headers.get('encryption'))
-            eq_(t_h.get('crypto-key'), self.headers.get('crypto-key'))
+            eq_(t_h.get('crypto_key'), self.headers.get('crypto-key'))
             eq_(t_h.get('encoding'), self.headers.get('content-encoding'))
             self.router.metrics.increment.assert_called_with(
                 "router.broadcast.save_hit"