mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 02:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

feat: get lego's logs and send them to frontend

Browse source
This commit is contained in:
0xJacky 2023-05-06 23:24:25 +08:00 • committed by Hintay
parent 2529ca90ca
commit cab5ff2c78
No known key found for this signature in database
GPG key ID: 120FC7FF121F2F2D
2 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frontend/src/views/domain/cert/components/ObtainCert.vue
View file

@ -154,7 +154,10 @@ const issue_cert = async (config_name: string, server_name: string, callback: Fu
switch (r.status) {
case 'info':
progressPercent.value += 5
// If it's a lego log, do not increase the percent.
if (r.message.indexOf('[INFO]') == -1) {
progressPercent.value += 5
}
break
default:
modalClosable.value = true

41
server/internal/cert/cert.go
View file

@ -7,7 +7,7 @@ import (
"crypto/rand"
"crypto/tls"
"github.com/0xJacky/Nginx-UI/logger"
dns2 "github.com/0xJacky/Nginx-UI/server/internal/cert/dns"
"github.com/0xJacky/Nginx-UI/server/internal/cert/dns"
"github.com/0xJacky/Nginx-UI/server/internal/nginx"
"github.com/0xJacky/Nginx-UI/server/query"
"github.com/0xJacky/Nginx-UI/server/settings"
@ -15,9 +15,12 @@ import (
"github.com/go-acme/lego/v4/certificate"
"github.com/go-acme/lego/v4/challenge/http01"
"github.com/go-acme/lego/v4/lego"
"github.com/go-acme/lego/v4/providers/dns"
lego_log "github.com/go-acme/lego/v4/log"
dns_providers "github.com/go-acme/lego/v4/providers/dns"
"github.com/go-acme/lego/v4/registration"
"github.com/pkg/errors"
"io"
"log"
"net/http"
"os"
"path/filepath"
@ -52,6 +55,18 @@ type ConfigPayload struct {
DNSCredentialID int `json:"dns_credential_id"`
}
type channelWriter struct {
ch chan []byte
}
func (cw *channelWriter) Write(p []byte) (n int, err error) {
n = len(p)
temp := make([]byte, n)
copy(temp, p)
cw.ch <- temp
return n, nil
}
func IssueCert(payload *ConfigPayload, logChan chan string, errChan chan error) {
defer func() {
if err := recover(); err != nil {
@ -59,6 +74,10 @@ func IssueCert(payload *ConfigPayload, logChan chan string, errChan chan error)
}
}()
// Use a channel to receive lego log
logChannel := make(chan []byte, 1024)
defer close(logChannel)
domain := payload.ServerName
// Create a user. New accounts need an email and private key to start.
@ -75,6 +94,20 @@ func IssueCert(payload *ConfigPayload, logChan chan string, errChan chan error)
Key: privateKey,
}
// Hijack lego's log
cw := &channelWriter{ch: logChannel}
multiWriter := io.MultiWriter(os.Stderr, cw)
l := log.New(os.Stderr, "", log.LstdFlags)
l.SetOutput(multiWriter)
lego_log.Logger = l
// Start a goroutine to fetch and process logs from channel
go func() {
for msg := range logChannel {
logChan <- string(msg)
}
}()
config := lego.NewConfig(&myUser)
if settings.ServerSettings.Demo {
@ -120,7 +153,7 @@ func IssueCert(payload *ConfigPayload, logChan chan string, errChan chan error)
logChan <- "Using DNS01 challenge provider"
code := dnsCredential.Config.Code
pConfig, ok := dns2.GetProvider(code)
pConfig, ok := dns.GetProvider(code)
if !ok {
errChan <- errors.Wrap(err, "provider not found")
@ -135,7 +168,7 @@ func IssueCert(payload *ConfigPayload, logChan chan string, errChan chan error)
logChan <- "Cleaning environment variables"
pConfig.CleanEnv()
}()
provider, err := dns.NewDNSChallengeProviderByName(code)
provider, err := dns_providers.NewDNSChallengeProviderByName(code)
if err != nil {
break
}