backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-24 06:59:52 +01:00
Code Issues Projects Releases Activity

certauth: some cleanup for pep8, 2.6 compat

Browse Source
This commit is contained in:
Ilya Kreymer 2014-07-26 21:06:28 -07:00
parent ae35d92dde
commit 2a9197137e
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pywb/framework/certa.py
View File

@ -4,6 +4,7 @@ import OpenSSL
import random import random
#=================================================================
class CertificateAuthority(object): class CertificateAuthority(object):
logger = logging.getLogger('pywb.CertificateAuthority') logger = logging.getLogger('pywb.CertificateAuthority')
@ -21,7 +22,6 @@ class CertificateAuthority(object):
self._read_ca(ca_file) self._read_ca(ca_file)
if not os.path.exists(certs_dir): if not os.path.exists(certs_dir):
self.logger.info("directory for generated certs {} doesn't exist, creating it".format(certs_dir))
os.mkdir(certs_dir) os.mkdir(certs_dir)
@ -41,23 +41,37 @@ class CertificateAuthority(object):
self.cert.set_issuer(self.cert.get_subject()) self.cert.set_issuer(self.cert.get_subject())
self.cert.set_pubkey(self.key) self.cert.set_pubkey(self.key)
self.cert.add_extensions([ self.cert.add_extensions([
OpenSSL.crypto.X509Extension(b"basicConstraints", True, b"CA:TRUE, pathlen:0"), OpenSSL.crypto.X509Extension(b"basicConstraints",
OpenSSL.crypto.X509Extension(b"keyUsage", True, b"keyCertSign, cRLSign"), True,
OpenSSL.crypto.X509Extension(b"subjectKeyIdentifier", False, b"hash", subject=self.cert), b"CA:TRUE, pathlen:0"),
OpenSSL.crypto.X509Extension(b"keyUsage",
True,
b"keyCertSign, cRLSign"),
OpenSSL.crypto.X509Extension(b"subjectKeyIdentifier",
False,
b"hash",
subject=self.cert),
]) ])
self.cert.sign(self.key, "sha1") self.cert.sign(self.key, "sha1")
with open(self.ca_file, 'wb+') as f: with open(self.ca_file, 'wb+') as f:
f.write(OpenSSL.crypto.dump_privatekey(OpenSSL.SSL.FILETYPE_PEM, self.key)) f.write(OpenSSL.crypto.dump_privatekey(OpenSSL.SSL.FILETYPE_PEM,
f.write(OpenSSL.crypto.dump_certificate(OpenSSL.SSL.FILETYPE_PEM, self.cert)) self.key))
self.logger.info('generated CA key+cert and wrote to {}'.format(self.ca_file))
f.write(OpenSSL.crypto.dump_certificate(OpenSSL.SSL.FILETYPE_PEM,
self.cert))
def _read_ca(self, filename): def _read_ca(self, filename):
self.cert = OpenSSL.crypto.load_certificate(OpenSSL.SSL.FILETYPE_PEM, open(filename).read()) with open(filename) as cert_fh:
self.key = OpenSSL.crypto.load_privatekey(OpenSSL.SSL.FILETYPE_PEM, open(filename).read()) self.cert = OpenSSL.crypto.load_certificate(
self.logger.info('read CA key+cert from {}'.format(self.ca_file)) OpenSSL.SSL.FILETYPE_PEM, cert_fh.read())
cert_fh.seek(0)
self.key = OpenSSL.crypto.load_privatekey(
OpenSSL.SSL.FILETYPE_PEM, cert_fh.read())
def __getitem__(self, cn): def __getitem__(self, cn):
cnp = os.path.sep.join([self.certs_dir, '%s.pem' % cn]) cnp = os.path.sep.join([self.certs_dir, '%s.pem' % cn])
@ -83,9 +97,9 @@ class CertificateAuthority(object):
cert.sign(self.key, 'sha1') cert.sign(self.key, 'sha1')
with open(cnp, 'wb+') as f: with open(cnp, 'wb+') as f:
f.write(OpenSSL.crypto.dump_privatekey(OpenSSL.SSL.FILETYPE_PEM, key)) f.write(OpenSSL.crypto.dump_privatekey(
f.write(OpenSSL.crypto.dump_certificate(OpenSSL.SSL.FILETYPE_PEM, cert)) OpenSSL.SSL.FILETYPE_PEM, key))
f.write(OpenSSL.crypto.dump_certificate(
self.logger.info('wrote generated key+cert to {}'.format(cnp)) OpenSSL.SSL.FILETYPE_PEM, cert))
return cnp return cnp