From 46ad450327111b9d28b592658d75ef57da498298 Mon Sep 17 00:00:00 2001 From: tjpcc Date: Wed, 15 Feb 2023 16:44:29 -0700 Subject: Switch Handler to an interface. HandlerFunc is much better as a function returning a Handler, rather than a newtype for the function type itself. This way there is no confusion creating a type-inferenced variable with HandlerFunc(func(... and then using a HandlerFunc where a Handler is expected. Much better to only have one public type. --- contrib/tlsauth/auth_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'contrib/tlsauth/auth_test.go') diff --git a/contrib/tlsauth/auth_test.go b/contrib/tlsauth/auth_test.go index 30b63f5..3cbc106 100644 --- a/contrib/tlsauth/auth_test.go +++ b/contrib/tlsauth/auth_test.go @@ -24,7 +24,7 @@ func TestIdentify(t *testing.T) { server, client, clientCert := setup(t, "testdata/server.crt", "testdata/server.key", "testdata/client1.crt", "testdata/client1.key", - func(_ context.Context, request *gus.Request) *gus.Response { + gus.HandlerFunc(func(_ context.Context, request *gus.Request) *gus.Response { invoked = true ident := tlsauth.Identity(request) @@ -33,7 +33,7 @@ func TestIdentify(t *testing.T) { } return nil - }, + }), ) leafCert, err := x509.ParseCertificate(clientCert.Certificate[0]) require.Nil(t, err) @@ -51,15 +51,15 @@ func TestRequiredAuth(t *testing.T) { invoked1 := false invoked2 := false - handler1 := func(_ context.Context, request *gus.Request) *gus.Response { + handler1 := gus.HandlerFunc(func(_ context.Context, request *gus.Request) *gus.Response { invoked1 = true return gemini.Success("", &bytes.Buffer{}) - } + }) - handler2 := func(_ context.Context, request *gus.Request) *gus.Response { + handler2 := gus.HandlerFunc(func(_ context.Context, request *gus.Request) *gus.Response { invoked2 = true return gemini.Success("", &bytes.Buffer{}) - } + }) authMiddleware := gus.Filter(tlsauth.RequiredAuth(tlsauth.Allow), nil) @@ -94,19 +94,19 @@ func TestOptionalAuth(t *testing.T) { invoked1 := false invoked2 := false - handler1 := func(_ context.Context, request *gus.Request) *gus.Response { + handler1 := gus.HandlerFunc(func(_ context.Context, request *gus.Request) *gus.Response { if !strings.HasPrefix(request.Path, "/one") { return nil } invoked1 = true return gemini.Success("", &bytes.Buffer{}) - } + }) - handler2 := func(_ context.Context, request *gus.Request) *gus.Response { + handler2 := gus.HandlerFunc(func(_ context.Context, request *gus.Request) *gus.Response { invoked2 = true return gemini.Success("", &bytes.Buffer{}) - } + }) mw := gus.Filter(tlsauth.OptionalAuth(tlsauth.Reject), nil) handler := gus.FallthroughHandler(mw(handler1), mw(handler2)) -- cgit v1.2.3