mirror of
https://github.com/yusing/godoxy.git
synced 2025-06-01 01:22:34 +02:00
fix(autocert): update test server configuration to use TLS with custom CA and add IPAddresses field
This commit is contained in:
parent
9d58977fa6
commit
2e9f113224
1 changed files with 17 additions and 2 deletions
|
@ -166,6 +166,7 @@ func newTestACMEServer(t *testing.T) *testACMEServer {
|
||||||
StreetAddress: []string{""},
|
StreetAddress: []string{""},
|
||||||
PostalCode: []string{""},
|
PostalCode: []string{""},
|
||||||
},
|
},
|
||||||
|
IPAddresses: []net.IP{net.ParseIP("127.0.0.1")},
|
||||||
NotBefore: time.Now(),
|
NotBefore: time.Now(),
|
||||||
NotAfter: time.Now().Add(365 * 24 * time.Hour),
|
NotAfter: time.Now().Add(365 * 24 * time.Hour),
|
||||||
IsCA: true,
|
IsCA: true,
|
||||||
|
@ -190,7 +191,17 @@ func newTestACMEServer(t *testing.T) *testACMEServer {
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
acme.setupRoutes(mux)
|
acme.setupRoutes(mux)
|
||||||
|
|
||||||
acme.server = httptest.NewTLSServer(mux)
|
acme.server = httptest.NewUnstartedServer(mux)
|
||||||
|
acme.server.TLS = &tls.Config{
|
||||||
|
Certificates: []tls.Certificate{
|
||||||
|
{
|
||||||
|
Certificate: [][]byte{caCert.Raw},
|
||||||
|
PrivateKey: caKey,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
MinVersion: tls.VersionTLS12,
|
||||||
|
}
|
||||||
|
acme.server.StartTLS()
|
||||||
return acme
|
return acme
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -203,6 +214,9 @@ func (s *testACMEServer) URL() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *testACMEServer) httpClient() *http.Client {
|
func (s *testACMEServer) httpClient() *http.Client {
|
||||||
|
certPool := x509.NewCertPool()
|
||||||
|
certPool.AddCert(s.caCert)
|
||||||
|
|
||||||
return &http.Client{
|
return &http.Client{
|
||||||
Transport: &http.Transport{
|
Transport: &http.Transport{
|
||||||
DialContext: (&net.Dialer{
|
DialContext: (&net.Dialer{
|
||||||
|
@ -212,7 +226,8 @@ func (s *testACMEServer) httpClient() *http.Client {
|
||||||
TLSHandshakeTimeout: 30 * time.Second,
|
TLSHandshakeTimeout: 30 * time.Second,
|
||||||
ResponseHeaderTimeout: 30 * time.Second,
|
ResponseHeaderTimeout: 30 * time.Second,
|
||||||
TLSClientConfig: &tls.Config{
|
TLSClientConfig: &tls.Config{
|
||||||
InsecureSkipVerify: true, //nolint:gosec
|
RootCAs: certPool,
|
||||||
|
MinVersion: tls.VersionTLS12,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue