Add user agent for ACME

This commit is contained in:
Ludovic Fernandez 2018-06-05 09:54:03 +02:00 committed by Traefiker Bot
parent 6d07729c55
commit ae7c947ba5
6 changed files with 11 additions and 5 deletions

6
Gopkg.lock generated
View file

@ -1243,6 +1243,7 @@
revision = "0c8571ac0ce161a5feb57375a9cdf148c98c0f70"
[[projects]]
branch = "master"
name = "github.com/xenolf/lego"
packages = [
"acme",
@ -1280,8 +1281,7 @@
"providers/dns/route53",
"providers/dns/vultr"
]
revision = "fefeb24353e513a985358d4a7746b2467ac05e31"
version = "v1.0.0"
revision = "7fedfd1388f016c7ca7ed92a7f2024d06a7e20d8"
[[projects]]
branch = "master"
@ -1679,6 +1679,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "a6acf97e7459604ff987fa8af4520a1660ad8871df0db131ae3e9442574460b0"
inputs-digest = "ac06fad81167510635546d4e5500b938d61f2eb999bf04d5520d7967b9621f0d"
solver-name = "gps-cdcl"
solver-version = 1

View file

@ -181,8 +181,9 @@
name = "github.com/vulcand/oxy"
[[constraint]]
branch = "master"
name = "github.com/xenolf/lego"
version = "1.0.0"
# version = "1.0.0"
[[constraint]]
name = "google.golang.org/grpc"

View file

@ -25,6 +25,7 @@ import (
"github.com/containous/traefik/safe"
"github.com/containous/traefik/tls/generate"
"github.com/containous/traefik/types"
"github.com/containous/traefik/version"
"github.com/eapache/channels"
"github.com/xenolf/lego/acme"
legolog "github.com/xenolf/lego/log"
@ -63,6 +64,7 @@ type ACME struct {
}
func (a *ACME) init() error {
acme.UserAgent = fmt.Sprintf("containous-traefik/%s", version.Version)
if a.ACMELogging {
legolog.Logger = fmtlog.New(os.Stderr, "legolog: ", fmtlog.LstdFlags)
} else {

View file

@ -22,6 +22,7 @@ import (
"github.com/containous/traefik/safe"
traefikTLS "github.com/containous/traefik/tls"
"github.com/containous/traefik/types"
"github.com/containous/traefik/version"
"github.com/pkg/errors"
"github.com/xenolf/lego/acme"
legolog "github.com/xenolf/lego/log"
@ -98,6 +99,7 @@ func (p *Provider) SetConfigListenerChan(configFromListenerChan chan types.Confi
}
func (p *Provider) init() error {
acme.UserAgent = fmt.Sprintf("containous-traefik/%s", version.Version)
if p.ACMELogging {
legolog.Logger = fmtlog.New(os.Stderr, "legolog: ", fmtlog.LstdFlags)
} else {

View file

@ -822,6 +822,7 @@ func validate(j *jws, domain, uri string, c challenge) error {
log.Printf("[INFO][%s] The server validated our request", domain)
return nil
case "pending":
case "processing":
case "invalid":
return handleChallengeError(chlng)
default:

View file

@ -155,6 +155,6 @@ func postJSON(j *jws, uri string, reqBody, respBody interface{}) (http.Header, e
// userAgent builds and returns the User-Agent string to use in requests.
func userAgent() string {
ua := fmt.Sprintf("%s (%s; %s) %s %s", defaultGoUserAgent, runtime.GOOS, runtime.GOARCH, ourUserAgent, UserAgent)
ua := fmt.Sprintf("%s %s (%s; %s) %s", UserAgent, ourUserAgent, runtime.GOOS, runtime.GOARCH, defaultGoUserAgent)
return strings.TrimSpace(ua)
}