OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2025-03-16 12:25:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

Check SSL-Certificate, if possible

Browse source
This commit is contained in:
Jannes Höke 2015-11-22 01:03:29 +01:00
parent 4d87e236be
commit a6e5a71e05
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
telegram/boteventhandler.py
View file

@ -10,6 +10,8 @@ import ssl
from threading import Thread
from time import sleep
import subprocess
from telegram import (Bot, TelegramError, broadcaster, Broadcaster,
NullHandler)
from telegram.utils.webhookhandler import (WebhookServer, WebhookHandler)
@ -182,17 +184,25 @@ class BotEventHandler:
self.httpd = WebhookServer((listen, port), WebhookHandler,
self.update_queue, url_path)
# Check SSL-Certificate with openssl, if possible
try:
self.httpd.socket = ssl.wrap_socket(self.httpd.socket,
certfile=cert,
keyfile=key,
server_side=True)
except ssl.SSLError as error:
self.logger.error(str(error))
return
exit_code = subprocess.call(["openssl", "x509", "-text", "-noout",
"-in", cert])
except OSError:
exit_code = 0
self.httpd.serve_forever(poll_interval=1)
self.logger.info('Event Handler thread stopped')
if exit_code is 0:
try:
self.httpd.socket = ssl.wrap_socket(self.httpd.socket,
certfile=cert,
keyfile=key,
server_side=True)
except ssl.SSLError as error:
self.logger.error(str(error))
return
self.httpd.serve_forever(poll_interval=1)
self.logger.info('Event Handler thread stopped')
def stop(self):
"""