mirror of
https://github.com/certbot/certbot.git
synced 2026-06-05 14:54:24 -04:00
9e3c348dff
Fixes #7350. This PR changes the parsed modules from a `set` to a `dict`, with the filepath argument as the value. Accordingly, after calling `enable_mod` to enable `ssl_module`, modules now need to be re-parsed, so call `reset_modules`. * Add mechanism for selecting apache config file, based on work done in #7191. * Check OpenSSL version * Remove os imports * debian override still needs os * Reformat remaining apache tests with modules dict syntax * Clean up more apache tests * Switch from property to method for openssl and add tests for coverage. * Sometimes the dict location will be None in which case we should in fact return None * warn thoroughly and consistently in openssl_version function * update tests for new warnings * read file as bytes, and factor out the open for testing * normalize ssl_module_location path to account for being relative to server root * Use byte literals in a python 2 and 3 compatible way * string does need to be a literal * patch builtins open * add debug, remove space * Add test to check if OpenSSL detection is working on different systems * fix relative test location for cwd * put </IfModule> on its own line in test case * Revert test file to status in master. * Call augeas load before reparsing modules to pick up the changes * fix grep, tail, and mod_ssl location on centos * strip the trailing whitespace from fedora * just use LooseVersion in test * call apache2ctl on debian systems * Use sudo for apache2ctl command * add check to make sure we're getting a version * Add boolean so we don't warn on debian/ubuntu before trying to enable mod_ssl * Reduce warnings while testing by setting mock _openssl_version. * Make sure we're not throwing away any unwritten changes to the config * test last warning case for coverage * text changes for clarity
30 lines
1.2 KiB
Python
30 lines
1.2 KiB
Python
#!/usr/bin/env python
|
|
# Test script for OpenSSL version checking
|
|
from distutils.version import LooseVersion
|
|
import sys
|
|
|
|
|
|
def main(openssl_version, apache_version):
|
|
if not openssl_version.strip():
|
|
raise Exception("No OpenSSL version found.")
|
|
if not apache_version.strip():
|
|
raise Exception("No Apache version found.")
|
|
conf_file_location = "/etc/letsencrypt/options-ssl-apache.conf"
|
|
with open(conf_file_location) as f:
|
|
contents = f.read()
|
|
if LooseVersion(apache_version.strip()) < LooseVersion('2.4.11') or \
|
|
LooseVersion(openssl_version.strip()) < LooseVersion('1.0.2l'):
|
|
# should be old version
|
|
# assert SSLSessionTickets not in conf file
|
|
if "SSLSessionTickets" in contents:
|
|
raise Exception("Apache or OpenSSL version is too old, "
|
|
"but SSLSessionTickets is set.")
|
|
else:
|
|
# should be current version
|
|
# assert SSLSessionTickets in conf file
|
|
if "SSLSessionTickets" not in contents:
|
|
raise Exception("Apache and OpenSSL versions are sufficiently new, "
|
|
"but SSLSessionTickets is not set.")
|
|
|
|
if __name__ == '__main__':
|
|
main(*sys.argv[1:])
|