Finish order unit tests and remove unused mocklinker

smallstep · Mar 25, 2021 · 1831920 · 1831920
1 parent b6ebc0f
commit 1831920
Show file tree

Hide file tree

Showing 5 changed files with 436 additions and 134 deletions.
diff --git a/acme/api/handler.go b/acme/api/handler.go
@@ -1,7 +1,6 @@
 package api
 
 import (
-	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/json"
@@ -71,28 +70,14 @@ func NewHandler(ops HandlerOptions) api.RouterHandler {
 	dialer := &net.Dialer{
 		Timeout: 30 * time.Second,
 	}
-	resolver := &net.Resolver{
-		// The DNS resolver can be configured for testing purposes with something
-		// like this:
-		//
-		// PreferGo: true,
-		// Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
-		// 	var d net.Dialer
-		// 	return d.DialContext(ctx, "udp", "127.0.0.1:5333")
-		// },
-	}
 	return &Handler{
 		ca:       ops.CA,
 		db:       ops.DB,
 		backdate: ops.Backdate,
 		linker:   NewLinker(ops.DNS, ops.Prefix),
 		validateChallengeOptions: &acme.ValidateChallengeOptions{
-			HTTPGet: client.Get,
-			LookupTxt: func(name string) ([]string, error) {
-				ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-				defer cancel()
-				return resolver.LookupTXT(ctx, name)
-			},
+			HTTPGet:   client.Get,
+			LookupTxt: net.LookupTXT,
 			TLSDial: func(network, addr string, config *tls.Config) (*tls.Conn, error) {
 				return tls.DialWithDialer(dialer, network, addr, config)
 			},

diff --git a/acme/api/linker.go b/acme/api/linker.go
@@ -181,81 +181,3 @@ func (l *linker) LinkOrdersByAccountID(ctx context.Context, orders []string) {
 		orders[i] = l.GetLink(ctx, OrderLinkType, true, id)
 	}
 }
-
-// MockLinker implements the Linker interface. Only used for testing.
-type MockLinker struct {
-	MockGetLink         func(ctx context.Context, typ LinkType, abs bool, inputs ...string) string
-	MockGetLinkExplicit func(typ LinkType, provName string, abs bool, baseURL *url.URL, inputs ...string) string
-
-	MockLinkOrder             func(ctx context.Context, o *acme.Order)
-	MockLinkAccount           func(ctx context.Context, o *acme.Account)
-	MockLinkChallenge         func(ctx context.Context, o *acme.Challenge)
-	MockLinkAuthorization     func(ctx context.Context, o *acme.Authorization)
-	MockLinkOrdersByAccountID func(ctx context.Context, orders []string)
-
-	MockError error
-	MockRet1  interface{}
-}
-
-// GetLink mock.
-func (m *MockLinker) GetLink(ctx context.Context, typ LinkType, abs bool, inputs ...string) string {
-	if m.MockGetLink != nil {
-		return m.MockGetLink(ctx, typ, abs, inputs...)
-	}
-
-	return m.MockRet1.(string)
-}
-
-// GetLinkExplicit mock.
-func (m *MockLinker) GetLinkExplicit(typ LinkType, provName string, abs bool, baseURL *url.URL, inputs ...string) string {
-	if m.MockGetLinkExplicit != nil {
-		return m.MockGetLinkExplicit(typ, provName, abs, baseURL, inputs...)
-	}
-
-	return m.MockRet1.(string)
-}
-
-// LinkOrder mock.
-func (m *MockLinker) LinkOrder(ctx context.Context, o *acme.Order) {
-	if m.MockLinkOrder != nil {
-		m.MockLinkOrder(ctx, o)
-		return
-	}
-	return
-}
-
-// LinkAccount mock.
-func (m *MockLinker) LinkAccount(ctx context.Context, o *acme.Account) {
-	if m.MockLinkAccount != nil {
-		m.MockLinkAccount(ctx, o)
-		return
-	}
-	return
-}
-
-// LinkChallenge mock.
-func (m *MockLinker) LinkChallenge(ctx context.Context, o *acme.Challenge) {
-	if m.MockLinkChallenge != nil {
-		m.MockLinkChallenge(ctx, o)
-		return
-	}
-	return
-}
-
-// LinkAuthorization mock.
-func (m *MockLinker) LinkAuthorization(ctx context.Context, o *acme.Authorization) {
-	if m.MockLinkAuthorization != nil {
-		m.MockLinkAuthorization(ctx, o)
-		return
-	}
-	return
-}
-
-// LinkOrderAccountsByID mock.
-func (m *MockLinker) LinkOrderAccountsByID(ctx context.Context, orders []string) {
-	if m.MockLinkOrdersByAccountID != nil {
-		m.MockLinkOrdersByAccountID(ctx, orders)
-		return
-	}
-	return
-}
diff --git a/acme/api/order.go b/acme/api/order.go
@@ -123,8 +123,10 @@ func (h *Handler) NewOrder(w http.ResponseWriter, r *http.Request) {
 	if o.NotAfter.IsZero() {
 		o.NotAfter = o.NotBefore.Add(prov.DefaultTLSCertDuration())
 	}
+	// If request NotBefore was empty then backdate the order.NotBefore (now)
+	// to avoid timing issues.
 	if nor.NotBefore.IsZero() {
-		o.NotBefore.Add(-defaultOrderBackdate)
+		o.NotBefore = o.NotBefore.Add(-defaultOrderBackdate)
 	}
 
 	if err := h.db.CreateOrder(ctx, o); err != nil {