Update dependencies
This commit is contained in:
parent
5e674254f0
commit
815b518c2c
145 changed files with 14129 additions and 4312 deletions
8
vendor/github.com/mholt/certmagic/certmagic.go
generated
vendored
8
vendor/github.com/mholt/certmagic/certmagic.go
generated
vendored
|
@ -476,6 +476,14 @@ var (
|
|||
// certificates
|
||||
KeyType = certcrypto.RSA2048
|
||||
|
||||
// The maximum amount of time to allow for
|
||||
// obtaining a certificate. If empty, the
|
||||
// default from the underlying lego lib is
|
||||
// used. If set, it must not be too low so
|
||||
// as to cancel orders too early, running
|
||||
// the risk of rate limiting.
|
||||
CertObtainTimeout time.Duration
|
||||
|
||||
// The state needed to operate on-demand TLS
|
||||
OnDemand *OnDemandConfig
|
||||
|
||||
|
|
28
vendor/github.com/mholt/certmagic/client.go
generated
vendored
28
vendor/github.com/mholt/certmagic/client.go
generated
vendored
|
@ -59,10 +59,14 @@ func (cfg *Config) newACMEClient(interactive bool) (*acmeClient, error) {
|
|||
return nil, err
|
||||
}
|
||||
|
||||
// ensure key type is set
|
||||
keyType := KeyType
|
||||
if cfg.KeyType != "" {
|
||||
keyType = cfg.KeyType
|
||||
// ensure key type and timeout are set
|
||||
keyType := cfg.KeyType
|
||||
if keyType == "" {
|
||||
keyType = KeyType
|
||||
}
|
||||
certObtainTimeout := cfg.CertObtainTimeout
|
||||
if certObtainTimeout == 0 {
|
||||
certObtainTimeout = CertObtainTimeout
|
||||
}
|
||||
|
||||
// ensure CA URL (directory endpoint) is set
|
||||
|
@ -93,9 +97,12 @@ func (cfg *Config) newACMEClient(interactive bool) (*acmeClient, error) {
|
|||
// the client facilitates our communication with the CA server
|
||||
legoCfg := lego.NewConfig(&leUser)
|
||||
legoCfg.CADirURL = caURL
|
||||
legoCfg.KeyType = keyType
|
||||
legoCfg.UserAgent = buildUAString()
|
||||
legoCfg.HTTPClient.Timeout = HTTPTimeout
|
||||
legoCfg.Certificate = lego.CertificateConfig{
|
||||
KeyType: keyType,
|
||||
Timeout: certObtainTimeout,
|
||||
}
|
||||
client, err = lego.NewClient(legoCfg)
|
||||
if err != nil {
|
||||
cfg.acmeClientsMu.Unlock()
|
||||
|
@ -189,19 +196,16 @@ func (cfg *Config) newACMEClient(interactive bool) (*acmeClient, error) {
|
|||
})
|
||||
|
||||
// disable any challenges that should not be used
|
||||
var disabledChallenges []challenge.Type
|
||||
if cfg.DisableHTTPChallenge {
|
||||
disabledChallenges = append(disabledChallenges, challenge.HTTP01)
|
||||
c.acmeClient.Challenge.Remove(challenge.HTTP01)
|
||||
}
|
||||
if cfg.DisableTLSALPNChallenge {
|
||||
disabledChallenges = append(disabledChallenges, challenge.TLSALPN01)
|
||||
}
|
||||
if len(disabledChallenges) > 0 {
|
||||
c.acmeClient.Challenge.Exclude(disabledChallenges)
|
||||
c.acmeClient.Challenge.Remove(challenge.TLSALPN01)
|
||||
}
|
||||
} else {
|
||||
// Otherwise, use DNS challenge exclusively
|
||||
c.acmeClient.Challenge.Exclude([]challenge.Type{challenge.HTTP01, challenge.TLSALPN01})
|
||||
c.acmeClient.Challenge.Remove(challenge.HTTP01)
|
||||
c.acmeClient.Challenge.Remove(challenge.TLSALPN01)
|
||||
c.acmeClient.Challenge.SetDNS01Provider(cfg.DNSProvider)
|
||||
}
|
||||
|
||||
|
|
24
vendor/github.com/mholt/certmagic/config.go
generated
vendored
24
vendor/github.com/mholt/certmagic/config.go
generated
vendored
|
@ -93,6 +93,14 @@ type Config struct {
|
|||
// certificates
|
||||
KeyType certcrypto.KeyType
|
||||
|
||||
// The maximum amount of time to allow for
|
||||
// obtaining a certificate. If empty, the
|
||||
// default from the underlying lego lib is
|
||||
// used. If set, it must not be too low so
|
||||
// as to cancel orders too early, running
|
||||
// the risk of rate limiting.
|
||||
CertObtainTimeout time.Duration
|
||||
|
||||
// The state needed to operate on-demand TLS
|
||||
OnDemand *OnDemandConfig
|
||||
|
||||
|
@ -196,6 +204,9 @@ func NewWithCache(certCache *Cache, cfg Config) *Config {
|
|||
if cfg.KeyType == "" {
|
||||
cfg.KeyType = KeyType
|
||||
}
|
||||
if cfg.CertObtainTimeout == 0 {
|
||||
cfg.CertObtainTimeout = CertObtainTimeout
|
||||
}
|
||||
if cfg.OnDemand == nil {
|
||||
cfg.OnDemand = OnDemand
|
||||
}
|
||||
|
@ -278,6 +289,10 @@ func (cfg *Config) ObtainCert(name string, interactive bool) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
if cfg.storageHasCertResources(name) {
|
||||
return nil
|
||||
}
|
||||
|
||||
client, err := cfg.newACMEClient(interactive)
|
||||
if err != nil {
|
||||
return err
|
||||
|
@ -354,12 +369,9 @@ func (cfg *Config) preObtainOrRenewChecks(name string, allowPrompts bool) (bool,
|
|||
return true, nil
|
||||
}
|
||||
|
||||
if cfg.Email == "" {
|
||||
var err error
|
||||
cfg.Email, err = cfg.getEmail(allowPrompts)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
err := cfg.getEmail(allowPrompts)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return false, nil
|
||||
|
|
2
vendor/github.com/mholt/certmagic/filestorage.go
generated
vendored
2
vendor/github.com/mholt/certmagic/filestorage.go
generated
vendored
|
@ -179,7 +179,7 @@ func (fs *FileStorage) String() string {
|
|||
}
|
||||
|
||||
func (fs *FileStorage) lockFilename(key string) string {
|
||||
return filepath.Join(fs.lockDir(), StorageKeys.safe(key)+".lock")
|
||||
return filepath.Join(fs.lockDir(), StorageKeys.Safe(key)+".lock")
|
||||
}
|
||||
|
||||
func (fs *FileStorage) lockDir() string {
|
||||
|
|
143
vendor/github.com/mholt/certmagic/handshake.go
generated
vendored
143
vendor/github.com/mholt/certmagic/handshake.go
generated
vendored
|
@ -19,6 +19,7 @@ import (
|
|||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"net"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
|
@ -66,18 +67,24 @@ func (cfg *Config) GetCertificate(clientHello *tls.ClientHelloInfo) (*tls.Certif
|
|||
}
|
||||
}
|
||||
|
||||
wrapped := wrappedClientHelloInfo{
|
||||
ClientHelloInfo: clientHello,
|
||||
serverNameOrIP: CertNameFromClientHello(clientHello),
|
||||
}
|
||||
|
||||
// get the certificate and serve it up
|
||||
cert, err := cfg.getCertDuringHandshake(strings.ToLower(clientHello.ServerName), true, true)
|
||||
cert, err := cfg.getCertDuringHandshake(wrapped, true, true)
|
||||
if err == nil && cfg.OnEvent != nil {
|
||||
cfg.OnEvent("tls_handshake_completed", clientHello)
|
||||
}
|
||||
return &cert.Certificate, err
|
||||
}
|
||||
|
||||
// getCertificate gets a certificate that matches name (a server name)
|
||||
// from the in-memory cache, according to the lookup table associated with
|
||||
// cfg. The lookup then points to a certificate in the Instance certificate
|
||||
// cache.
|
||||
// getCertificate gets a certificate that matches name from the in-memory
|
||||
// cache, according to the lookup table associated with cfg. The lookup then
|
||||
// points to a certificate in the Instance certificate cache.
|
||||
//
|
||||
// The name is expected to already be normalized (e.g. lowercased).
|
||||
//
|
||||
// If there is no exact match for name, it will be checked against names of
|
||||
// the form '*.example.com' (wildcard certificates) according to RFC 6125.
|
||||
|
@ -93,11 +100,6 @@ func (cfg *Config) getCertificate(name string) (cert Certificate, matched, defau
|
|||
var certKey string
|
||||
var ok bool
|
||||
|
||||
// Not going to trim trailing dots here since RFC 3546 says,
|
||||
// "The hostname is represented ... without a trailing dot."
|
||||
// Just normalize to lowercase.
|
||||
name = strings.ToLower(name)
|
||||
|
||||
cfg.certCache.mu.RLock()
|
||||
defer cfg.certCache.mu.RUnlock()
|
||||
|
||||
|
@ -123,10 +125,11 @@ func (cfg *Config) getCertificate(name string) (cert Certificate, matched, defau
|
|||
// check the certCache directly to see if the SNI name is
|
||||
// already the key of the certificate it wants; this implies
|
||||
// that the SNI can contain the hash of a specific cert
|
||||
// (chain) it wants and we will still be able to serveit up
|
||||
// (chain) it wants and we will still be able to serve it up
|
||||
// (this behavior, by the way, could be controversial as to
|
||||
// whether it complies with RFC 6066 about SNI, but I think
|
||||
// it does, soooo...)
|
||||
// (this is how we solved the former ACME TLS-SNI challenge)
|
||||
if directCert, ok := cfg.certCache.cache[name]; ok {
|
||||
cert = directCert
|
||||
matched = true
|
||||
|
@ -147,9 +150,9 @@ func (cfg *Config) getCertificate(name string) (cert Certificate, matched, defau
|
|||
return
|
||||
}
|
||||
|
||||
// getCertDuringHandshake will get a certificate for name. It first tries
|
||||
// the in-memory cache. If no certificate for name is in the cache, the
|
||||
// config most closely corresponding to name will be loaded. If that config
|
||||
// getCertDuringHandshake will get a certificate for hello. It first tries
|
||||
// the in-memory cache. If no certificate for hello is in the cache, the
|
||||
// config most closely corresponding to hello will be loaded. If that config
|
||||
// allows it (OnDemand==true) and if loadIfNecessary == true, it goes to disk
|
||||
// to load it into the cache and serve it. If it's not on disk and if
|
||||
// obtainIfNecessary == true, the certificate will be obtained from the CA,
|
||||
|
@ -158,9 +161,9 @@ func (cfg *Config) getCertificate(name string) (cert Certificate, matched, defau
|
|||
// certificate is available.
|
||||
//
|
||||
// This function is safe for concurrent use.
|
||||
func (cfg *Config) getCertDuringHandshake(name string, loadIfNecessary, obtainIfNecessary bool) (Certificate, error) {
|
||||
func (cfg *Config) getCertDuringHandshake(hello wrappedClientHelloInfo, loadIfNecessary, obtainIfNecessary bool) (Certificate, error) {
|
||||
// First check our in-memory cache to see if we've already loaded it
|
||||
cert, matched, defaulted := cfg.getCertificate(name)
|
||||
cert, matched, defaulted := cfg.getCertificate(hello.serverNameOrIP)
|
||||
if matched {
|
||||
return cert, nil
|
||||
}
|
||||
|
@ -169,32 +172,30 @@ func (cfg *Config) getCertDuringHandshake(name string, loadIfNecessary, obtainIf
|
|||
// obtain a needed certificate
|
||||
if cfg.OnDemand != nil && loadIfNecessary {
|
||||
// Then check to see if we have one on disk
|
||||
loadedCert, err := cfg.CacheManagedCertificate(name)
|
||||
loadedCert, err := cfg.CacheManagedCertificate(hello.serverNameOrIP)
|
||||
if err == nil {
|
||||
loadedCert, err = cfg.handshakeMaintenance(name, loadedCert)
|
||||
loadedCert, err = cfg.handshakeMaintenance(hello, loadedCert)
|
||||
if err != nil {
|
||||
log.Printf("[ERROR] Maintaining newly-loaded certificate for %s: %v", name, err)
|
||||
log.Printf("[ERROR] Maintaining newly-loaded certificate for %s: %v", hello.serverNameOrIP, err)
|
||||
}
|
||||
return loadedCert, nil
|
||||
}
|
||||
if obtainIfNecessary {
|
||||
// By this point, we need to ask the CA for a certificate
|
||||
|
||||
name = strings.ToLower(name)
|
||||
|
||||
// Make sure the certificate should be obtained based on config
|
||||
err := cfg.checkIfCertShouldBeObtained(name)
|
||||
err := cfg.checkIfCertShouldBeObtained(hello.serverNameOrIP)
|
||||
if err != nil {
|
||||
return Certificate{}, err
|
||||
}
|
||||
|
||||
// Name has to qualify for a certificate
|
||||
if !HostQualifies(name) {
|
||||
return cert, fmt.Errorf("hostname '%s' does not qualify for certificate", name)
|
||||
if !HostQualifies(hello.serverNameOrIP) {
|
||||
return cert, fmt.Errorf("hostname '%s' does not qualify for certificate", hello.serverNameOrIP)
|
||||
}
|
||||
|
||||
// Obtain certificate from the CA
|
||||
return cfg.obtainOnDemandCertificate(name)
|
||||
return cfg.obtainOnDemandCertificate(hello)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -203,7 +204,7 @@ func (cfg *Config) getCertDuringHandshake(name string, loadIfNecessary, obtainIf
|
|||
return cert, nil
|
||||
}
|
||||
|
||||
return Certificate{}, fmt.Errorf("no certificate available for %s", name)
|
||||
return Certificate{}, fmt.Errorf("no certificate available for %s", hello.serverNameOrIP)
|
||||
}
|
||||
|
||||
// checkIfCertShouldBeObtained checks to see if an on-demand tls certificate
|
||||
|
@ -216,52 +217,52 @@ func (cfg *Config) checkIfCertShouldBeObtained(name string) error {
|
|||
return cfg.OnDemand.Allowed(name)
|
||||
}
|
||||
|
||||
// obtainOnDemandCertificate obtains a certificate for name for the given
|
||||
// name. If another goroutine has already started obtaining a cert for
|
||||
// name, it will wait and use what the other goroutine obtained.
|
||||
// obtainOnDemandCertificate obtains a certificate for hello.
|
||||
// If another goroutine has already started obtaining a cert for
|
||||
// hello, it will wait and use what the other goroutine obtained.
|
||||
//
|
||||
// This function is safe for use by multiple concurrent goroutines.
|
||||
func (cfg *Config) obtainOnDemandCertificate(name string) (Certificate, error) {
|
||||
func (cfg *Config) obtainOnDemandCertificate(hello wrappedClientHelloInfo) (Certificate, error) {
|
||||
// We must protect this process from happening concurrently, so synchronize.
|
||||
obtainCertWaitChansMu.Lock()
|
||||
wait, ok := obtainCertWaitChans[name]
|
||||
wait, ok := obtainCertWaitChans[hello.serverNameOrIP]
|
||||
if ok {
|
||||
// lucky us -- another goroutine is already obtaining the certificate.
|
||||
// wait for it to finish obtaining the cert and then we'll use it.
|
||||
obtainCertWaitChansMu.Unlock()
|
||||
<-wait
|
||||
return cfg.getCertDuringHandshake(name, true, false)
|
||||
return cfg.getCertDuringHandshake(hello, true, false)
|
||||
}
|
||||
|
||||
// looks like it's up to us to do all the work and obtain the cert.
|
||||
// make a chan others can wait on if needed
|
||||
wait = make(chan struct{})
|
||||
obtainCertWaitChans[name] = wait
|
||||
obtainCertWaitChans[hello.serverNameOrIP] = wait
|
||||
obtainCertWaitChansMu.Unlock()
|
||||
|
||||
// obtain the certificate
|
||||
log.Printf("[INFO] Obtaining new certificate for %s", name)
|
||||
err := cfg.ObtainCert(name, false)
|
||||
log.Printf("[INFO] Obtaining new certificate for %s", hello.serverNameOrIP)
|
||||
err := cfg.ObtainCert(hello.serverNameOrIP, false)
|
||||
|
||||
// immediately unblock anyone waiting for it; doing this in
|
||||
// a defer would risk deadlock because of the recursive call
|
||||
// to getCertDuringHandshake below when we return!
|
||||
obtainCertWaitChansMu.Lock()
|
||||
close(wait)
|
||||
delete(obtainCertWaitChans, name)
|
||||
delete(obtainCertWaitChans, hello.serverNameOrIP)
|
||||
obtainCertWaitChansMu.Unlock()
|
||||
|
||||
if err != nil {
|
||||
// Failed to solve challenge, so don't allow another on-demand
|
||||
// issue for this name to be attempted for a little while.
|
||||
failedIssuanceMu.Lock()
|
||||
failedIssuance[name] = time.Now()
|
||||
failedIssuance[hello.serverNameOrIP] = time.Now()
|
||||
go func(name string) {
|
||||
time.Sleep(5 * time.Minute)
|
||||
failedIssuanceMu.Lock()
|
||||
delete(failedIssuance, name)
|
||||
failedIssuanceMu.Unlock()
|
||||
}(name)
|
||||
}(hello.serverNameOrIP)
|
||||
failedIssuanceMu.Unlock()
|
||||
return Certificate{}, err
|
||||
}
|
||||
|
@ -273,19 +274,18 @@ func (cfg *Config) obtainOnDemandCertificate(name string) (Certificate, error) {
|
|||
lastIssueTimeMu.Unlock()
|
||||
|
||||
// certificate is already on disk; now just start over to load it and serve it
|
||||
return cfg.getCertDuringHandshake(name, true, false)
|
||||
return cfg.getCertDuringHandshake(hello, true, false)
|
||||
}
|
||||
|
||||
// handshakeMaintenance performs a check on cert for expiration and OCSP
|
||||
// validity.
|
||||
// handshakeMaintenance performs a check on cert for expiration and OCSP validity.
|
||||
//
|
||||
// This function is safe for use by multiple concurrent goroutines.
|
||||
func (cfg *Config) handshakeMaintenance(name string, cert Certificate) (Certificate, error) {
|
||||
func (cfg *Config) handshakeMaintenance(hello wrappedClientHelloInfo, cert Certificate) (Certificate, error) {
|
||||
// Check cert expiration
|
||||
timeLeft := cert.NotAfter.Sub(time.Now().UTC())
|
||||
if timeLeft < cfg.RenewDurationBefore {
|
||||
log.Printf("[INFO] Certificate for %v expires in %v; attempting renewal", cert.Names, timeLeft)
|
||||
return cfg.renewDynamicCertificate(name, cert)
|
||||
return cfg.renewDynamicCertificate(hello, cert)
|
||||
}
|
||||
|
||||
// Check OCSP staple validity
|
||||
|
@ -296,7 +296,7 @@ func (cfg *Config) handshakeMaintenance(name string, cert Certificate) (Certific
|
|||
if err != nil {
|
||||
// An error with OCSP stapling is not the end of the world, and in fact, is
|
||||
// quite common considering not all certs have issuer URLs that support it.
|
||||
log.Printf("[ERROR] Getting OCSP for %s: %v", name, err)
|
||||
log.Printf("[ERROR] Getting OCSP for %s: %v", hello.serverNameOrIP, err)
|
||||
}
|
||||
cfg.certCache.mu.Lock()
|
||||
cfg.certCache.cache[cert.Hash] = cert
|
||||
|
@ -313,37 +313,38 @@ func (cfg *Config) handshakeMaintenance(name string, cert Certificate) (Certific
|
|||
// ClientHello.
|
||||
//
|
||||
// This function is safe for use by multiple concurrent goroutines.
|
||||
func (cfg *Config) renewDynamicCertificate(name string, currentCert Certificate) (Certificate, error) {
|
||||
func (cfg *Config) renewDynamicCertificate(hello wrappedClientHelloInfo, currentCert Certificate) (Certificate, error) {
|
||||
|
||||
obtainCertWaitChansMu.Lock()
|
||||
wait, ok := obtainCertWaitChans[name]
|
||||
wait, ok := obtainCertWaitChans[hello.serverNameOrIP]
|
||||
if ok {
|
||||
// lucky us -- another goroutine is already renewing the certificate.
|
||||
// wait for it to finish, then we'll use the new one.
|
||||
obtainCertWaitChansMu.Unlock()
|
||||
<-wait
|
||||
return cfg.getCertDuringHandshake(name, true, false)
|
||||
return cfg.getCertDuringHandshake(hello, true, false)
|
||||
}
|
||||
|
||||
// looks like it's up to us to do all the work and renew the cert
|
||||
wait = make(chan struct{})
|
||||
obtainCertWaitChans[name] = wait
|
||||
obtainCertWaitChans[hello.serverNameOrIP] = wait
|
||||
obtainCertWaitChansMu.Unlock()
|
||||
|
||||
// renew and reload the certificate
|
||||
log.Printf("[INFO] Renewing certificate for %s", name)
|
||||
err := cfg.RenewCert(name, false)
|
||||
log.Printf("[INFO] Renewing certificate for %s", hello.serverNameOrIP)
|
||||
err := cfg.RenewCert(hello.serverNameOrIP, false)
|
||||
if err == nil {
|
||||
// even though the recursive nature of the dynamic cert loading
|
||||
// would just call this function anyway, we do it here to
|
||||
// make the replacement as atomic as possible.
|
||||
newCert, err := currentCert.configs[0].CacheManagedCertificate(name)
|
||||
newCert, err := currentCert.configs[0].CacheManagedCertificate(hello.serverNameOrIP)
|
||||
if err != nil {
|
||||
log.Printf("[ERROR] loading renewed certificate for %s: %v", name, err)
|
||||
log.Printf("[ERROR] loading renewed certificate for %s: %v", hello.serverNameOrIP, err)
|
||||
} else {
|
||||
// replace the old certificate with the new one
|
||||
err = cfg.certCache.replaceCertificate(currentCert, newCert)
|
||||
if err != nil {
|
||||
log.Printf("[ERROR] Replacing certificate for %s: %v", name, err)
|
||||
log.Printf("[ERROR] Replacing certificate for %s: %v", hello.serverNameOrIP, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -353,14 +354,14 @@ func (cfg *Config) renewDynamicCertificate(name string, currentCert Certificate)
|
|||
// to getCertDuringHandshake below when we return!
|
||||
obtainCertWaitChansMu.Lock()
|
||||
close(wait)
|
||||
delete(obtainCertWaitChans, name)
|
||||
delete(obtainCertWaitChans, hello.serverNameOrIP)
|
||||
obtainCertWaitChansMu.Unlock()
|
||||
|
||||
if err != nil {
|
||||
return Certificate{}, err
|
||||
}
|
||||
|
||||
return cfg.getCertDuringHandshake(name, true, false)
|
||||
return cfg.getCertDuringHandshake(hello, true, false)
|
||||
}
|
||||
|
||||
// tryDistributedChallengeSolver is to be called when the clientHello pertains to
|
||||
|
@ -395,6 +396,38 @@ func (cfg *Config) tryDistributedChallengeSolver(clientHello *tls.ClientHelloInf
|
|||
return Certificate{Certificate: *cert}, true, nil
|
||||
}
|
||||
|
||||
// CertNameFromClientHello returns a normalized name for which to
|
||||
// look up a certificate given this ClientHelloInfo. If the client
|
||||
// did not send a ServerName value, the connection's local IP is
|
||||
// assumed.
|
||||
func CertNameFromClientHello(hello *tls.ClientHelloInfo) string {
|
||||
// Not going to trim trailing dots here since RFC 3546 says,
|
||||
// "The hostname is represented ... without a trailing dot."
|
||||
// Just normalize to lowercase and remove any leading or
|
||||
// trailing whitespace n case the hello was sloppily made
|
||||
name := strings.ToLower(strings.TrimSpace(hello.ServerName))
|
||||
|
||||
// if SNI is not set, assume IP of listener
|
||||
if name == "" && hello.Conn != nil {
|
||||
addr := hello.Conn.LocalAddr().String()
|
||||
ip, _, err := net.SplitHostPort(addr)
|
||||
if err == nil {
|
||||
name = ip
|
||||
}
|
||||
}
|
||||
|
||||
return name
|
||||
}
|
||||
|
||||
// wrappedClientHelloInfo is a type that allows us to
|
||||
// attach a name with which to look for a certificate
|
||||
// to a given ClientHelloInfo, since not all clients
|
||||
// use SNI and some self-signed certificates use IP.
|
||||
type wrappedClientHelloInfo struct {
|
||||
*tls.ClientHelloInfo
|
||||
serverNameOrIP string
|
||||
}
|
||||
|
||||
// obtainCertWaitChans is used to coordinate obtaining certs for each hostname.
|
||||
var obtainCertWaitChans = make(map[string]chan struct{})
|
||||
var obtainCertWaitChansMu sync.Mutex
|
||||
|
|
2
vendor/github.com/mholt/certmagic/solvers.go
generated
vendored
2
vendor/github.com/mholt/certmagic/solvers.go
generated
vendored
|
@ -140,7 +140,7 @@ func (dhs distributedSolver) challengeTokensPrefix() string {
|
|||
// challengeTokensKey returns the key to use to store and access
|
||||
// challenge info for domain.
|
||||
func (dhs distributedSolver) challengeTokensKey(domain string) string {
|
||||
return filepath.Join(dhs.challengeTokensPrefix(), StorageKeys.safe(domain)+".json")
|
||||
return filepath.Join(dhs.challengeTokensPrefix(), StorageKeys.Safe(domain)+".json")
|
||||
}
|
||||
|
||||
type challengeInfo struct {
|
||||
|
|
29
vendor/github.com/mholt/certmagic/storage.go
generated
vendored
29
vendor/github.com/mholt/certmagic/storage.go
generated
vendored
|
@ -84,12 +84,9 @@ type Locker interface {
|
|||
Lock(key string) error
|
||||
|
||||
// Unlock releases the lock for key. This method must ONLY be
|
||||
// called after a successful call to TryLock where no Waiter was
|
||||
// returned, and only after the operation requiring the lock is
|
||||
// finished, even if it errored or timed out. It is INCORRECT to
|
||||
// call Unlock if any non-nil value was returned from a call to
|
||||
// TryLock or if Unlock was not called at all. Unlock should also
|
||||
// clean up any unused resources allocated during TryLock.
|
||||
// called after a successful call to Lock, and only after the
|
||||
// critical section is finished, even if it errored or timed
|
||||
// out. Unlock cleans up any resources allocated during Lock.
|
||||
Unlock(key string) error
|
||||
}
|
||||
|
||||
|
@ -133,28 +130,28 @@ func (keys KeyBuilder) CAPrefix(ca string) string {
|
|||
if err != nil {
|
||||
caURL = &url.URL{Host: ca}
|
||||
}
|
||||
return path.Join(prefixACME, keys.safe(caURL.Host))
|
||||
return path.Join(prefixACME, keys.Safe(caURL.Host))
|
||||
}
|
||||
|
||||
// SitePrefix returns a key prefix for items associated with
|
||||
// the site using the given CA URL.
|
||||
func (keys KeyBuilder) SitePrefix(ca, domain string) string {
|
||||
return path.Join(keys.CAPrefix(ca), "sites", keys.safe(domain))
|
||||
return path.Join(keys.CAPrefix(ca), "sites", keys.Safe(domain))
|
||||
}
|
||||
|
||||
// SiteCert returns the path to the certificate file for domain.
|
||||
func (keys KeyBuilder) SiteCert(ca, domain string) string {
|
||||
return path.Join(keys.SitePrefix(ca, domain), keys.safe(domain)+".crt")
|
||||
return path.Join(keys.SitePrefix(ca, domain), keys.Safe(domain)+".crt")
|
||||
}
|
||||
|
||||
// SitePrivateKey returns the path to domain's private key file.
|
||||
func (keys KeyBuilder) SitePrivateKey(ca, domain string) string {
|
||||
return path.Join(keys.SitePrefix(ca, domain), keys.safe(domain)+".key")
|
||||
return path.Join(keys.SitePrefix(ca, domain), keys.Safe(domain)+".key")
|
||||
}
|
||||
|
||||
// SiteMeta returns the path to the domain's asset metadata file.
|
||||
func (keys KeyBuilder) SiteMeta(ca, domain string) string {
|
||||
return path.Join(keys.SitePrefix(ca, domain), keys.safe(domain)+".json")
|
||||
return path.Join(keys.SitePrefix(ca, domain), keys.Safe(domain)+".json")
|
||||
}
|
||||
|
||||
// UsersPrefix returns a key prefix for items related to
|
||||
|
@ -169,7 +166,7 @@ func (keys KeyBuilder) UserPrefix(ca, email string) string {
|
|||
if email == "" {
|
||||
email = emptyEmail
|
||||
}
|
||||
return path.Join(keys.UsersPrefix(ca), keys.safe(email))
|
||||
return path.Join(keys.UsersPrefix(ca), keys.Safe(email))
|
||||
}
|
||||
|
||||
// UserReg gets the path to the registration file for the user
|
||||
|
@ -190,7 +187,7 @@ func (keys KeyBuilder) UserPrivateKey(ca, email string) string {
|
|||
func (keys KeyBuilder) OCSPStaple(cert *Certificate, pemBundle []byte) string {
|
||||
var ocspFileName string
|
||||
if len(cert.Names) > 0 {
|
||||
firstName := keys.safe(cert.Names[0])
|
||||
firstName := keys.Safe(cert.Names[0])
|
||||
ocspFileName = firstName + "-"
|
||||
}
|
||||
ocspFileName += fastHash(pemBundle)
|
||||
|
@ -208,7 +205,7 @@ func (keys KeyBuilder) safeUserKey(ca, email, defaultFilename, extension string)
|
|||
if filename == "" {
|
||||
filename = defaultFilename
|
||||
}
|
||||
filename = keys.safe(filename)
|
||||
filename = keys.Safe(filename)
|
||||
return path.Join(keys.UserPrefix(ca, email), filename+extension)
|
||||
}
|
||||
|
||||
|
@ -224,9 +221,9 @@ func (keys KeyBuilder) emailUsername(email string) string {
|
|||
return email[:at]
|
||||
}
|
||||
|
||||
// safe standardizes and sanitizes str for use as
|
||||
// Safe standardizes and sanitizes str for use as
|
||||
// a storage key. This method is idempotent.
|
||||
func (keys KeyBuilder) safe(str string) string {
|
||||
func (keys KeyBuilder) Safe(str string) string {
|
||||
str = strings.ToLower(str)
|
||||
str = strings.TrimSpace(str)
|
||||
|
||||
|
|
116
vendor/github.com/mholt/certmagic/user.go
generated
vendored
116
vendor/github.com/mholt/certmagic/user.go
generated
vendored
|
@ -23,12 +23,13 @@ import (
|
|||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"os"
|
||||
"path"
|
||||
"sort"
|
||||
"strings"
|
||||
|
||||
"github.com/xenolf/lego/lego"
|
||||
"github.com/xenolf/lego/acme"
|
||||
"github.com/xenolf/lego/registration"
|
||||
)
|
||||
|
||||
|
@ -71,81 +72,74 @@ func (cfg *Config) newUser(email string) (user, error) {
|
|||
|
||||
// getEmail does everything it can to obtain an email address
|
||||
// from the user within the scope of memory and storage to use
|
||||
// for ACME TLS. If it cannot get an email address, it returns
|
||||
// empty string. (If user is present, it will warn the user of
|
||||
// for ACME TLS. If it cannot get an email address, it does nothing
|
||||
// (If user is prompted, it will warn the user of
|
||||
// the consequences of an empty email.) This function MAY prompt
|
||||
// the user for input. If userPresent is false, the operator
|
||||
// the user for input. If allowPrompts is false, the user
|
||||
// will NOT be prompted and an empty email may be returned.
|
||||
// If the user is prompted, a new User will be created and
|
||||
// stored in storage according to the email address they
|
||||
// provided (which might be blank).
|
||||
func (cfg *Config) getEmail(userPresent bool) (string, error) {
|
||||
// First try memory
|
||||
func (cfg *Config) getEmail(allowPrompts bool) error {
|
||||
leEmail := cfg.Email
|
||||
// First try package default email
|
||||
if leEmail == "" {
|
||||
leEmail = Email
|
||||
}
|
||||
|
||||
// Then try to get most recent user email from storage
|
||||
if leEmail == "" {
|
||||
leEmail = cfg.mostRecentUserEmail()
|
||||
cfg.Email = leEmail // save for next time
|
||||
}
|
||||
|
||||
// Looks like there is no email address readily available,
|
||||
// so we will have to ask the user if we can.
|
||||
if leEmail == "" && userPresent {
|
||||
// evidently, no User data was present in storage;
|
||||
// thus we must make a new User so that we can get
|
||||
// the Terms of Service URL via our ACME client, phew!
|
||||
user, err := cfg.newUser("")
|
||||
if leEmail == "" && allowPrompts {
|
||||
// Looks like there is no email address readily available,
|
||||
// so we will have to ask the user if we can.
|
||||
var err error
|
||||
leEmail, err = cfg.promptUserForEmail()
|
||||
if err != nil {
|
||||
return "", err
|
||||
return err
|
||||
}
|
||||
|
||||
// get the agreement URL
|
||||
agreementURL := agreementTestURL
|
||||
if agreementURL == "" {
|
||||
// we call acme.NewClient directly because newACMEClient
|
||||
// would require that we already know the user's email
|
||||
caURL := CA
|
||||
if cfg.CA != "" {
|
||||
caURL = cfg.CA
|
||||
}
|
||||
legoConfig := lego.NewConfig(user)
|
||||
legoConfig.CADirURL = caURL
|
||||
legoConfig.UserAgent = UserAgent
|
||||
tempClient, err := lego.NewClient(legoConfig)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("making ACME client to get ToS URL: %v", err)
|
||||
}
|
||||
agreementURL = tempClient.GetToSURL()
|
||||
}
|
||||
|
||||
// prompt the user for an email address and terms agreement
|
||||
reader := bufio.NewReader(stdin)
|
||||
cfg.promptUserAgreement(agreementURL)
|
||||
fmt.Println("Please enter your email address to signify agreement and to be notified")
|
||||
fmt.Println("in case of issues. You can leave it blank, but we don't recommend it.")
|
||||
fmt.Print(" Email address: ")
|
||||
leEmail, err = reader.ReadString('\n')
|
||||
if err != nil && err != io.EOF {
|
||||
return "", fmt.Errorf("reading email address: %v", err)
|
||||
}
|
||||
leEmail = strings.TrimSpace(leEmail)
|
||||
cfg.Email = leEmail
|
||||
cfg.Agreed = true
|
||||
|
||||
// save the new user to preserve this for next time
|
||||
user.Email = leEmail
|
||||
err = cfg.saveUser(user)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
}
|
||||
|
||||
// lower-casing the email is important for consistency
|
||||
return strings.ToLower(leEmail), nil
|
||||
cfg.Email = strings.ToLower(leEmail)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (cfg *Config) getAgreementURL() (string, error) {
|
||||
if agreementTestURL != "" {
|
||||
return agreementTestURL, nil
|
||||
}
|
||||
caURL := CA
|
||||
if cfg.CA != "" {
|
||||
caURL = cfg.CA
|
||||
}
|
||||
response, err := http.Get(caURL)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer response.Body.Close()
|
||||
var dir acme.Directory
|
||||
err = json.NewDecoder(response.Body).Decode(&dir)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return dir.Meta.TermsOfService, nil
|
||||
}
|
||||
|
||||
func (cfg *Config) promptUserForEmail() (string, error) {
|
||||
agreementURL, err := cfg.getAgreementURL()
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("get Agreement URL: %v", err)
|
||||
}
|
||||
// prompt the user for an email address and terms agreement
|
||||
reader := bufio.NewReader(stdin)
|
||||
cfg.promptUserAgreement(agreementURL)
|
||||
fmt.Println("Please enter your email address to signify agreement and to be notified")
|
||||
fmt.Println("in case of issues. You can leave it blank, but we don't recommend it.")
|
||||
fmt.Print(" Email address: ")
|
||||
leEmail, err := reader.ReadString('\n')
|
||||
if err != nil && err != io.EOF {
|
||||
return "", fmt.Errorf("reading email address: %v", err)
|
||||
}
|
||||
leEmail = strings.TrimSpace(leEmail)
|
||||
return leEmail, nil
|
||||
}
|
||||
|
||||
// getUser loads the user with the given email from disk
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue