opensource/certimate
3
0
Fork 0
mirror of https://github.com/certimate-go/certimate.git synced 2026-10-16 15:16:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1458 from Yeqingky/main

Browse Source 
fix: lecdn v4 API authentication and certificate deployment
This commit is contained in:
Yoan.liu
2026-09-20 17:01:18 +08:00
committed by GitHub
parent 1aa8b4724c 94b1bc7798
commit a5b924b824
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/core/deployer/providers/lecdn/lecdn.go
+7 -6
View File
@@ -3,6 +3,7 @@ package lecdn
import (
"context"
"crypto/tls"
"encoding/base64"
"fmt"
"log/slog"
"time"
@@ -150,8 +151,8 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
updateSSLCertReq := &lecdnclientsdkv4.UpdateCertificateRequest{
Name: certName,
Description: certDesc,
SSLPEM: certPEM,
SSLKey: privkeyPEM,
SSLPEM: base64.StdEncoding.EncodeToString([]byte(certPEM)),
SSLKey: base64.StdEncoding.EncodeToString([]byte(privkeyPEM)),
AutoRenewal: false,
}
updateSSLCertResp, err := sdkClient.UpdateCertificateWithContext(ctx, d.config.CertificateId, updateSSLCertReq)
@@ -166,8 +167,8 @@ func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM
updateSSLCertReq := &lecdnmastersdkv4.UpdateCertificateRequest{
Name: certName,
Description: certDesc,
SSLPEM: certPEM,
SSLKey: privkeyPEM,
SSLPEM: base64.StdEncoding.EncodeToString([]byte(certPEM)),
SSLKey: base64.StdEncoding.EncodeToString([]byte(privkeyPEM)),
AutoRenewal: false,
}
updateSSLCertResp, err := sdkClient.UpdateCertificateWithContext(ctx, d.config.CertificateId, updateSSLCertReq)
@@ -264,7 +265,7 @@ func createSDKClient(serverUrl, apiVersion, apiRole, authMethod, username, passw
case "", AUTH_METHOD_PASSWORD:
client, err = lecdnclientsdkv4.NewClient(serverUrl, lecdnclientsdkv4.WithLogins(username, password))
case AUTH_METHOD_APIKEY:
client, err = lecdnclientsdkv4.NewClient(serverUrl, lecdnclientsdkv4.WithLogins(username, password))
client, err = lecdnclientsdkv4.NewClient(serverUrl, lecdnclientsdkv4.WithApiKey(apiKey))
default:
err = fmt.Errorf("unsupported auth method '%s'", authMethod)
}
@@ -290,7 +291,7 @@ func createSDKClient(serverUrl, apiVersion, apiRole, authMethod, username, passw
case "", AUTH_METHOD_PASSWORD:
client, err = lecdnmastersdkv4.NewClient(serverUrl, lecdnmastersdkv4.WithLogins(username, password))
case AUTH_METHOD_APIKEY:
client, err = lecdnmastersdkv4.NewClient(serverUrl, lecdnmastersdkv4.WithLogins(username, password))
client, err = lecdnmastersdkv4.NewClient(serverUrl, lecdnmastersdkv4.WithApiKey(apiKey))
default:
err = fmt.Errorf("unsupported auth method '%s'", authMethod)
}
pkg/sdk3rd/lecdn/client/v4/client.go
+2 -6
View File
@@ -48,11 +48,7 @@ func NewClient(serverUrl string, optFns ...OptionsFunc) (*Client, error) {
}
baseUrl := strings.TrimSuffix(serverUrl, "/")
if opts.ApiKey != "" {
baseUrl += "/api/client"
} else {
baseUrl += "/prod-api"
}
baseUrl += "/prod-api"
client := &Client{
username: opts.Username,
@@ -150,7 +146,7 @@ func (c *Client) ensureToken(ctx context.Context) error {
return nil
}
httpreq, err := c.newRequest(http.MethodPost, "/auth/login")
httpreq, err := c.newRequest(http.MethodPost, "/login")
if err != nil {
return err
} else {
pkg/sdk3rd/lecdn/master/v4/client.go
+1 -5
View File
@@ -48,11 +48,7 @@ func NewClient(serverUrl string, optFns ...OptionsFunc) (*Client, error) {
}
baseUrl := strings.TrimSuffix(serverUrl, "/")
if opts.ApiKey != "" {
baseUrl += "/api/admin"
} else {
baseUrl += "/prod-api"
}
baseUrl += "/prod-api"
client := &Client{
username: opts.Username,