mbiryukova/lego
1
0
Fork 0
forked from TrueCloudLab/lego
Code Pull requests Activity

fix: use http.Header.Set method instead of Add. (#1270)

Browse source
This commit is contained in:
Ludovic Fernandez 2020-10-17 14:51:55 +02:00 committed by GitHub
parent fbab0e3c64
commit 88823a5c92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
acme/api/internal/nonces/nonce_manager_test.go
View file

@ -14,8 +14,8 @@ import (
func TestNotHoldingLockWhileMakingHTTPRequests(t *testing.T) { func TestNotHoldingLockWhileMakingHTTPRequests(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
time.Sleep(250 * time.Millisecond) time.Sleep(250 * time.Millisecond)
w.Header().Add("Replay-Nonce", "12345") w.Header().Set("Replay-Nonce", "12345")
w.Header().Add("Retry-After", "0") w.Header().Set("Retry-After", "0")
err := tester.WriteJSONResponse(w, &acme.Challenge{Type: "http-01", Status: "Valid", URL: "http://example.com/", Token: "token"}) err := tester.WriteJSONResponse(w, &acme.Challenge{Type: "http-01", Status: "Valid", URL: "http://example.com/", Token: "token"})
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)

4
acme/api/internal/secure/jws_test.go
View file

@ -15,8 +15,8 @@ import (
func TestNotHoldingLockWhileMakingHTTPRequests(t *testing.T) { func TestNotHoldingLockWhileMakingHTTPRequests(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
time.Sleep(250 * time.Millisecond) time.Sleep(250 * time.Millisecond)
w.Header().Add("Replay-Nonce", "12345") w.Header().Set("Replay-Nonce", "12345")
w.Header().Add("Retry-After", "0") w.Header().Set("Retry-After", "0")
err := tester.WriteJSONResponse(w, &acme.Challenge{Type: "http-01", Status: "Valid", URL: "http://example.com/", Token: "token"}) err := tester.WriteJSONResponse(w, &acme.Challenge{Type: "http-01", Status: "Valid", URL: "http://example.com/", Token: "token"})
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)

2
challenge/dns01/nameserver.go
View file

@ -273,7 +273,7 @@ func formatDNSError(msg *dns.Msg, err error) string {
} }
if err != nil { if err != nil {
parts = append(parts, fmt.Sprintf("%v", err)) parts = append(parts, err.Error())
} }
if len(parts) > 0 { if len(parts) > 0 {

2
challenge/http01/http_challenge_server.go
View file

@ -91,7 +91,7 @@ func (s *ProviderServer) serve(domain, token, keyAuth string) {
mux := http.NewServeMux() mux := http.NewServeMux()
mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
if r.Method == http.MethodGet && s.matcher.matches(r, domain) { if r.Method == http.MethodGet && s.matcher.matches(r, domain) {
w.Header().Add("Content-Type", "text/plain") w.Header().Set("Content-Type", "text/plain")
_, err := w.Write([]byte(keyAuth)) _, err := w.Write([]byte(keyAuth))
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)

4
platform/tester/api.go
View file

@ -33,8 +33,8 @@ func SetupFakeAPI() (*http.ServeMux, string, func()) {
return return
} }
w.Header().Add("Replay-Nonce", "12345") w.Header().Set("Replay-Nonce", "12345")
w.Header().Add("Retry-After", "0") w.Header().Set("Retry-After", "0")
}) })
if err != nil { if err != nil {

2
providers/dns/azure/azure.go
View file

@ -301,7 +301,7 @@ func getMetadata(config *Config, field string) (string, error) {
return "", err return "", err
} }
req.Header.Add("Metadata", "True") req.Header.Set("Metadata", "True")
q := req.URL.Query() q := req.URL.Query()
q.Add("format", "text") q.Add("format", "text")

2
providers/dns/constellix/internal/auth.go
View file

@ -47,7 +47,7 @@ func (t *TokenTransport) RoundTrip(req *http.Request) (*http.Response, error) {
if t.apiKey != "" && t.secretKey != "" { if t.apiKey != "" && t.secretKey != "" {
securityToken := createCnsSecurityToken(t.apiKey, t.secretKey) securityToken := createCnsSecurityToken(t.apiKey, t.secretKey)
enrichedReq.Header.Add(securityTokenHeader, securityToken) enrichedReq.Header.Set(securityTokenHeader, securityToken)
} }
return t.transport().RoundTrip(enrichedReq) return t.transport().RoundTrip(enrichedReq)

2
providers/dns/dynu/internal/auth.go
View file

@ -36,7 +36,7 @@ func (t *TokenTransport) RoundTrip(req *http.Request) (*http.Response, error) {
} }
if t.apiKey != "" { if t.apiKey != "" {
enrichedReq.Header.Add(apiKeyHeader, t.apiKey) enrichedReq.Header.Set(apiKeyHeader, t.apiKey)
} }
return t.transport().RoundTrip(enrichedReq) return t.transport().RoundTrip(enrichedReq)

4
providers/dns/dynu/internal/client.go
View file

@ -138,8 +138,8 @@ func (c Client) doRetry(method, url string, body []byte, data interface{}) error
return err return err
} }
req.Header.Add("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Add("Accept", "application/json") req.Header.Set("Accept", "application/json")
resp, err = c.HTTPClient.Do(req) resp, err = c.HTTPClient.Do(req)
if errors.Is(err, io.EOF) { if errors.Is(err, io.EOF) {

6
providers/dns/internal/selectel/client.go
View file

@ -116,9 +116,9 @@ func (c *Client) newRequest(method, uri string, body interface{}) (*http.Request
return nil, fmt.Errorf("failed to create new http request with error: %w", err) return nil, fmt.Errorf("failed to create new http request with error: %w", err)
} }
req.Header.Add("X-Token", c.token) req.Header.Set("X-Token", c.token)
req.Header.Add("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Add("Accept", "application/json") req.Header.Set("Accept", "application/json")
return req, nil return req, nil
} }

8
providers/dns/mythicbeasts/client.go
View file

@ -73,7 +73,7 @@ func (d *DNSProvider) login() error {
return err return err
} }
req.Header.Add("Content-Type", "application/x-www-form-urlencoded") req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
req.SetBasicAuth(d.config.UserName, d.config.Password) req.SetBasicAuth(d.config.UserName, d.config.Password)
resp, err := d.config.HTTPClient.Do(req) resp, err := d.config.HTTPClient.Do(req)
@ -149,8 +149,8 @@ func (d *DNSProvider) createTXTRecord(zone, leaf, value string) error {
return fmt.Errorf("createTXTRecord: %w", err) return fmt.Errorf("createTXTRecord: %w", err)
} }
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", d.token)) req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", d.token))
req.Header.Add("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
resp, err := d.config.HTTPClient.Do(req) resp, err := d.config.HTTPClient.Do(req)
if err != nil { if err != nil {
@ -202,7 +202,7 @@ func (d *DNSProvider) removeTXTRecord(zone, leaf, value string) error {
return fmt.Errorf("removeTXTRecord: %w", err) return fmt.Errorf("removeTXTRecord: %w", err)
} }
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", d.token)) req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", d.token))
resp, err := d.config.HTTPClient.Do(req) resp, err := d.config.HTTPClient.Do(req)
if err != nil { if err != nil {

6
providers/dns/scaleway/internal/client.go
View file

@ -182,9 +182,9 @@ func (c *Client) newRequest(method, uri string, body interface{}) (*http.Request
return nil, fmt.Errorf("failed to create new http request with error: %w", err) return nil, fmt.Errorf("failed to create new http request with error: %w", err)
} }
req.Header.Add("X-auth-token", c.token) req.Header.Set("X-auth-token", c.token)
req.Header.Add("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Add("Accept", "application/json") req.Header.Set("Accept", "application/json")
return req, nil return req, nil
} }