diff --git a/internal/applicant/applicant.go b/internal/applicant/applicant.go index 171dfca0..ed02a9f3 100644 --- a/internal/applicant/applicant.go +++ b/internal/applicant/applicant.go @@ -216,9 +216,9 @@ func apply(option *applyConfig, provider challenge.Provider) (*Certificate, erro } challengeOptions := make([]dns01.ChallengeOption, 0) - nameservers := parseNameservers(option.Nameservers) - if len(nameservers) > 0 { - challengeOptions = append(challengeOptions, dns01.AddRecursiveNameservers(nameservers)) + if len(option.Nameservers) > 0 { + challengeOptions = append(challengeOptions, dns01.AddRecursiveNameservers(dns01.ParseNameservers(strings.Split(option.Nameservers, ";")))) + challengeOptions = append(challengeOptions, dns01.DisableAuthoritativeNssPropagationRequirement()) } client.Challenge.SetDNS01Provider(provider, challengeOptions...) @@ -306,23 +306,6 @@ func getReg(client *lego.Client, sslProvider *SSLProviderConfig, user *applyUser return reg, nil } -func parseNameservers(ns string) []string { - nameservers := make([]string, 0) - - lines := strings.Split(ns, ";") - - for _, line := range lines { - line = strings.TrimSpace(line) - if line == "" { - continue - } - - nameservers = append(nameservers, line) - } - - return nameservers -} - func parseKeyAlgorithm(algo string) certcrypto.KeyType { switch algo { case "RSA2048": diff --git a/internal/repository/workflow_output.go b/internal/repository/workflow_output.go index 1e1cf7cf..5a8c2c77 100644 --- a/internal/repository/workflow_output.go +++ b/internal/repository/workflow_output.go @@ -130,7 +130,7 @@ func (w *WorkflowOutputRepository) Save(ctx context.Context, output *domain.Work } certRecord := models.NewRecord(certCollection) - certRecord.Set("source", certificate.Source) + certRecord.Set("source", string(certificate.Source)) certRecord.Set("subjectAltNames", certificate.SubjectAltNames) certRecord.Set("certificate", certificate.Certificate) certRecord.Set("privateKey", certificate.PrivateKey) diff --git a/ui/src/pages/workflows/WorkflowList.tsx b/ui/src/pages/workflows/WorkflowList.tsx index b1db3adf..e5335f87 100644 --- a/ui/src/pages/workflows/WorkflowList.tsx +++ b/ui/src/pages/workflows/WorkflowList.tsx @@ -161,9 +161,9 @@ const WorkflowList = () => { if (record.lastRunId) { if (record.lastRunStatus === WORKFLOW_RUN_STATUSES.SUCCEEDED) { return ( - + } /> - {dayjs(record.lastRunTime!).format("YYYY-MM-DD HH:mm:ss")} + {dayjs(record.lastRunTime!).format("YYYY-MM-DD HH:mm:ss")} ); } else if (record.lastRunStatus === WORKFLOW_RUN_STATUSES.FAILED) {