Hopiu/linkchecker
1
0
Fork 0
mirror of https://github.com/Hopiu/linkchecker.git synced 2026-04-30 11:04:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ssl connection handling and change plugin type to connection plugin.

Browse source
This commit is contained in:
Bastian Kleineidam 2014-03-19 14:28:33 +01:00
parent 9be667b52a
commit e528d5f7db
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
linkcheck/plugins/sslcertcheck.py
View file

@ -19,7 +19,7 @@ Handle https links.
"""
import time
import threading
from . import _ContentPlugin
from . import _ConnectionPlugin
from .. import log, LOG_PLUGIN, strformat, LinkCheckerError
from ..decorators import synchronized
@ -28,7 +28,7 @@ _lock = threading.Lock()
# configuration option names
sslcertwarndays = "sslcertwarndays"
class SslCertificateCheck(_ContentPlugin):
class SslCertificateCheck(_ConnectionPlugin):
"""Check SSL certificate expiration date. Only internal https: links
will be checked. A domain will only be checked once to avoid duplicate
warnings.
@ -62,17 +62,19 @@ class SslCertificateCheck(_ContentPlugin):
if raw_connection.sock is None:
# sometimes the socket is not yet connected
# see https://github.com/kennethreitz/requests/issues/1966
raw_connection.sock.connect()
raw_connection.connect()
ssl_sock = raw_connection.sock
cert = ssl_sock.getpeercert()
log.debug(LOG_PLUGIN, "Got SSL certificate %s", cert)
#if not cert:
# return
cipher_name, ssl_protocol, secret_bits = ssl_sock.cipher()
msg = _(u"SSL cipher %(cipher)s, %(protocol)s.")
attrs = dict(cipher=cipher_name, protocol=ssl_protocol)
url_data.add_info(msg % attrs)
if 'notAfter' in cert:
self.check_ssl_valid_date(url_data, ssl_sock, cert)
else:
msg = _('certificate did not include "notAfter" information')
self.add_ssl_warning(url_data, ssl_sock, msg)
url_data.add_warning(msg)
def check_ssl_valid_date(self, url_data, ssl_sock, cert):
"""Check if the certificate is still valid, or if configured check
@ -82,27 +84,20 @@ class SslCertificateCheck(_ContentPlugin):
try:
notAfter = ssl.cert_time_to_seconds(cert['notAfter'])
except ValueError as msg:
msg = _('invalid certficate "notAfter" value %r') % cert['notAfter']
self.add_ssl_warning(url_data, ssl_sock, msg)
msg = _('Invalid SSL certficate "notAfter" value %r') % cert['notAfter']
url_data.add_warning(msg)
return
curTime = time.time()
# Calculate seconds until certifcate expires. Can be negative if
# the certificate is already expired.
secondsValid = notAfter - curTime
if secondsValid < 0:
msg = _('certficate is expired on %s') % cert['notAfter']
self.add_ssl_warning(url_data, ssl_sock, msg)
msg = _('SSL certficate is expired on %s') % cert['notAfter']
url_data.add_warning(msg)
elif secondsValid < self.warn_ssl_cert_secs_valid:
strSecondsValid = strformat.strduration_long(secondsValid)
msg = _('certificate is only %s valid') % strSecondsValid
self.add_ssl_warning(url_data, ssl_sock, msg)
def add_ssl_warning(self, url_data, ssl_sock, msg):
"""Add a warning message about an SSL certificate error."""
cipher_name, ssl_protocol, secret_bits = ssl_sock.cipher()
err = _(u"SSL warning: %(msg)s. Cipher %(cipher)s, %(protocol)s.")
attrs = dict(msg=msg, cipher=cipher_name, protocol=ssl_protocol)
url_data.add_warning(err % attrs)
strTimeValid = strformat.strduration_long(secondsValid)
msg = _('SSL certificate is only %s valid') % strTimeValid
url_data.add_warning(msg)
@classmethod
def read_config(cls, configparser):