Improve request_issuance

This commit is contained in:
Jakub Warmuz 2015-03-24 18:50:53 +00:00
parent c242091b4e
commit d9176d4267
No known key found for this signature in database
GPG key ID: 2A7BAD3A489B52EA
2 changed files with 12 additions and 4 deletions

View file

@ -2,6 +2,8 @@ import logging
import os
import pkg_resources
import M2Crypto
from letsencrypt.acme import messages2
from letsencrypt.acme import jose
@ -26,7 +28,10 @@ logging.debug(regr)
authzr = net.request_challenges(
identifier=messages2.Identifier(
typ=messages2.IdentifierFQDN, value="example1.com"),
typ=messages2.IdentifierFQDN, value='example1.com'),
regr=regr)
logging.debug(authzr)
print authzr
csr = M2Crypto.X509.load_request_string(pkg_resources.resource_string(
'letsencrypt.client.tests', os.path.join('testdata', 'csr.pem')))
net.request_issuance(csr, (authzr,))

View file

@ -4,6 +4,8 @@ import logging
import requests
import M2Crypto
from letsencrypt.acme import jose
from letsencrypt.acme import messages2
@ -179,7 +181,8 @@ class Network(object):
:param authzrs: `list` of `.AuthorizationResource`
"""
req = CertificateRequest(
# TODO: assert len(authzrs) == number of SANs
req = messages2.CertificateRequest(
csr=csr, authorizations=tuple(authzr.uri for authzr in authzrs))
response = self._post(
authzrs[0].new_cert_uri, # TODO: acme-spec #90
@ -187,7 +190,7 @@ class Network(object):
# assert content-type: application/pkix-cert
return messages2.CertificateResource(
authzrs=authzrs,
body=M2Crypto.X509.load_der_string(response.text),
body=M2Crypto.X509.load_cert_der_string(response.text),
cert_chain_uri=response.links['up']['url'])
def poll_and_request_issuance(self, csr, authzrs, mintime=5):