Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2026-01-28 20:56:03 +00:00
Code Releases Activity

sts: Make tests more end-to-end, to cover HTTP fetching

Browse Source 
The current tests stop short of fetching over HTTP, but that code is
unfortunately not trivial.

This patch changes the testing strategy to use a testing HTTP server,
which we point our URLs to. That way we can cover much more code with the
same tests.
This commit is contained in:
Alberto Bertogli
2017-02-28 23:57:04 +00:00
parent 216cf47ffa
commit e66288e4b4
2 changed files with 65 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
internal/sts/sts.go
View File

@@ -15,6 +15,7 @@ import (
"errors"
"expvar"
"fmt"
"io"
"io/ioutil"
"net/http"
"os"
@@ -130,11 +131,7 @@ func UncheckedFetch(ctx context.Context, domain string) (*Policy, error) {
return nil, err
}
// URL composed from the domain, as explained in:
// https://tools.ietf.org/html/draft-ietf-uta-mta-sts-02#section-3.3
// https://tools.ietf.org/html/draft-ietf-uta-mta-sts-02#section-3.2
url := "https://mta-sts." + domain + "/.well-known/mta-sts.json"
url := urlForDomain(domain)
rawPolicy, err := httpGet(ctx, url)
if err != nil {
return nil, err
@@ -143,6 +140,21 @@ func UncheckedFetch(ctx context.Context, domain string) (*Policy, error) {
return parsePolicy(rawPolicy)
}
// Fake URL for testing purposes, so we can do more end-to-end tests,
// including the HTTP fetching code.
var fakeURLForTesting string
func urlForDomain(domain string) string {
if fakeURLForTesting != "" {
return fakeURLForTesting + "/" + domain
}
// URL composed from the domain, as explained in:
// https://tools.ietf.org/html/draft-ietf-uta-mta-sts-02#section-3.3
// https://tools.ietf.org/html/draft-ietf-uta-mta-sts-02#section-3.2
return "https://mta-sts." + domain + "/.well-known/mta-sts.json"
}
// Fetch a policy for the given domain. Note this results in various network
// lookups and HTTPS GETs, so it can be slow.
// The returned policy is parsed and sanity-checked (using Policy.Check), so
@@ -161,9 +173,6 @@ func Fetch(ctx context.Context, domain string) (*Policy, error) {
return p, nil
}
// Fake HTTP content for testing purposes only.
var fakeContent = map[string]string{}
// httpGet performs an HTTP GET of the given URL, using the context and
// rejecting redirects, as per the standard.
func httpGet(ctx context.Context, url string) ([]byte, error) {
@@ -179,16 +188,6 @@ func httpGet(ctx context.Context, url string) ([]byte, error) {
client.Timeout = deadline.Sub(time.Now())
}
if len(fakeContent) > 0 {
// If we have fake content for testing, then return the content for
// the URL, or an error if it's missing.
// This makes sure we don't make actual requests for testing.
if d, ok := fakeContent[url]; ok {
return []byte(d), nil
}
return nil, errors.New("error for testing")
}
resp, err := ctxhttp.Get(ctx, client, url)
if err != nil {
return nil, err