From bad9231ab370b24b8e6aed4e7de94410e7243e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Mon, 10 Jan 2022 09:58:34 +0800 Subject: [PATCH] =?UTF-8?q?API=E7=9B=B8=E5=85=B3HTTP=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0User-Agent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/acme/acme_task_dao.go | 2 ++ internal/dnsclients/provider_cloud_flare.go | 2 ++ internal/dnsclients/provider_custom_http.go | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/db/models/acme/acme_task_dao.go b/internal/db/models/acme/acme_task_dao.go index e34e2ca8..3ec12fa2 100644 --- a/internal/db/models/acme/acme_task_dao.go +++ b/internal/db/models/acme/acme_task_dao.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/json" acmeutils "github.com/TeaOSLab/EdgeAPI/internal/acme" + teaconst "github.com/TeaOSLab/EdgeAPI/internal/const" "github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeAPI/internal/db/models/dns" dbutils "github.com/TeaOSLab/EdgeAPI/internal/db/utils" @@ -400,6 +401,7 @@ func (this *ACMETaskDAO) runTaskWithoutLog(tx *dbs.Tx, taskId int64) (isOk bool, client := utils.SharedHttpClient(5 * time.Second) req, err := http.NewRequest(http.MethodPost, task.AuthURL, bytes.NewReader(authJSON)) req.Header.Set("Content-Type", "application/json") + req.Header.Set("User-Agent", teaconst.ProductName+"/"+teaconst.Version) if err != nil { remotelogs.Error("ACME", "parse auth url failed '"+task.AuthURL+"': "+err.Error()) } else { diff --git a/internal/dnsclients/provider_cloud_flare.go b/internal/dnsclients/provider_cloud_flare.go index 4d1d45fb..2e889583 100644 --- a/internal/dnsclients/provider_cloud_flare.go +++ b/internal/dnsclients/provider_cloud_flare.go @@ -6,6 +6,7 @@ import ( "bytes" "crypto/tls" "encoding/json" + teaconst "github.com/TeaOSLab/EdgeAPI/internal/const" "github.com/TeaOSLab/EdgeAPI/internal/dnsclients/cloudflare" "github.com/TeaOSLab/EdgeAPI/internal/dnsclients/dnstypes" "github.com/TeaOSLab/EdgeAPI/internal/errors" @@ -257,6 +258,7 @@ func (this *CloudFlareProvider) doAPI(method string, apiPath string, args map[st if err != nil { return err } + req.Header.Set("User-Agent", teaconst.ProductName+"/"+teaconst.Version) req.Header.Set("Content-Type", "application/json") req.Header.Set("X-Auth-Key", this.apiKey) req.Header.Set("x-Auth-Email", this.email) diff --git a/internal/dnsclients/provider_custom_http.go b/internal/dnsclients/provider_custom_http.go index ccff06ba..ab666fca 100644 --- a/internal/dnsclients/provider_custom_http.go +++ b/internal/dnsclients/provider_custom_http.go @@ -165,7 +165,7 @@ func (this *CustomHTTPProvider) post(params maps.Map) (respData []byte, err erro timestamp := strconv.FormatInt(time.Now().Unix(), 10) req.Header.Set("Timestamp", timestamp) req.Header.Set("Token", fmt.Sprintf("%x", sha1.Sum([]byte(this.secret+"@"+timestamp)))) - req.Header.Set("User-Agent", "GoEdge/"+teaconst.Version) + req.Header.Set("User-Agent", teaconst.ProductName+"/"+teaconst.Version) resp, err := customHTTPClient.Do(req) if err != nil {