upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-09 08:42:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix bug with no DVSNI challenges

Browse source
This commit is contained in:
James Kasten 2015-03-24 17:49:38 -07:00
parent 57bb4513c3
commit a1fe6039d8
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
letsencrypt/client/apache/dvsni.py
View file

@ -50,7 +50,7 @@ class ApacheDvsni(object):
def perform(self):
"""Peform a DVSNI challenge."""
if not self.achalls:
return None
return []
# Save any changes to the configuration as a precaution
# About to make temporary changes to the config
self.configurator.save()
@ -160,19 +160,19 @@ class ApacheDvsni(object):
ips = " ".join(str(i) for i in ip_addrs)
document_root = os.path.join(
self.configurator.config.config_dir, "dvsni_page/")
return ("<VirtualHost " + ips + ">\n"
"ServerName " + achall.nonce_domain + "\n"
"UseCanonicalName on\n"
"SSLStrictSNIVHostCheck on\n"
"\n"
"LimitRequestBody 1048576\n"
"\n"
"Include " + self.configurator.parser.loc["ssl_options"] + "\n"
"SSLCertificateFile " + self.get_cert_file(achall) + "\n"
"SSLCertificateKeyFile " + achall.key.file + "\n"
"\n"
"DocumentRoot " + document_root + "\n"
"</VirtualHost>\n\n")
return ("<VirtualHost " + ips + ">{0}"
"ServerName " + achall.nonce_domain + "{0}"
"UseCanonicalName on{0}"
"SSLStrictSNIVHostCheck on{0}"
"{0}"
"LimitRequestBody 1048576{0}"
"{0}"
"Include " + self.configurator.parser.loc["ssl_options"] + "{0}"
"SSLCertificateFile " + self.get_cert_file(achall) + "{0}"
"SSLCertificateKeyFile " + achall.key.file + "{0}"
"{0}"
"DocumentRoot " + document_root + "{0}"
"</VirtualHost>{0}{0}".format(os.linesep))
def get_cert_file(self, achall):
"""Returns standardized name for challenge certificate.