mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-12-22 09:44:57 -05:00
d6752ce5da
* Remove redundant python2 support code `str.decode()` doesn't exist on python3, so presumably this code was doing nothing * Filter out pushers with corrupt data When we get a row with unparsable json, drop the row, rather than returning a row with null `data`, which will then cause an explosion later on. * Improve logging when we can't start a pusher Log the ID to help us understand the problem * Make email pusher setup more robust We know we'll have a `data` member, since that comes from the database. What we *don't* know is if that is a dict, and if that has a `brand` member, and if that member is a string.
91 lines
3.0 KiB
Python
91 lines
3.0 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Copyright 2014-2016 OpenMarket Ltd
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import logging
|
|
|
|
from .httppusher import HttpPusher
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# We try importing this if we can (it will fail if we don't
|
|
# have the optional email dependencies installed). We don't
|
|
# yet have the config to know if we need the email pusher,
|
|
# but importing this after daemonizing seems to fail
|
|
# (even though a simple test of importing from a daemonized
|
|
# process works fine)
|
|
try:
|
|
from synapse.push.emailpusher import EmailPusher
|
|
from synapse.push.mailer import Mailer, load_jinja2_templates
|
|
except Exception:
|
|
pass
|
|
|
|
|
|
class PusherFactory(object):
|
|
def __init__(self, hs):
|
|
self.hs = hs
|
|
self.config = hs.config
|
|
|
|
self.pusher_types = {"http": HttpPusher}
|
|
|
|
logger.info("email enable notifs: %r", hs.config.email_enable_notifs)
|
|
if hs.config.email_enable_notifs:
|
|
self.mailers = {} # app_name -> Mailer
|
|
|
|
self.notif_template_html, self.notif_template_text = load_jinja2_templates(
|
|
self.config.email_template_dir,
|
|
[
|
|
self.config.email_notif_template_html,
|
|
self.config.email_notif_template_text,
|
|
],
|
|
apply_format_ts_filter=True,
|
|
apply_mxc_to_http_filter=True,
|
|
public_baseurl=self.config.public_baseurl,
|
|
)
|
|
|
|
self.pusher_types["email"] = self._create_email_pusher
|
|
|
|
logger.info("defined email pusher type")
|
|
|
|
def create_pusher(self, pusherdict):
|
|
kind = pusherdict["kind"]
|
|
f = self.pusher_types.get(kind, None)
|
|
if not f:
|
|
return None
|
|
logger.debug("creating %s pusher for %r", kind, pusherdict)
|
|
return f(self.hs, pusherdict)
|
|
|
|
def _create_email_pusher(self, _hs, pusherdict):
|
|
app_name = self._app_name_from_pusherdict(pusherdict)
|
|
mailer = self.mailers.get(app_name)
|
|
if not mailer:
|
|
mailer = Mailer(
|
|
hs=self.hs,
|
|
app_name=app_name,
|
|
template_html=self.notif_template_html,
|
|
template_text=self.notif_template_text,
|
|
)
|
|
self.mailers[app_name] = mailer
|
|
return EmailPusher(self.hs, pusherdict, mailer)
|
|
|
|
def _app_name_from_pusherdict(self, pusherdict):
|
|
data = pusherdict["data"]
|
|
|
|
if isinstance(data, dict):
|
|
brand = data.get("brand")
|
|
if isinstance(brand, str):
|
|
return brand
|
|
|
|
return self.config.email_app_name
|