mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-06 16:27:46 +00:00
Fix cert format
This commit is contained in:
@@ -19,4 +19,5 @@ Feature: Challenge
|
|||||||
Then I select challenge with type http-01 for domain localhost from order at order as challenge
|
Then I select challenge with type http-01 for domain localhost from order at order as challenge
|
||||||
Then I serve challenge response for challenge at localhost
|
Then I serve challenge response for challenge at localhost
|
||||||
Then I tell ACME server that challenge is ready to be verified
|
Then I tell ACME server that challenge is ready to be verified
|
||||||
Then I poll and finalize the ACME order order
|
Then I poll and finalize the ACME order order as finalized_order
|
||||||
|
# TODO: check the content of the order
|
||||||
|
|||||||
@@ -475,8 +475,9 @@ def step_impl(context: Context, var_path: str):
|
|||||||
acme_client.answer_challenge(challenge, response)
|
acme_client.answer_challenge(challenge, response)
|
||||||
|
|
||||||
|
|
||||||
@then("I poll and finalize the ACME order {var_path}")
|
@then("I poll and finalize the ACME order {var_path} as {finalized_var}")
|
||||||
def step_impl(context: Context, var_path: str):
|
def step_impl(context: Context, var_path: str, finalized_var: str):
|
||||||
order = eval_var(context, var_path, as_json=False)
|
order = eval_var(context, var_path, as_json=False)
|
||||||
acme_client = context.acme_client
|
acme_client = context.acme_client
|
||||||
acme_client.poll_and_finalize(order)
|
finalized_order = acme_client.poll_and_finalize(order)
|
||||||
|
context.vars[finalized_var] = finalized_order
|
||||||
|
|||||||
@@ -380,6 +380,7 @@ export const registerPkiAcmeRouter = async (server: FastifyZodProvider) => {
|
|||||||
if (payload !== "") {
|
if (payload !== "") {
|
||||||
throw new AcmeMalformedError({ detail: "Payload should be empty" });
|
throw new AcmeMalformedError({ detail: "Payload should be empty" });
|
||||||
}
|
}
|
||||||
|
res.type("application/pem-certificate-chain");
|
||||||
return sendAcmeResponse(
|
return sendAcmeResponse(
|
||||||
res,
|
res,
|
||||||
profileId,
|
profileId,
|
||||||
|
|||||||
@@ -683,7 +683,13 @@ export const pkiAcmeServiceFactory = ({
|
|||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
status: 200,
|
status: 200,
|
||||||
body: order.certificate! + "\n" + order.certificateChain!,
|
body:
|
||||||
|
order.certificate!.trim().replace("\n", "\r\n") +
|
||||||
|
"\r\n" +
|
||||||
|
order.certificateChain!.trim().replace("\n", "\r\n") +
|
||||||
|
// The final line is needed, otherwise some clients will not parse the certificate chain correctly
|
||||||
|
// ref: https://github.com/certbot/certbot/blob/4d5d5f7ae8164884c841969e46caed8db1ad34af/certbot/src/certbot/crypto_util.py#L506-L514
|
||||||
|
"\r\n",
|
||||||
headers: {
|
headers: {
|
||||||
Location: buildUrl(profileId, `/orders/${orderId}/certificate`),
|
Location: buildUrl(profileId, `/orders/${orderId}/certificate`),
|
||||||
Link: `<${buildUrl(profileId, "/directory")}>;rel="index"`
|
Link: `<${buildUrl(profileId, "/directory")}>;rel="index"`
|
||||||
|
|||||||
Reference in New Issue
Block a user