mirror of
https://github.com/home-assistant/core.git
synced 2025-07-16 09:47:13 +00:00
Fix telegram webhooks (#7236)
* Always register the view if a webhook exists. * Return True if platform is set up succesfully, False otherwise. * Remove the webhook when home assistant stops. Webhooks and long polling are mutually excklusive. If a webhook is left after home assistant is stopped, a polling telegram bot is unable to be set up, on next start of home assistant.
This commit is contained in:
parent
6a8a656fef
commit
0e662c4007
@ -50,7 +50,7 @@ def async_setup(hass, config):
|
|||||||
_LOGGER.error("Unknown notification service specified")
|
_LOGGER.error("Unknown notification service specified")
|
||||||
return
|
return
|
||||||
|
|
||||||
_LOGGER.info("Setting up1 %s.%s", DOMAIN, p_type)
|
_LOGGER.info("Setting up %s.%s", DOMAIN, p_type)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if hasattr(platform, 'async_setup_platform'):
|
if hasattr(platform, 'async_setup_platform'):
|
||||||
@ -73,8 +73,6 @@ def async_setup(hass, config):
|
|||||||
_LOGGER.exception('Error setting up platform %s', p_type)
|
_LOGGER.exception('Error setting up platform %s', p_type)
|
||||||
return
|
return
|
||||||
|
|
||||||
return True
|
|
||||||
|
|
||||||
setup_tasks = [async_setup_platform(p_type, p_config) for p_type, p_config
|
setup_tasks = [async_setup_platform(p_type, p_config) for p_type, p_config
|
||||||
in config_per_platform(config, DOMAIN)]
|
in config_per_platform(config, DOMAIN)]
|
||||||
|
|
||||||
@ -103,10 +101,10 @@ class BaseTelegramBotEntity:
|
|||||||
"""Check for basic message rules and fire an event if message is ok."""
|
"""Check for basic message rules and fire an event if message is ok."""
|
||||||
data = data.get('message')
|
data = data.get('message')
|
||||||
|
|
||||||
if (not data
|
if (not data or
|
||||||
or 'from' not in data
|
'from' not in data or
|
||||||
or 'text' not in data
|
'text' not in data or
|
||||||
or data['from'].get('id') not in self.allowed_chat_ids):
|
data['from'].get('id') not in self.allowed_chat_ids):
|
||||||
# Message is not correct.
|
# Message is not correct.
|
||||||
_LOGGER.error("Incoming message does not have required data.")
|
_LOGGER.error("Incoming message does not have required data.")
|
||||||
return False
|
return False
|
||||||
|
@ -11,9 +11,8 @@ from ipaddress import ip_network
|
|||||||
|
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
|
|
||||||
from homeassistant.const import (
|
from homeassistant.const import (
|
||||||
HTTP_BAD_REQUEST, HTTP_UNAUTHORIZED)
|
EVENT_HOMEASSISTANT_STOP, HTTP_BAD_REQUEST, HTTP_UNAUTHORIZED)
|
||||||
import homeassistant.helpers.config_validation as cv
|
import homeassistant.helpers.config_validation as cv
|
||||||
from homeassistant.components.http import HomeAssistantView
|
from homeassistant.components.http import HomeAssistantView
|
||||||
from homeassistant.components.telegram_bot import CONF_ALLOWED_CHAT_IDS, \
|
from homeassistant.components.telegram_bot import CONF_ALLOWED_CHAT_IDS, \
|
||||||
@ -27,6 +26,7 @@ REQUIREMENTS = ['python-telegram-bot==5.3.0']
|
|||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
TELEGRAM_HANDLER_URL = '/api/telegram_webhooks'
|
TELEGRAM_HANDLER_URL = '/api/telegram_webhooks'
|
||||||
|
REMOVE_HANDLER_URL = ''
|
||||||
|
|
||||||
CONF_TRUSTED_NETWORKS = 'trusted_networks'
|
CONF_TRUSTED_NETWORKS = 'trusted_networks'
|
||||||
DEFAULT_TRUSTED_NETWORKS = [
|
DEFAULT_TRUSTED_NETWORKS = [
|
||||||
@ -50,20 +50,21 @@ def setup_platform(hass, config, async_add_devices, discovery_info=None):
|
|||||||
bot = telegram.Bot(config[CONF_API_KEY])
|
bot = telegram.Bot(config[CONF_API_KEY])
|
||||||
|
|
||||||
current_status = bot.getWebhookInfo()
|
current_status = bot.getWebhookInfo()
|
||||||
handler_url = "{0}{1}".format(hass.config.api.base_url,
|
handler_url = '{0}{1}'.format(
|
||||||
TELEGRAM_HANDLER_URL)
|
hass.config.api.base_url, TELEGRAM_HANDLER_URL)
|
||||||
if current_status and current_status['url'] != handler_url:
|
if current_status and current_status['url'] != handler_url:
|
||||||
if bot.setWebhook(handler_url):
|
if bot.setWebhook(handler_url):
|
||||||
_LOGGER.info("set new telegram webhook %s", handler_url)
|
_LOGGER.info("set new telegram webhook %s", handler_url)
|
||||||
|
|
||||||
hass.http.register_view(
|
|
||||||
BotPushReceiver(
|
|
||||||
hass,
|
|
||||||
config[CONF_ALLOWED_CHAT_IDS],
|
|
||||||
config[CONF_TRUSTED_NETWORKS]))
|
|
||||||
|
|
||||||
else:
|
else:
|
||||||
_LOGGER.error("set telegram webhook failed %s", handler_url)
|
_LOGGER.error("set telegram webhook failed %s", handler_url)
|
||||||
|
return False
|
||||||
|
|
||||||
|
hass.bus.listen_once(
|
||||||
|
EVENT_HOMEASSISTANT_STOP,
|
||||||
|
lambda event: bot.setWebhook(REMOVE_HANDLER_URL))
|
||||||
|
hass.http.register_view(BotPushReceiver(
|
||||||
|
hass, config[CONF_ALLOWED_CHAT_IDS], config[CONF_TRUSTED_NETWORKS]))
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
class BotPushReceiver(HomeAssistantView, BaseTelegramBotEntity):
|
class BotPushReceiver(HomeAssistantView, BaseTelegramBotEntity):
|
||||||
@ -71,7 +72,7 @@ class BotPushReceiver(HomeAssistantView, BaseTelegramBotEntity):
|
|||||||
|
|
||||||
requires_auth = False
|
requires_auth = False
|
||||||
url = TELEGRAM_HANDLER_URL
|
url = TELEGRAM_HANDLER_URL
|
||||||
name = "telegram_webhooks"
|
name = 'telegram_webhooks'
|
||||||
|
|
||||||
def __init__(self, hass, allowed_chat_ids, trusted_networks):
|
def __init__(self, hass, allowed_chat_ids, trusted_networks):
|
||||||
"""Initialize the class."""
|
"""Initialize the class."""
|
||||||
|
Loading…
x
Reference in New Issue
Block a user