upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-06 15:22:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed and tested object oriented challenge setup

Browse source
This commit is contained in:
James Kasten 2012-09-04 23:36:10 -04:00
parent 3a2fca1961
commit 2830a65f69
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trustify/client/client.py
View file

@ -11,7 +11,7 @@ import getopt
# TODO: support a mode where use of interactive prompting is forbidden
from trustify.protocol.chocolate_pb2 import chocolatemessage
from trustify.client import sni_challenge
from trustify.client.sni_challenge import SNI_Challenge
from trustify.client import configurator
from trustify.client import logger
from trustify.client.CONFIG import difficulty, cert_file, chain_file
@ -275,7 +275,7 @@ def challenge_factory(r, req_filepath, key_filepath, config):
dn.append(chall.name)
if sni_todo:
challenges.append(sni_todo, req_filepath, key_filepath, config)
challenges.append(SNI_Challenge(sni_todo, req_filepath, key_filepath, config))
logger.debug(sni_todo)
return challenges, dn

10
trustify/client/sni_challenge.py
View file

@ -75,7 +75,7 @@ SSLStrictSNIVHostCheck on \n \
LimitRequestBody 1048576 \n \
\n \
Include " + OPTIONS_SSL_CONF + " \n \
SSLCertificateFile " + getChocCertFile(nonce) + " \n \
SSLCertificateFile " + self.getChocCertFile(nonce) + " \n \
SSLCertificateKeyFile " + key + " \n \
\n \
DocumentRoot " + CONFIG_DIR + "challenge_page/ \n \
@ -132,8 +132,8 @@ DocumentRoot " + CONFIG_DIR + "challenge_page/ \n \
result: certificate created at getChocCertFile(nonce)
"""
updateCertConf(oid, ext)
subprocess.call(["openssl", "x509", "-req", "-days", "21", "-extfile", CHOC_CERT_CONF, "-extensions", "v3_ca", "-signkey", key, "-out", getChocCertFile(nonce), "-in", csr], stdout=open("/dev/null", 'w'), stderr=open("/dev/null", 'w'))
self.updateCertConf(oid, ext)
subprocess.call(["openssl", "x509", "-req", "-days", "21", "-extfile", CHOC_CERT_CONF, "-extensions", "v3_ca", "-signkey", key, "-out", self.getChocCertFile(nonce), "-in", csr], stdout=open("/dev/null", 'w'), stderr=open("/dev/null", 'w'))
def generateExtension(self, key, y):
@ -211,7 +211,7 @@ DocumentRoot " + CONFIG_DIR + "challenge_page/ \n \
Removes all of the temporary SNI files
"""
for tup in self.listSNITuple:
remove(getChocCertFile(tup[2]))
remove(self.getChocCertFile(tup[2]))
remove(APACHE_CHALLENGE_CONF)
#main call
@ -254,7 +254,7 @@ DocumentRoot " + CONFIG_DIR + "challenge_page/ \n \
ext = self.generateExtension(self.key, tup[1])
self.createChallengeCert(tup[3], ext, tup[2], self.csr, self.key)
self.modifyApacheConfig(self.findApacheConfigFile(), addresses, self.key)
self.modifyApacheConfig(self.findApacheConfigFile(), addresses)
# Save reversible changes and restart the server
self.configurator.save("SNI Challenge", True)
self.configurator.restart(quiet)