fix: Extract domain from hostname for domain check (#15)

Author: shrink

README.md

@@ -21,18 +21,19 @@ a handle.
 
 ## Configuration
 
-| Environment Variable       | Description                                        | Example                                |
-| -------------------------- | -------------------------------------------------- | -------------------------------------- |
-| **`DID_PROVIDER`**         | **Required** Name of a supported provider          | `postgres` `memory`                    |
-| `REDIRECT_DID_TEMPLATE`    | URL template for redirects when a DID is found     | `https://bsky.app/profile/{did}`       |
-| `REDIRECT_HANDLE_TEMPLATE` | URL template for redirects when a DID is not found | `https://example.com/?handle={handle}` |
+| Environment Variable       | Description                                                | Example                                |
+| -------------------------- | ---------------------------------------------------------- | -------------------------------------- |
+| **`DID_PROVIDER`**         | **Required** Name of a supported provider                  | `postgres` `memory`                    |
+| `REDIRECT_DID_TEMPLATE`    | URL template for redirects when a DID is found             | `https://bsky.app/profile/{did}`       |
+| `REDIRECT_HANDLE_TEMPLATE` | URL template for redirects when a DID is not found         | `https://example.com/?handle={handle}` |
+| `CHECK_DOMAIN_PARAMETER`   | Query parameter used by check domain endpoint (`/domainz`) | `handle` `hostname` `domain`           |
 
 ### `memory` provider
 
-| Environment Variable | Description                                           | Example                                                                   |
-| -------------------- | ----------------------------------------------------- | ------------------------------------------------------------------------- |
-| **`MEMORY_DIDS`**    | **Required** Comma separated list of handle@did pairs | `alice.example.com@did:plc:example001,bob.example.com@did:plc:example002` |
-| **`MEMORY_DOMAINS`** | **Required** Comma separate list of supported domains | `example.com,example.net`                                                 |
+| Environment Variable | Description                                           | Example                         |
+| -------------------- | ----------------------------------------------------- | ------------------------------- |
+| **`MEMORY_DIDS`**    | **Required** Comma separated list of handle@did pairs | `alice.example.com@did:plc:001` |
+| **`MEMORY_DOMAINS`** | **Required** Comma separate list of supported domains | `example.com,example.net`       |
 
 ### `postgres` provider
 

config.go

@@ -3,16 +3,20 @@ package main
 import (
 	"errors"
 	"log/slog"
+	"os"
 	"reflect"
 
 	"github.com/caarlos0/env/v11"
 	"github.com/jackc/pgx/v5/pgxpool"
+	"github.com/jackc/pgx/v5/tracelog"
+	pgxslog "github.com/mcosta74/pgx-slog"
 )
 
 type Config struct {
-	Host     string     `env:"HOST" envDefault:"localhost"`
-	Port     string     `env:"PORT" envDefault:"80"`
-	LogLevel slog.Level `env:"LOG_LEVEL" envDefault:"error"`
+	Host string `env:"HOST" envDefault:"localhost"`
+	Port string `env:"PORT" envDefault:"80"`
+
+	Logger *slog.Logger `env:"LOG_LEVEL" envDefault:"error"`
 
 	RedirectDIDTemplate    URLTemplate `env:"REDIRECT_DID_TEMPLATE" envDefault:"https://bsky.app/profile/{did}"`
 	RedirectHandleTemplate URLTemplate `env:"REDIRECT_HANDLE_TEMPLATE" envDefault:"https://{handle.domain}?handle={handle}"`
@@ -25,20 +29,37 @@ type Config struct {
 	MemoryDomains []string          `env:"MEMORY_DOMAINS"`
 
 	Provider ProvidesDecentralizedIDs `env:"DID_PROVIDER,required"`
+
+	CheckDomainParameter string `env:"CHECK_DOMAIN_PARAMETER" envDefault:"handle"`
 }
 
 func ConfigFromEnvironment() (Config, error) {
 	config := Config{}
 
 	err := env.ParseWithOptions(&config, env.Options{
 		FuncMap: map[reflect.Type]env.ParserFunc{
-			reflect.TypeFor[slog.Level](): func(v string) (interface{}, error) {
+			reflect.TypeFor[slog.Logger](): func(v string) (interface{}, error) {
 				var level slog.Level
-				return level, level.UnmarshalText([]byte(v))
+
+				err := level.UnmarshalText([]byte(v))
+
+				if err != nil {
+					return nil, err
+				}
+
+				return *slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
+					Level: level,
+				})), nil
 			},
 			reflect.TypeFor[pgxpool.Config](): func(v string) (interface{}, error) {
-				config, err := pgxpool.ParseConfig(v)
-				return *config, err
+				databaseConfig, err := pgxpool.ParseConfig(v)
+
+				databaseConfig.ConnConfig.Tracer = &tracelog.TraceLog{
+					Logger:   pgxslog.NewLogger(config.Logger),
+					LogLevel: tracelog.LogLevelDebug,
+				}
+
+				return *databaseConfig, err
 			},
 			reflect.TypeFor[ProvidesDecentralizedIDs](): func(v string) (interface{}, error) {
 				switch v {

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/caarlos0/env/v11 v11.3.1
 	github.com/gin-gonic/gin v1.10.0
 	github.com/jackc/pgx/v5 v5.7.2
+	github.com/mcosta74/pgx-slog v0.4.1
 	github.com/samber/slog-gin v1.14.1
 	github.com/stretchr/testify v1.10.0
 )

go.sum

@@ -54,6 +54,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mcosta74/pgx-slog v0.4.1 h1:Rt25l/jE5tu1ioqPDrqY17Kv6REdsM0L9WCT+hFw1rw=
+github.com/mcosta74/pgx-slog v0.4.1/go.mod h1:BCpubkiENkWQ8MvZ4a9LJgWuBzC5UpWoJmQ1/SOlv+M=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

main.go

@@ -2,9 +2,7 @@ package main
 
 import (
 	"log"
-	"log/slog"
 	"net"
-	"os"
 
 	"github.com/gin-gonic/gin"
 	sloggin "github.com/samber/slog-gin"
@@ -17,25 +15,21 @@ func main() {
 		log.Fatal(err)
 	}
 
-	var logger = slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
-		Level: config.LogLevel,
-	}))
-
 	router := gin.New()
 
-	AddApplicationRoutes(router, logger, config)
+	AddApplicationRoutes(router, config)
 
 	if err := router.Run(net.JoinHostPort(config.Host, config.Port)); err != nil {
 		log.Fatal(err)
 	}
 }
 
-func AddApplicationRoutes(router *gin.Engine, logger *slog.Logger, config Config) {
-	router.Use(sloggin.New(logger))
+func AddApplicationRoutes(router *gin.Engine, config Config) {
+	router.Use(sloggin.New(config.Logger))
 	router.Use(gin.Recovery())
 
 	router.GET("/healthz", CheckServerIsHealthy(config.Provider))
-	router.GET("/domainz", CheckServerProvidesForDomain(config.Provider))
+	router.GET("/domainz", CheckServerProvidesForDomain(config.Provider, config.CheckDomainParameter))
 
 	router.Use(ParseHandleFromHostname)
 	router.Use(WithHandleResult(config.Provider))

main_test.go

@@ -28,14 +28,15 @@ func NewTestEnvironment() (*gin.Engine, *InMemoryProvider) {
 		Provider:               testProvider,
 		RedirectDIDTemplate:    "https://example.com/profile/{did}",
 		RedirectHandleTemplate: "https://example.com/register?handle={handle}",
+		Logger: slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
+			Level: slog.LevelWarn,
+		})),
+		CheckDomainParameter: "domain",
 	}
 
 	var testRouter = gin.New()
-	var testLogger = slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
-		Level: slog.LevelWarn,
-	}))
 
-	AddApplicationRoutes(testRouter, testLogger, testConfig)
+	AddApplicationRoutes(testRouter, testConfig)
 
 	return testRouter, testProvider
 }
@@ -68,7 +69,7 @@ func TestDomainEndpointReturnsOKForProvidedDomain(t *testing.T) {
 	router, _ := NewTestEnvironment()
 
 	res := httptest.NewRecorder()
-	req, _ := http.NewRequest("GET", "/domainz?domain=example.com", nil)
+	req, _ := http.NewRequest("GET", "/domainz?domain=alice.example.com", nil)
 	router.ServeHTTP(res, req)
 
 	assert.Equal(t, http.StatusOK, res.Code)
@@ -78,7 +79,7 @@ func TestDomainEndpointReturnsErrorForUnprovidedDomain(t *testing.T) {
 	router, _ := NewTestEnvironment()
 
 	res := httptest.NewRecorder()
-	req, _ := http.NewRequest("GET", "/domainz?domain=unprovided.test", nil)
+	req, _ := http.NewRequest("GET", "/domainz?domain=alice.unprovided.test", nil)
 	router.ServeHTTP(res, req)
 
 	assert.Equal(t, http.StatusNotFound, res.Code)

router.go

@@ -37,23 +37,28 @@ func ParseHandleFromHostname(c *gin.Context) {
 	c.Next()
 }
 
-func CheckServerProvidesForDomain(provider ProvidesDecentralizedIDs) gin.HandlerFunc {
+func CheckServerProvidesForDomain(provider ProvidesDecentralizedIDs, handleParameter string) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		domain := Domain(strings.ToLower(c.Query("domain")))
+		handle, err := HostnameToHandle(strings.ToLower(c.Query(handleParameter)))
 
-		canProvide, err := provider.CanProvideForDomain(c, domain)
+		if err != nil {
+			_ = c.AbortWithError(http.StatusBadRequest, err)
+			return
+		}
+
+		canProvide, err := provider.CanProvideForDomain(c, handle.Domain)
 
 		if err != nil {
 			_ = c.AbortWithError(http.StatusInternalServerError, err)
 			return
 		}
 
 		if !canProvide {
-			c.String(http.StatusNotFound, "Decentralized IDs are not provided for %s by this server.", domain)
+			c.String(http.StatusNotFound, "Decentralized IDs are not provided for %s by this server.", handle.Domain)
 			return
 		}
 
-		c.String(http.StatusOK, "Decentralized IDs are not provided for %s by this server.", domain)
+		c.String(http.StatusOK, "Decentralized IDs are provided for %s by this server.", handle.Domain)
 	}
 }