Make SSL verification configurable with registry value verifySSL

This commit is contained in:
Skeeter Alvarez 2017-04-04 13:32:17 -07:00
parent 0837ad539e
commit a79c679ca7
2 changed files with 7 additions and 3 deletions

View File

@ -30,6 +30,9 @@ SpiffyTitles = conf.registerPlugin('SpiffyTitles')
conf.registerGlobalValue(SpiffyTitles, 'maxRetries',
registry.Integer(3, _("""Maximum retries upon failure""")))
conf.registerGlobalValue(SpiffyTitles, 'verifySSL',
registry.Boolean(True, _("""Request websites if SSL cert verification fails?""")))
conf.registerGlobalValue(SpiffyTitles, 'wallClockTimeoutInSeconds',
registry.Integer(8, _("""Timeout for getting a title. If you set this too high, the bot will time out.""")))
@ -140,10 +143,10 @@ conf.registerGlobalValue(SpiffyTitles, 'linkCacheLifetimeInSeconds',
conf.registerChannelValue(SpiffyTitles, 'onDemandTitleError',
registry.String("Error retrieving title.", _("""This error message is used when there is a problem getting an on-demand title""")))
conf.registerGlobalValue(SpiffyTitles, 'linkMessageIgnorePattern',
registry.Regexp("", _("""Messages matching this pattern will be ignored.""")))
conf.registerChannelValue(SpiffyTitles, 'ignoreActionLinks',
registry.Boolean(True, _("""Ignores URLs that appear in an action such as /me""")))

View File

@ -1266,6 +1266,7 @@ class SpiffyTitles(callbacks.Plugin):
Get the HTML of a website based on a URL
"""
max_retries = self.registryValue("maxRetries")
verify_ssl_certs = self.registryValue("verifySSL")
if retries is None:
retries = 1
@ -1282,7 +1283,7 @@ class SpiffyTitles(callbacks.Plugin):
log.debug("SpiffyTitles: requesting %s" % (url))
request = requests.get(url, headers=headers, timeout=15, allow_redirects=True, verify=False)
request = requests.get(url, headers=headers, timeout=15, allow_redirects=True, verify=verify_ssl_certs)
is_redirect = False
if request.history: