mirror of
https://github.com/certbot/certbot.git
synced 2026-08-03 00:22:04 +02:00
Improve request_issuance
This commit is contained in:
@@ -2,6 +2,8 @@ import logging
|
|||||||
import os
|
import os
|
||||||
import pkg_resources
|
import pkg_resources
|
||||||
|
|
||||||
|
import M2Crypto
|
||||||
|
|
||||||
from letsencrypt.acme import messages2
|
from letsencrypt.acme import messages2
|
||||||
from letsencrypt.acme import jose
|
from letsencrypt.acme import jose
|
||||||
|
|
||||||
@@ -26,7 +28,10 @@ logging.debug(regr)
|
|||||||
|
|
||||||
authzr = net.request_challenges(
|
authzr = net.request_challenges(
|
||||||
identifier=messages2.Identifier(
|
identifier=messages2.Identifier(
|
||||||
typ=messages2.IdentifierFQDN, value="example1.com"),
|
typ=messages2.IdentifierFQDN, value='example1.com'),
|
||||||
regr=regr)
|
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,))
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import logging
|
|||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
|
import M2Crypto
|
||||||
|
|
||||||
from letsencrypt.acme import jose
|
from letsencrypt.acme import jose
|
||||||
from letsencrypt.acme import messages2
|
from letsencrypt.acme import messages2
|
||||||
|
|
||||||
@@ -179,7 +181,8 @@ class Network(object):
|
|||||||
:param authzrs: `list` of `.AuthorizationResource`
|
: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))
|
csr=csr, authorizations=tuple(authzr.uri for authzr in authzrs))
|
||||||
response = self._post(
|
response = self._post(
|
||||||
authzrs[0].new_cert_uri, # TODO: acme-spec #90
|
authzrs[0].new_cert_uri, # TODO: acme-spec #90
|
||||||
@@ -187,7 +190,7 @@ class Network(object):
|
|||||||
# assert content-type: application/pkix-cert
|
# assert content-type: application/pkix-cert
|
||||||
return messages2.CertificateResource(
|
return messages2.CertificateResource(
|
||||||
authzrs=authzrs,
|
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'])
|
cert_chain_uri=response.links['up']['url'])
|
||||||
|
|
||||||
def poll_and_request_issuance(self, csr, authzrs, mintime=5):
|
def poll_and_request_issuance(self, csr, authzrs, mintime=5):
|
||||||
|
|||||||
Reference in New Issue
Block a user