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

More SSL message work.

Browse source
This commit is contained in:
Bastian Kleineidam 2014-03-20 20:24:57 +01:00
parent 4c76345338
commit 9cd67dfcb2
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
linkcheck/plugins/sslcertcheck.py
View file

@ -84,17 +84,18 @@ class SslCertificateCheck(_ConnectionPlugin):
# Calculate seconds until certifcate expires. Can be negative if
# the certificate is already expired.
secondsValid = notAfter - curTime
args = dict(expire=cert['notAfter'])
if secondsValid < 0:
msg = _('SSL certficate is expired on %s') % cert['notAfter']
url_data.add_warning(msg)
elif secondsValid < self.warn_ssl_cert_secs_valid:
strTimeValid = strformat.strduration_long(secondsValid)
msg = _('SSL certificate is only %s valid') % strTimeValid
url_data.add_warning(msg)
msg = _('SSL certficate is expired on %(expire)s.')
url_data.add_warning(msg % args)
else:
strTimeValid = strformat.strduration_long(secondsValid)
msg = _('SSL certificate is %s valid') % strTimeValid
url_data.add_info(msg)
args['valid'] = strformat.strduration_long(secondsValid)
if secondsValid < self.warn_ssl_cert_secs_valid:
msg = _('SSL certificate expires on %(expire)s and is only %(valid)s valid.')
url_data.add_warning(msg % args)
else:
msg = _('SSL certificate expires on %(expire)s and is %(valid)s valid.')
url_data.add_info(msg % args)
@classmethod
def read_config(cls, configparser):

6
tests/checker/test_https.py
View file

@ -38,4 +38,8 @@ class TestHttps (LinkCheckTest):
u"info Redirected to `%s'." % rurl,
u"valid",
]
self.direct(url, resultlines, recursionlevel=0)
confargs = dict(
enabledplugins=['SslCertificateCheck'],
SslCertificateCheck=dict(sslcertwarndays=10),
)
self.direct(url, resultlines, recursionlevel=0, confargs=confargs)