commit 8f4dd5f62d2075f88a5995940013a115bee90c01 · seiso.moe/alky

+1 -1

docker-compose.yml

···

       17
       17
        
               soft: 262144

     

       18
       18
        
               hard: 262144

     

       19
       19
        
           healthcheck:

     

       20
       20
       -
             test: wget --no-verbose --tries=1 --spider http://localhost:8123/ping || exit 1

     

       20
       20
       +
             test: curl http://localhost:8123/ping || exit 1

     

       21
       21
        
             interval: 30s

     

       22
       22
        
             timeout: 5s

     

       23
       23
        
             retries: 3

+11 -10

go.mod

···

       1
       1
        
       module tangled.sh/seiso.moe/alky

     

       2
       2
        
       

     

       3
       3
       -
       go 1.22.5

     

       3
       3
       +
       go 1.23.0

     

       4
       4
       +
       

     

       5
       5
       +
       toolchain go1.24.2

     

       4
       6
        
       

     

       5
       7
        
       require (

     

       6
       6
       -
       	github.com/BurntSushi/toml v1.4.0

     

       7
       7
       -
       	github.com/ClickHouse/clickhouse-go/v2 v2.31.0

     

       8
       8
       -
       	tangled.sh/seiso.moe/magna v0.0.0-20250326021922-01ca5bbcb720

     

       8
       8
       +
       	github.com/BurntSushi/toml v1.5.0

     

       9
       9
       +
       	github.com/ClickHouse/clickhouse-go/v2 v2.34.0

     

       10
       10
       +
       	tangled.sh/seiso.moe/magna v0.0.1

     

       9
       11
        
       )

     

       10
       12
        
       

     

       11
       13
        
       require (

     

       12
       12
       -
       	github.com/ClickHouse/ch-go v0.64.1 // indirect

     

       14
       14
       +
       	github.com/ClickHouse/ch-go v0.65.1 // indirect

     

       13
       15
        
       	github.com/andybalholm/brotli v1.1.1 // indirect

     

       14
       16
        
       	github.com/go-faster/city v1.0.1 // indirect

     

       15
       17
        
       	github.com/go-faster/errors v0.7.1 // indirect

     

       16
       18
        
       	github.com/google/uuid v1.6.0 // indirect

     

       17
       17
       -
       	github.com/klauspost/compress v1.17.11 // indirect

     

       19
       19
       +
       	github.com/klauspost/compress v1.18.0 // indirect

     

       18
       20
        
       	github.com/paulmach/orb v0.11.1 // indirect

     

       19
       21
        
       	github.com/pierrec/lz4/v4 v4.1.22 // indirect

     

       20
       20
       -
       	github.com/pkg/errors v0.9.1 // indirect

     

       21
       22
        
       	github.com/segmentio/asm v1.2.0 // indirect

     

       22
       23
        
       	github.com/shopspring/decimal v1.4.0 // indirect

     

       23
       23
       -
       	go.opentelemetry.io/otel v1.34.0 // indirect

     

       24
       24
       -
       	go.opentelemetry.io/otel/trace v1.34.0 // indirect

     

       25
       25
       -
       	golang.org/x/sys v0.30.0 // indirect

     

       24
       24
       +
       	go.opentelemetry.io/otel v1.35.0 // indirect

     

       25
       25
       +
       	go.opentelemetry.io/otel/trace v1.35.0 // indirect

     

       26
       26
       +
       	golang.org/x/sys v0.32.0 // indirect

     

       26
       27
        
       	gopkg.in/yaml.v3 v3.0.1 // indirect

     

       27
       28
        
       )

+18 -19

go.sum

···

       1
       1
       -
       github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=

     

       2
       2
       -
       github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=

     

       3
       3
       -
       github.com/ClickHouse/ch-go v0.64.1 h1:FWpP+QU4KchgzpEekuv8YoI/fUc4H2r6Bwc5WwrzvcI=

     

       4
       4
       -
       github.com/ClickHouse/ch-go v0.64.1/go.mod h1:RBUynvczWwVzhS6Up9lPKlH1mrk4UAmle6uzCiW4Pkc=

     

       5
       5
       -
       github.com/ClickHouse/clickhouse-go/v2 v2.31.0 h1:9MNHRDYXjFTJizGEJM1DfYAqdra/ohprPoZ+LPiuHXQ=

     

       6
       6
       -
       github.com/ClickHouse/clickhouse-go/v2 v2.31.0/go.mod h1:V1aZaG0ctMbd8KVi+D4loXi97duWYtHiQHMCgipKJcI=

     

       1
       1
       +
       github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=

     

       2
       2
       +
       github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=

     

       3
       3
       +
       github.com/ClickHouse/ch-go v0.65.1 h1:SLuxmLl5Mjj44/XbINsK2HFvzqup0s6rwKLFH347ZhU=

     

       4
       4
       +
       github.com/ClickHouse/ch-go v0.65.1/go.mod h1:bsodgURwmrkvkBe5jw1qnGDgyITsYErfONKAHn05nv4=

     

       5
       5
       +
       github.com/ClickHouse/clickhouse-go/v2 v2.34.0 h1:Y4rqkdrRHgExvC4o/NTbLdY5LFQ3LHS77/RNFxFX3Co=

     

       6
       6
       +
       github.com/ClickHouse/clickhouse-go/v2 v2.34.0/go.mod h1:yioSINoRLVZkLyDzdMXPLRIqhDvel8iLBlwh6Iefso8=

     

       7
       7
        
       github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=

     

       8
       8
        
       github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=

     

       9
       9
        
       github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

     
···

       18
       18
        
       github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=

     

       19
       19
        
       github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

     

       20
       20
        
       github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

     

       21
       21
       -
       github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=

     

       22
       22
       -
       github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=

     

       21
       21
       +
       github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=

     

       22
       22
       +
       github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=

     

       23
       23
        
       github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=

     

       24
       24
        
       github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

     

       25
       25
        
       github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=

     

       26
       26
        
       github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=

     

       27
       27
        
       github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=

     

       28
       28
       -
       github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=

     

       29
       29
       -
       github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=

     

       28
       28
       +
       github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=

     

       29
       29
       +
       github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=

     

       30
       30
        
       github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=

     

       31
       31
        
       github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

     

       32
       32
        
       github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

     
···

       39
       39
        
       github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=

     

       40
       40
        
       github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=

     

       41
       41
        
       github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=

     

       42
       42
       -
       github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

     

       43
       42
        
       github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

     

       44
       43
        
       github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

     

       45
       44
        
       github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

     
···

       61
       60
        
       github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

     

       62
       61
        
       github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

     

       63
       62
        
       go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g=

     

       64
       64
       -
       go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=

     

       65
       65
       -
       go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=

     

       66
       66
       -
       go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=

     

       67
       67
       -
       go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=

     

       63
       63
       +
       go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=

     

       64
       64
       +
       go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=

     

       65
       65
       +
       go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=

     

       66
       66
       +
       go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=

     

       68
       67
        
       golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

     

       69
       68
        
       golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

     

       70
       69
        
       golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

     
···

       86
       85
        
       golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

     

       87
       86
        
       golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

     

       88
       87
        
       golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

     

       89
       89
       -
       golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=

     

       90
       90
       -
       golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

     

       88
       88
       +
       golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=

     

       89
       89
       +
       golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=

     

       91
       90
        
       golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

     

       92
       91
        
       golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

     

       93
       92
        
       golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

     
···

       109
       108
        
       gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

     

       110
       109
        
       gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

     

       111
       110
        
       gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

     

       112
       112
       -
       tangled.sh/seiso.moe/magna v0.0.0-20250326021922-01ca5bbcb720 h1:e19STzd/6HFUBcdm5JnBE7txDVGdLqoyVUV+CMPVuuQ=

     

       113
       113
       -
       tangled.sh/seiso.moe/magna v0.0.0-20250326021922-01ca5bbcb720/go.mod h1:bqm+DTo2Pv4ITT0EnR079l++BJgoChBswSB/3KeijUk=

     

       111
       111
       +
       tangled.sh/seiso.moe/magna v0.0.1 h1:v8GM2y3xEinc0jGVxYf/33xtWJ74ES9EuTaMxXL8zxo=

     

       112
       112
       +
       tangled.sh/seiso.moe/magna v0.0.1/go.mod h1:bqm+DTo2Pv4ITT0EnR079l++BJgoChBswSB/3KeijUk=

+17 -2

main.go

···

       5
       5
        
       	"log"

     

       6
       6
        
       	"log/slog"

     

       7
       7
        
       	"os"

     

       8
       8
       +
       	"os/signal"

     

       9
       9
       +
       	"syscall"

     

       8
       10
        
       	"time"

     

       9
       11
        
       

     

       10
       12
        
       	"tangled.sh/seiso.moe/alky/pkg/config"

     
···

       40
       42
        
       		log.Fatal(err)

     

       41
       43
        
       	}

     

       42
       44
        
       

     

       43
       43
       -
       	cache := dns.NewMemoryCache(cfg.Cache.MaxItems, cfg.Cache.CleanupInterval.Duration)

     

       45
       45
       +
       	cache := dns.NewLRUCache(cfg.Cache.MaxItems, cfg.Cache.CleanupInterval.Duration)

     

       46
       46
       +
       	defer cache.Stop()

     

       44
       47
        
       

     

       45
       48
        
       	handler := &dns.QueryHandler{

     

       46
       49
        
       		RootServers: rootServers,

     
···

       65
       68
        
       		Level:  slog.LevelInfo,

     

       66
       69
        
       	})(metricsHandler)

     

       67
       70
        
       

     

       71
       71
       +
       	go func() {

     

       72
       72
       +
       		sigChan := make(chan os.Signal, 1)

     

       73
       73
       +
       		signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)

     

       74
       74
       +
       		<-sigChan

     

       75
       75
       +
       		slog.Info("Shutting down...")

     

       76
       76
       +
       		cache.Stop()

     

       77
       77
       +
       		metricsClient.Close()

     

       78
       78
       +
       		os.Exit(0)

     

       79
       79
       +
       	}()

     

       80
       80
       +
       

     

       68
       81
        
       	s := dns.Server{

     

       69
       82
        
       		Address:      cfg.Server.Address,

     

       70
       83
        
       		Port:         cfg.Server.Port,

     
···

       77
       90
        
       

     

       78
       91
        
       	if err := s.ListenAndServe(); err != nil {

     

       79
       92
        
       		slog.Error("Failed to start server", "error", err)

     

       93
       93
       +
       		cache.Stop()

     

       94
       94
       +
       		metricsClient.Close()

     

       80
       95
        
       	}

     

       81
       96
        
       }

     

       82
       97
        
       

     

       83
       83
       -
       func monitorCacheMetrics(cache *dns.MemoryCache, metricsClient *metrics.ClickHouseMetrics, logger *slog.Logger) {

     

       98
       98
       +
       func monitorCacheMetrics(cache dns.Cache, metricsClient *metrics.ClickHouseMetrics, logger *slog.Logger) {

     

       84
       99
        
       	ticker := time.NewTicker(1 * time.Minute)

     

       85
       100
        
       	defer ticker.Stop()

     

       86
       101

+212 -98

pkg/dns/cache.go

···

       1
       1
        
       package dns

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"container/list"

     

       4
       5
        
       	"strings"

     

       5
       6
        
       	"sync"

     

       7
       7
       +
       	"sync/atomic"

     

       6
       8
        
       	"time"

     

       7
       9
        
       

     

       8
       10
        
       	"tangled.sh/seiso.moe/magna"

     
···

       22
       24
        
       	Additional  []CachedResourceRecord

     

       23
       25
        
       	NegativeTTL time.Duration

     

       24
       26
        
       	ExpireAt    time.Time

     

       25
       25
       -
       	CreateTime  time.Time

     

       26
       27
        
       	IsNegative  bool

     

       27
       28
        
       }

     

       28
       29
        
       

     
···

       32
       33
        
       	BailiwickRule BailiwickRule

     

       33
       34
        
       }

     

       34
       35
        
       

     

       35
       35
       -
       type MemoryCache struct {

     

       36
       36
       -
       	entries        map[string]*CacheEntry

     

       37
       37
       -
       	mu             sync.RWMutex

     

       38
       38
       -
       	stats          CacheStats

     

       39
       39
       -
       	maxSize        int

     

       40
       40
       -
       	cleaupInterval time.Duration

     

       36
       36
       +
       type CacheStats struct {

     

       37
       37
       +
       	TotalQueries atomic.Int64

     

       38
       38
       +
       	CacheHits    atomic.Int64

     

       39
       39
       +
       	CacheMisses  atomic.Int64

     

       40
       40
       +
       	NegativeHits atomic.Int64

     

       41
       41
       +
       	PositiveHits atomic.Int64

     

       42
       42
       +
       	Evictions    atomic.Int64

     

       43
       43
       +
       	Size         atomic.Int64

     

       44
       44
       +
       }

     

       45
       45
       +
       

     

       46
       46
       +
       type LRUCache struct {

     

       47
       47
       +
       	mu              sync.RWMutex

     

       48
       48
       +
       	maxSize         int

     

       49
       49
       +
       	cleanupInterval time.Duration

     

       50
       50
       +
       	lruList         *list.List

     

       51
       51
       +
       	cacheMap        map[string]*list.Element

     

       52
       52
       +
       	stats           CacheStats

     

       53
       53
       +
       	stopCleanup     chan struct{}

     

       41
       54
        
       }

     

       42
       55
        
       

     

       43
       43
       -
       type CacheStats struct {

     

       44
       44
       -
       	TotalQueries int64

     

       45
       45
       -
       	CacheHits    int64

     

       46
       46
       -
       	CacheMisses  int64

     

       47
       47
       -
       	NegativeHits int64

     

       48
       48
       -
       	PositiveHits int64

     

       49
       49
       -
       	Evictions    int64

     

       50
       50
       -
       	Size         int64

     

       56
       56
       +
       type lruItem struct {

     

       57
       57
       +
       	key   string

     

       58
       58
       +
       	value *CacheEntry

     

       51
       59
        
       }

     

       52
       60
        
       

     

       53
       61
        
       type Cache interface {

     

       54
       62
        
       	Get(key string) (*CacheEntry, bool)

     

       55
       63
        
       	Set(key string, entry *CacheEntry)

     

       56
       64
        
       	GetStats() *CacheStats

     

       65
       65
       +
       	Stop()

     

       57
       66
        
       }

     

       58
       67
        
       

     

       59
       59
       -
       func NewMemoryCache(maxSize int, cleanupInterval time.Duration) *MemoryCache {

     

       60
       60
       -
       	cache := &MemoryCache{

     

       61
       61
       -
       		entries:        make(map[string]*CacheEntry),

     

       62
       62
       -
       		maxSize:        maxSize,

     

       63
       63
       -
       		cleaupInterval: cleanupInterval,

     

       68
       68
       +
       func NewLRUCache(maxSize int, cleanupInterval time.Duration) *LRUCache {

     

       69
       69
       +
       	if maxSize <= 0 {

     

       70
       70
       +
       		maxSize = 5000

     

       71
       71
       +
       	}

     

       72
       72
       +
       

     

       73
       73
       +
       	if cleanupInterval <= 0 {

     

       74
       74
       +
       		cleanupInterval = 5 * time.Minute

     

       75
       75
       +
       	}

     

       76
       76
       +
       

     

       77
       77
       +
       	cache := &LRUCache{

     

       78
       78
       +
       		maxSize:         maxSize,

     

       79
       79
       +
       		cleanupInterval: cleanupInterval,

     

       80
       80
       +
       		lruList:         list.New(),

     

       81
       81
       +
       		cacheMap:        make(map[string]*list.Element),

     

       82
       82
       +
       		stopCleanup:     make(chan struct{}),

     

       64
       83
        
       	}

     

       65
       84
        
       

     

       66
       85
        
       	go cache.periodicCleanup()

     

       67
       86
        
       	return cache

     

       68
       87
        
       }

     

       69
       88
        
       

     

       70
       70
       -
       func (c *MemoryCache) Get(key string) (*CacheEntry, bool) {

     

       89
       89
       +
       func (c *LRUCache) Get(key string) (*CacheEntry, bool) {

     

       90
       90
       +
       	c.stats.TotalQueries.Add(1)

     

       91
       91
       +
       

     

       71
       92
        
       	c.mu.RLock()

     

       93
       93
       +
       	element, exists := c.cacheMap[key]

     

       72
       94
        
       	c.mu.RUnlock()

     

       73
       95
        
       

     

       74
       74
       -
       	c.stats.TotalQueries++

     

       96
       96
       +
       	if !exists {

     

       97
       97
       +
       		c.stats.CacheMisses.Add(1)

     

       98
       98
       +
       		return nil, false

     

       99
       99
       +
       	}

     

       100
       100
       +
       

     

       101
       101
       +
       	c.mu.Lock()

     

       102
       102
       +
       	defer c.mu.Unlock()

     

       75
       103
        
       

     

       76
       76
       -
       	entry, exists := c.entries[key]

     

       104
       104
       +
       	element, exists = c.cacheMap[key]

     

       105
       105
       +
       	// element might have been evicted or cleaned between RUnlock and Lock

     

       77
       106
        
       	if !exists {

     

       78
       78
       -
       		c.stats.CacheMisses++

     

       79
       107
        
       		return nil, false

     

       80
       108
        
       	}

     

       81
       109
        
       

     

       110
       110
       +
       	item := element.Value.(*lruItem)

     

       111
       111
       +
       	entry := item.value

     

       112
       112
       +
       

     

       82
       113
        
       	if time.Now().After(entry.ExpireAt) {

     

       83
       83
       -
       		c.stats.CacheMisses++

     

       114
       114
       +
       		c.removeItem(element)

     

       115
       115
       +
       		c.stats.CacheMisses.Add(1)

     

       84
       116
        
       		return nil, false

     

       85
       117
        
       	}

     

       86
       118
        
       

     

       87
       119
        
       	if entry.IsNegative {

     

       88
       88
       -
       		c.stats.NegativeHits++

     

       120
       120
       +
       		c.stats.NegativeHits.Add(1)

     

       89
       121
        
       	} else {

     

       90
       90
       -
       		c.stats.PositiveHits++

     

       122
       122
       +
       		c.stats.PositiveHits.Add(1)

     

       91
       123
        
       	}

     

       92
       92
       -
       	c.stats.CacheHits++

     

       124
       124
       +
       	c.stats.CacheHits.Add(1)

     

       93
       125
        
       

     

       94
       126
        
       	return entry, true

     

       95
       127
        
       }

     

       96
       128
        
       

     

       97
       97
       -
       func (c *MemoryCache) Set(key string, entry *CacheEntry) {

     

       129
       129
       +
       func (c *LRUCache) Set(key string, entry *CacheEntry) {

     

       130
       130
       +
       	if time.Now().After(entry.ExpireAt) {

     

       131
       131
       +
       		return

     

       132
       132
       +
       	}

     

       133
       133
       +
       

     

       98
       134
        
       	c.mu.Lock()

     

       99
       135
        
       	defer c.mu.Unlock()

     

       100
       136
        
       

     

       101
       101
       -
       	if len(c.entries) >= c.maxSize {

     

       102
       102
       -
       		c.evictOldest()

     

       137
       137
       +
       	if element, exists := c.cacheMap[key]; exists {

     

       138
       138
       +
       		element.Value.(*lruItem).value = entry

     

       139
       139
       +
       		c.lruList.MoveToFront(element)

     

       140
       140
       +
       		return

     

       103
       141
        
       	}

     

       104
       142
        
       

     

       105
       105
       -
       	c.entries[key] = entry

     

       106
       106
       -
       	c.stats.Size = int64(len(c.entries))

     

       107
       107
       -
       }

     

       143
       143
       +
       	newItem := &lruItem{

     

       144
       144
       +
       		key:   key,

     

       145
       145
       +
       		value: entry,

     

       146
       146
       +
       	}

     

       147
       147
       +
       	element := c.lruList.PushFront(newItem)

     

       148
       148
       +
       	c.cacheMap[key] = element

     

       149
       149
       +
       	currentSize := int64(c.lruList.Len())

     

       150
       150
       +
       	c.stats.Size.Store(currentSize)

     

       108
       151
        
       

     

       109
       109
       -
       func (c *MemoryCache) GetStats() *CacheStats {

     

       110
       110
       -
       	c.mu.RLock()

     

       111
       111
       -
       	defer c.mu.RUnlock()

     

       112
       112
       -
       

     

       113
       113
       -
       	stats := c.stats

     

       114
       114
       -
       	return &stats

     

       152
       152
       +
       	for int64(c.lruList.Len()) > int64(c.maxSize) {

     

       153
       153
       +
       		c.evictLRU()

     

       154
       154
       +
       	}

     

       115
       155
        
       }

     

       116
       156
        
       

     

       117
       117
       -
       func (c *MemoryCache) evictOldest() {

     

       118
       118
       -
       	var oldestKey string

     

       119
       119
       -
       	var oldestTime time.Time

     

       120
       120
       -
       

     

       121
       121
       -
       	first := true

     

       122
       122
       -
       	for k, e := range c.entries {

     

       123
       123
       -
       		if first || e.CreateTime.Before(oldestTime) {

     

       124
       124
       -
       			oldestKey = k

     

       125
       125
       -
       			oldestTime = e.CreateTime

     

       126
       126
       -
       			first = false

     

       127
       127
       -
       		}

     

       157
       157
       +
       func (c *LRUCache) evictLRU() {

     

       158
       158
       +
       	element := c.lruList.Back()

     

       159
       159
       +
       	if element != nil {

     

       160
       160
       +
       		c.removeItem(element)

     

       161
       161
       +
       		c.stats.Evictions.Add(1)

     

       128
       162
        
       	}

     

       163
       163
       +
       }

     

       129
       164
        
       

     

       130
       130
       -
       	if oldestKey != "" {

     

       131
       131
       -
       		delete(c.entries, oldestKey)

     

       132
       132
       -
       		c.stats.Evictions++

     

       133
       133
       -
       	}

     

       165
       165
       +
       func (c *LRUCache) removeItem(element *list.Element) {

     

       166
       166
       +
       	item := element.Value.(*lruItem)

     

       167
       167
       +
       	delete(c.cacheMap, item.key)

     

       168
       168
       +
       	c.lruList.Remove(element)

     

       169
       169
       +
       	c.stats.Size.Store(int64(c.lruList.Len()))

     

       134
       170
        
       }

     

       135
       171
        
       

     

       136
       136
       -
       func (c *MemoryCache) periodicCleanup() {

     

       137
       137
       -
       	ticker := time.NewTicker(c.cleaupInterval)

     

       172
       172
       +
       func (c *LRUCache) GetStats() *CacheStats {

     

       173
       173
       +
       	statsSnapshot := &CacheStats{}

     

       174
       174
       +
       	statsSnapshot.TotalQueries.Store(c.stats.TotalQueries.Load())

     

       175
       175
       +
       	statsSnapshot.CacheHits.Store(c.stats.CacheHits.Load())

     

       176
       176
       +
       	statsSnapshot.CacheMisses.Store(c.stats.CacheMisses.Load())

     

       177
       177
       +
       	statsSnapshot.NegativeHits.Store(c.stats.NegativeHits.Load())

     

       178
       178
       +
       	statsSnapshot.PositiveHits.Store(c.stats.PositiveHits.Load())

     

       179
       179
       +
       	statsSnapshot.Evictions.Store(c.stats.Evictions.Load())

     

       180
       180
       +
       	statsSnapshot.Size.Store(c.stats.Size.Load())

     

       181
       181
       +
       	return statsSnapshot

     

       182
       182
       +
       }

     

       183
       183
       +
       

     

       184
       184
       +
       func (c *LRUCache) periodicCleanup() {

     

       185
       185
       +
       	ticker := time.NewTicker(c.cleanupInterval)

     

       138
       186
        
       	defer ticker.Stop()

     

       139
       187
        
       

     

       140
       140
       -
       	for range ticker.C {

     

       141
       141
       -
       		c.cleanup()

     

       188
       188
       +
       	for {

     

       189
       189
       +
       		select {

     

       190
       190
       +
       		case <-ticker.C:

     

       191
       191
       +
       			c.cleanupExpired()

     

       192
       192
       +
       		case <-c.stopCleanup:

     

       193
       193
       +
       			return

     

       194
       194
       +
       		}

     

       142
       195
        
       	}

     

       143
       196
        
       }

     

       144
       197
        
       

     

       145
       145
       -
       func (c *MemoryCache) cleanup() {

     

       198
       198
       +
       func (c *LRUCache) cleanupExpired() {

     

       146
       199
        
       	c.mu.Lock()

     

       147
       200
        
       	defer c.mu.Unlock()

     

       148
       201
        
       

     

       149
       202
        
       	now := time.Now()

     

       150
       150
       -
       	for k, e := range c.entries {

     

       151
       151
       -
       		if now.After(e.ExpireAt) {

     

       152
       152
       -
       			delete(c.entries, k)

     

       203
       203
       +
       	element := c.lruList.Back()

     

       204
       204
       +
       	for element != nil {

     

       205
       205
       +
       		item := element.Value.(*lruItem)

     

       206
       206
       +
       		nextElement := element.Prev()

     

       207
       207
       +
       

     

       208
       208
       +
       		if now.After(item.value.ExpireAt) {

     

       209
       209
       +
       			c.removeItem(element)

     

       153
       210
        
       		}

     

       211
       211
       +
       

     

       212
       212
       +
       		element = nextElement

     

       154
       213
        
       	}

     

       214
       214
       +
       }

     

       155
       215
        
       

     

       156
       156
       -
       	c.stats.Size = int64(len(c.entries))

     

       216
       216
       +
       func (c *LRUCache) Stop() {

     

       217
       217
       +
       	close(c.stopCleanup)

     

       157
       218
        
       }

     

       158
       219
        
       

     

       159
       220
        
       func getMinTTL(records []magna.ResourceRecord) uint32 {

     

       160
       221
        
       	if len(records) == 0 {

     

       161
       161
       -
       		return 0

     

       222
       222
       +
       		return 60

     

       162
       223
        
       	}

     

       163
       163
       -
       

     

       164
       224
        
       	minTTL := records[0].TTL

     

       165
       225
        
       	for _, rr := range records[1:] {

     

       226
       226
       +
       		if rr.TTL == 0 {

     

       227
       227
       +
       			return 60

     

       228
       228
       +
       		}

     

       166
       229
        
       		if rr.TTL < minTTL {

     

       167
       230
        
       			minTTL = rr.TTL

     

       168
       231
        
       		}

     

       232
       232
       +
       	}

     

       233
       233
       +
       	if minTTL < 60 {

     

       234
       234
       +
       		return 60

     

       169
       235
        
       	}

     

       170
       236
        
       	return minTTL

     

       171
       237
        
       }

     
···

       173
       239
        
       func CreateCacheEntry(msg *magna.Message, zone string) *CacheEntry {

     

       174
       240
        
       	now := time.Now()

     

       175
       241
        
       	entry := &CacheEntry{

     

       176
       176
       -
       		CreateTime: now,

     

       177
       242
        
       		IsNegative: msg.Header.RCode == magna.NXDOMAIN,

     

       178
       243
        
       	}

     

       179
       244
        
       

     
···

       181
       246
        
       		var soaTTL uint32

     

       182
       247
        
       		for _, auth := range msg.Authority {

     

       183
       248
        
       			if auth.RType == magna.SOAType {

     

       184
       184
       -
       				soaTTL = auth.TTL

     

       249
       249
       +
       				soa, ok := auth.RData.(*magna.SOA)

     

       250
       250
       +
       				if ok {

     

       251
       251
       +
       					soaTTL = soa.Minimum

     

       252
       252
       +
       					if auth.TTL < soaTTL {

     

       253
       253
       +
       						soaTTL = auth.TTL

     

       254
       254
       +
       					}

     

       255
       255
       +
       				} else {

     

       256
       256
       +
       					soaTTL = auth.TTL

     

       257
       257
       +
       				}

     

       185
       258
        
       				break

     

       186
       259
        
       			}

     

       187
       260
        
       		}

     
···

       190
       263
        
       			soaTTL = 900

     

       191
       264
        
       		}

     

       192
       265
        
       

     

       266
       266
       +
       		if soaTTL < 60 {

     

       267
       267
       +
       			soaTTL = 60

     

       268
       268
       +
       		}

     

       269
       269
       +
       

     

       193
       270
        
       		entry.NegativeTTL = time.Duration(soaTTL) * time.Second

     

       194
       271
        
       		entry.ExpireAt = now.Add(entry.NegativeTTL)

     

       272
       272
       +
       

     

       195
       273
        
       		entry.Authority = make([]CachedResourceRecord, len(msg.Authority))

     

       196
       274
        
       		for i, rr := range msg.Authority {

     

       275
       275
       +
       			recordTTL := rr.TTL

     

       276
       276
       +
       			if recordTTL < 60 {

     

       277
       277
       +
       				recordTTL = 60

     

       278
       278
       +
       			}

     

       197
       279
        
       			rule := determineBailiwickRule(zone, rr.Name)

     

       198
       280
        
       			entry.Authority[i] = CachedResourceRecord{

     

       199
       281
        
       				Record:        rr,

     

       200
       200
       -
       				ExpireAt:      now.Add(time.Duration(rr.TTL) * time.Second),

     

       282
       282
       +
       				ExpireAt:      now.Add(time.Duration(recordTTL) * time.Second),

     

       201
       283
        
       				BailiwickRule: rule,

     

       202
       284
        
       			}

     

       203
       285
        
       		}

     

       204
       286
        
       

     

       205
       205
       -
       		return entry

     

       206
       206
       -
       	}

     

       287
       287
       +
       	} else {

     

       288
       288
       +
       		minAnswerTTL := getMinTTL(msg.Answer)

     

       289
       289
       +
       

     

       290
       290
       +
       		if len(msg.Answer) == 0 && len(msg.Authority) > 0 && msg.Authority[0].RType == magna.SOAType {

     

       291
       291
       +
       

     

       292
       292
       +
       			soa, ok := msg.Authority[0].RData.(*magna.SOA)

     

       293
       293
       +
       			soaTTL := uint32(900)

     

       294
       294
       +
       			if ok {

     

       295
       295
       +
       				soaTTL = soa.Minimum

     

       296
       296
       +
       				if msg.Authority[0].TTL < soaTTL {

     

       297
       297
       +
       					soaTTL = msg.Authority[0].TTL

     

       298
       298
       +
       				}

     

       299
       299
       +
       			} else {

     

       300
       300
       +
       				soaTTL = msg.Authority[0].TTL

     

       301
       301
       +
       			}

     

       302
       302
       +
       			if soaTTL < 60 {

     

       303
       303
       +
       				soaTTL = 60

     

       304
       304
       +
       			}

     

       305
       305
       +
       

     

       306
       306
       +
       			entry.IsNegative = true

     

       307
       307
       +
       			entry.NegativeTTL = time.Duration(soaTTL) * time.Second

     

       308
       308
       +
       			entry.ExpireAt = now.Add(entry.NegativeTTL)

     

       309
       309
       +
       

     

       310
       310
       +
       			entry.Authority = make([]CachedResourceRecord, len(msg.Authority))

     

       311
       311
       +
       			for i, rr := range msg.Authority {

     

       312
       312
       +
       				recordTTL := rr.TTL

     

       313
       313
       +
       				if recordTTL < 60 {

     

       314
       314
       +
       					recordTTL = 60

     

       315
       315
       +
       				}

     

       316
       316
       +
       				rule := determineBailiwickRule(zone, rr.Name)

     

       317
       317
       +
       				entry.Authority[i] = CachedResourceRecord{Record: rr, ExpireAt: now.Add(time.Duration(recordTTL) * time.Second), BailiwickRule: rule}

     

       318
       318
       +
       			}

     

       207
       319
        
       

     

       208
       208
       -
       	minTTL := getMinTTL(msg.Answer)

     

       209
       209
       -
       	entry.ExpireAt = now.Add(time.Duration(minTTL) * time.Second)

     

       320
       320
       +
       		} else {

     

       321
       321
       +
       			entry.ExpireAt = now.Add(time.Duration(minAnswerTTL) * time.Second)

     

       210
       322
        
       

     

       211
       211
       -
       	entry.Answer = make([]CachedResourceRecord, len(msg.Answer))

     

       212
       212
       -
       	for i, rr := range msg.Answer {

     

       213
       213
       -
       		rule := determineBailiwickRule(zone, rr.Name)

     

       214
       214
       -
       		entry.Answer[i] = CachedResourceRecord{

     

       215
       215
       -
       			Record:        rr,

     

       216
       216
       -
       			ExpireAt:      now.Add(time.Duration(rr.TTL) * time.Second),

     

       217
       217
       -
       			BailiwickRule: rule,

     

       218
       218
       -
       		}

     

       219
       219
       -
       	}

     

       323
       323
       +
       			entry.Answer = make([]CachedResourceRecord, len(msg.Answer))

     

       324
       324
       +
       			for i, rr := range msg.Answer {

     

       325
       325
       +
       				recordTTL := rr.TTL

     

       326
       326
       +
       				if recordTTL < 60 {

     

       327
       327
       +
       					recordTTL = 60

     

       328
       328
       +
       				}

     

       329
       329
       +
       				rule := determineBailiwickRule(zone, rr.Name)

     

       330
       330
       +
       				entry.Answer[i] = CachedResourceRecord{Record: rr, ExpireAt: now.Add(time.Duration(recordTTL) * time.Second), BailiwickRule: rule}

     

       331
       331
       +
       			}

     

       220
       332
        
       

     

       221
       221
       -
       	entry.Authority = make([]CachedResourceRecord, len(msg.Authority))

     

       222
       222
       -
       	for i, rr := range msg.Authority {

     

       223
       223
       -
       		rule := determineBailiwickRule(zone, rr.Name)

     

       224
       224
       -
       		entry.Authority[i] = CachedResourceRecord{

     

       225
       225
       -
       			Record:        rr,

     

       226
       226
       -
       			ExpireAt:      now.Add(time.Duration(rr.TTL) * time.Second),

     

       227
       227
       -
       			BailiwickRule: rule,

     

       228
       228
       -
       		}

     

       229
       229
       -
       	}

     

       333
       333
       +
       			entry.Authority = make([]CachedResourceRecord, len(msg.Authority))

     

       334
       334
       +
       			for i, rr := range msg.Authority {

     

       335
       335
       +
       				recordTTL := rr.TTL

     

       336
       336
       +
       				if recordTTL < 60 {

     

       337
       337
       +
       					recordTTL = 60

     

       338
       338
       +
       				}

     

       339
       339
       +
       				rule := determineBailiwickRule(zone, rr.Name)

     

       340
       340
       +
       				entry.Authority[i] = CachedResourceRecord{Record: rr, ExpireAt: now.Add(time.Duration(recordTTL) * time.Second), BailiwickRule: rule}

     

       341
       341
       +
       			}

     

       230
       342
        
       

     

       231
       231
       -
       	entry.Additional = make([]CachedResourceRecord, len(msg.Additional))

     

       232
       232
       -
       	for i, rr := range msg.Additional {

     

       233
       233
       -
       		rule := determineBailiwickRule(zone, rr.Name)

     

       234
       234
       -
       		entry.Additional[i] = CachedResourceRecord{

     

       235
       235
       -
       			Record:        rr,

     

       236
       236
       -
       			ExpireAt:      now.Add(time.Duration(rr.TTL) * time.Second),

     

       237
       237
       -
       			BailiwickRule: rule,

     

       343
       343
       +
       			entry.Additional = make([]CachedResourceRecord, len(msg.Additional))

     

       344
       344
       +
       			for i, rr := range msg.Additional {

     

       345
       345
       +
       				recordTTL := rr.TTL

     

       346
       346
       +
       				if recordTTL < 60 {

     

       347
       347
       +
       					recordTTL = 60

     

       348
       348
       +
       				}

     

       349
       349
       +
       				rule := determineBailiwickRule(zone, rr.Name)

     

       350
       350
       +
       				entry.Additional[i] = CachedResourceRecord{Record: rr, ExpireAt: now.Add(time.Duration(recordTTL) * time.Second), BailiwickRule: rule}

     

       351
       351
       +
       			}

     

       238
       352
        
       		}

     

       239
       353
        
       	}

     

       240
       354

+151 -193

pkg/dns/resolve.go

···

       4
       4
        
       	"context"

     

       5
       5
        
       	"fmt"

     

       6
       6
        
       	"log/slog"

     

       7
       7
       +
       	"math/rand"

     

       7
       8
        
       	"net"

     

       8
       9
        
       	"time"

     

       9
       10
        
       

     

       10
       11
        
       	"tangled.sh/seiso.moe/magna"

     

       11
       12
        
       )

     

       13
       13
       +
       

     

       14
       14
       +
       var errNXDOMAIN = fmt.Errorf("nxdomain")

     

       12
       15
        
       

     

       13
       16
        
       type QueryHandler struct {

     

       14
       17
        
       	RootServers []string

     

       15
       18
        
       	Timeout     time.Duration

     

       16
       16
       -
       	Cache       *MemoryCache

     

       19
       19
       +
       	Cache       Cache

     

       17
       20
        
       	Logger      *slog.Logger

     

       18
       21
        
       }

     

       19
       22
        
       

     
···

       33
       36
        
       	}

     

       34
       37
        
       

     

       35
       38
        
       	question := r.Message.Question[0]

     

       36
       36
       -
       	answers, authority, err := h.resolveQuestion(r.Context, question, h.RootServers)

     

       39
       39
       +
       	records, err := h.resolveQuestion(r.Context, question, h.RootServers)

     

       37
       40
        
       

     

       38
       41
        
       	msg := r.Message.CreateReply(r.Message)

     

       39
       42
        
       	msg.Header.RA = true

     

       40
       43
        
       

     

       41
       41
       -
       	if err != nil {

     

       42
       42
       -
       		if err.Error() == "nxdomain" {

     

       43
       43
       -
       			msg = msg.SetRCode(magna.NXDOMAIN)

     

       44
       44
       -
       			msg.Authority = authority

     

       45
       45
       -
       			msg.Header.NSCount = uint16(len(authority))

     

       46
       46
       -
       		} else {

     

       47
       47
       -
       			msg = msg.SetRCode(magna.SERVFAIL)

     

       48
       48
       -
       		}

     

       44
       44
       +
       	if err == errNXDOMAIN {

     

       45
       45
       +
       		msg = msg.SetRCode(magna.NXDOMAIN)

     

       46
       46
       +
       		msg.Authority = records

     

       47
       47
       +
       		msg.Header.NSCount = uint16(len(records))

     

       48
       48
       +
       		msg.Header.ANCount = 0

     

       49
       49
       +
       		msg.Answer = nil

     

       50
       50
       +
       	} else if err != nil {

     

       51
       51
       +
       		msg.SetRCode(magna.SERVFAIL)

     

       49
       52
        
       	} else {

     

       50
       50
       -
       		msg.Answer = answers

     

       51
       51
       -
       		msg.Header.ANCount = uint16(len(answers))

     

       53
       53
       +
       		msg.Answer = records

     

       54
       54
       +
       		msg.Header.ANCount = uint16(len(records))

     

       52
       55
        
       		msg = msg.SetRCode(magna.NOERROR)

     

       53
       56
        
       	}

     

       54
       57
        
       

     

       55
       58
        
       	w.WriteMsg(msg)

     

       56
       59
        
       }

     

       57
       60
        
       

     

       58
       58
       -
       func (h *QueryHandler) resolveQuestion(ctx context.Context, question magna.Question, servers []string) ([]magna.ResourceRecord, []magna.ResourceRecord, error) {

     

       59
       59
       -
       	return h.resolveQuestionWithZone(ctx, question, servers, ".")

     

       60
       60
       -
       }

     

       61
       61
       -
       

     

       62
       62
       -
       func (h *QueryHandler) resolveQuestionWithZone(ctx context.Context, question magna.Question, servers []string, currentZone string) ([]magna.ResourceRecord, []magna.ResourceRecord, error) {

     

       63
       63
       -
       	cacheKey := fmt.Sprintf("%s:%s:%s", question.QName, question.QType.String(), question.QClass.String())

     

       64
       64
       -
       

     

       65
       65
       -
       	if h.Cache != nil {

     

       66
       66
       -
       		if entry, hit := h.Cache.Get(cacheKey); hit {

     

       67
       67
       -
       			now := time.Now()

     

       68
       68
       -
       

     

       69
       69
       -
       			if r := getCurrentRequest(ctx); r != nil {

     

       70
       70
       -
       				r.Context = setCacheHit(r.Context)

     

       71
       71
       -
       			}

     

       72
       72
       -
       

     

       73
       73
       -
       			if entry.IsNegative {

     

       74
       74
       -
       				return nil, convertCachedToMagna(entry.Authority, now), fmt.Errorf("nxdomain")

     

       75
       75
       -
       			}

     

       76
       76
       -
       

     

       77
       77
       -
       			validAnswers := convertCachedToMagna(entry.Answer, now)

     

       78
       78
       -
       			if len(validAnswers) > 0 {

     

       79
       79
       -
       				return validAnswers, nil, nil

     

       80
       80
       -
       			}

     

       81
       81
       -
       		} else {

     

       82
       82
       -
       			if r := getCurrentRequest(ctx); r != nil {

     

       83
       83
       -
       				r.Context = setCacheMiss(r.Context)

     

       84
       84
       -
       			}

     

       85
       85
       -
       		}

     

       86
       86
       -
       	}

     

       87
       87
       -
       

     

       88
       88
       -
       	ctx, cancel := context.WithTimeout(ctx, h.Timeout)

     

       61
       61
       +
       func (h *QueryHandler) resolveQuestion(ctx context.Context, question magna.Question, servers []string) ([]magna.ResourceRecord, error) {

     

       62
       62
       +
       	resolveCtx, cancel := context.WithTimeout(ctx, h.Timeout)

     

       89
       63
        
       	defer cancel()

     

       90
       90
       -
       

     

       91
       64
        
       	ch := make(chan queryResponse, len(servers))

     

       65
       65
       +
       

     

       92
       66
        
       	for _, s := range servers {

     

       93
       93
       -
       		go queryServer(ctx, question, s, ch, h.Timeout)

     

       67
       67
       +
       		go queryServer(resolveCtx, question, s, ch)

     

       94
       68
        
       	}

     

       95
       69
        
       

     

       96
       96
       -
       	for i := 0; i < len(servers); i++ {

     

       70
       70
       +
       	for range servers {

     

       97
       71
        
       		select {

     

       98
       72
        
       		case res := <-ch:

     

       99
       73
        
       			if res.Error != nil {

     

       100
       100
       -
       				h.Logger.Debug("server query failed",

     

       101
       101
       -
       					"server", res.Server,

     

       102
       102
       -
       					"error", res.Error)

     

       103
       103
       -
       				continue

     

       74
       74
       +
       				slog.Warn("error", "question", question, "server", res.Server, "error", res.Error)

     

       75
       75
       +
       				break

     

       104
       76
        
       			}

     

       105
       77
        
       

     

       106
       78
        
       			msg := res.MSG

     

       107
       107
       -
       			zone := extractZone(&msg)

     

       108
       108
       -
       			if zone == "" {

     

       109
       109
       -
       				zone = currentZone

     

       110
       110
       -
       			}

     

       111
       111
       -
       

     

       112
       79
        
       			if msg.Header.RCode == magna.NXDOMAIN {

     

       113
       113
       -
       				entry := CreateCacheEntry(&msg, zone)

     

       114
       114
       -
       				h.Cache.Set(cacheKey, entry)

     

       115
       115
       -
       				now := time.Now()

     

       116
       116
       -
       				return nil, convertCachedToMagna(entry.Authority, now), fmt.Errorf("nxdomain")

     

       80
       80
       +
       				return msg.Authority, errNXDOMAIN

     

       117
       81
        
       			}

     

       118
       82
        
       

     

       119
       83
        
       			if msg.Header.ANCount > 0 {

     

       120
       84
        
       				if msg.Answer[0].RType == magna.CNAMEType {

     

       121
       121
       -
       					h.Logger.Debug("following CNAME",

     

       122
       122
       -
       						"cname", msg.Answer[0].RData.String())

     

       123
       123
       -
       

     

       124
       124
       -
       					entry := CreateCacheEntry(&msg, zone)

     

       125
       125
       -
       					h.Cache.Set(cacheKey, entry)

     

       85
       85
       +
       					cname_answers, err := h.resolveQuestion(resolveCtx, magna.Question{QName: msg.Answer[0].RData.String(), QType: question.QType, QClass: question.QClass}, h.RootServers)

     

       86
       86
       +
       					if err != nil {

     

       87
       87
       +
       						if err == errNXDOMAIN {

     

       88
       88
       +
       							return cname_answers, errNXDOMAIN

     

       89
       89
       +
       						}

     

       90
       90
       +
       						slog.Warn("error resolving CNAME", "cname", msg.Answer[0].RData.String(), "error", err)

     

       126
       91
        
       

     

       127
       127
       -
       					answers, auth, err := h.resolveQuestionWithZone(ctx, magna.Question{QName: msg.Answer[0].RData.String(), QType: question.QType, QClass: question.QClass}, h.RootServers, zone)

     

       128
       128
       -
       					if err == nil {

     

       129
       129
       -
       						return append(msg.Answer, answers...), auth, nil

     

       92
       92
       +
       						continue

     

       130
       93
        
       					}

     

       131
       94
        
       

     

       132
       132
       -
       					return nil, auth, err

     

       95
       95
       +
       					msg.Answer = append(msg.Answer, cname_answers...)

     

       133
       96
        
       				}

     

       134
       97
        
       

     

       135
       135
       -
       				entry := CreateCacheEntry(&msg, zone)

     

       136
       136
       -
       				h.Cache.Set(cacheKey, entry)

     

       137
       137
       -
       				return msg.Answer, nil, nil

     

       138
       138
       -
       			}

     

       139
       139
       -
       

     

       140
       140
       -
       			if msg.Header.ARCount > 0 {

     

       141
       141
       -
       				var nextZone []string

     

       142
       142
       -
       				for _, ans := range msg.Additional {

     

       143
       143
       -
       					if ans.RType == magna.AType {

     

       144
       144
       -
       						nextZone = append(nextZone, ans.RData.String())

     

       145
       145
       -
       					}

     

       146
       146
       -
       				}

     

       147
       147
       -
       

     

       148
       148
       -
       				if len(nextZone) > 0 {

     

       149
       149
       -
       					return h.resolveQuestion(ctx, question, nextZone)

     

       150
       150
       -
       				}

     

       98
       98
       +
       				return msg.Answer, nil

     

       151
       99
        
       			}

     

       152
       100
        
       

     

       153
       101
        
       			if msg.Header.NSCount > 0 {

     

       154
       154
       -
       				nsRecords := make(map[string]string)

     

       155
       155
       -
       				glueRecords := make(map[string]string)

     

       102
       102
       +
       				var nextServers []string

     

       103
       103
       +
       				var nsRecords []magna.ResourceRecord

     

       156
       104
        
       

     

       157
       157
       -
       				if msg.Header.ARCount > 0 {

     

       158
       158
       -
       					for _, additional := range msg.Additional {

     

       159
       159
       -
       						if additional.RType == magna.AType {

     

       160
       160
       -
       							rule := determineBailiwickRule(zone, additional.Name)

     

       161
       161
       -
       							if rule != BailiwickOutside {

     

       162
       162
       -
       								glueRecords[additional.Name] = additional.RData.String()

     

       105
       105
       +
       				glueMap := make(map[string]string)

     

       106
       106
       +
       				for _, rr := range msg.Additional {

     

       107
       107
       +
       					if rr.RType == magna.AType {

     

       108
       108
       +
       						for _, nsRR := range msg.Authority {

     

       109
       109
       +
       							if nsRR.RType == magna.NSType && nsRR.RData.String() == rr.Name {

     

       110
       110
       +
       								glueMap[rr.Name] = rr.RData.String()

     

       111
       111
       +
       								break

     

       163
       112
        
       							}

     

       164
       113
        
       						}

     

       165
       114
        
       					}

     

       166
       115
        
       				}

     

       167
       116
        
       

     

       168
       168
       -
       				var nextServers []string

     

       169
       169
       -
       				var needResolution []string

     

       117
       117
       +
       				for _, rr := range msg.Authority {

     

       118
       118
       +
       					if rr.RType == magna.NSType {

     

       119
       119
       +
       						nsRecords = append(nsRecords, rr)

     

       120
       120
       +
       					}

     

       121
       121
       +
       				}

     

       170
       122
        
       

     

       171
       171
       -
       				for _, auth := range msg.Authority {

     

       172
       172
       -
       					if auth.RType == magna.NSType {

     

       173
       173
       -
       						rule := determineBailiwickRule(zone, auth.Name)

     

       174
       174
       -
       						if rule != BailiwickOutside {

     

       175
       175
       -
       							nsName := auth.RData.String()

     

       176
       176
       -
       							nsRecords[nsName] = ""

     

       123
       123
       +
       				for _, nsRR := range nsRecords {

     

       124
       124
       +
       					nsName := nsRR.RData.String()

     

       125
       125
       +
       					if ip, found := glueMap[nsName]; found {

     

       126
       126
       +
       						nextServers = append(nextServers, ip)

     

       127
       127
       +
       					} else {

     

       128
       128
       +
       						nsAnswers, err := h.resolveQuestion(resolveCtx, magna.Question{QName: nsName, QType: magna.AType, QClass: magna.IN}, h.RootServers)

     

       129
       129
       +
       						if err != nil {

     

       130
       130
       +
       							slog.Warn("error resolving NS A record", "ns", nsName, "error", err)

     

       131
       131
       +
       							continue

     

       132
       132
       +
       						}

     

       177
       133
        
       

     

       178
       178
       -
       							if ip, exists := glueRecords[nsName]; exists {

     

       179
       179
       -
       								nextServers = append(nextServers, ip)

     

       180
       180
       -
       							} else {

     

       181
       181
       -
       								needResolution = append(needResolution, nsName)

     

       134
       134
       +
       						for _, ans := range nsAnswers {

     

       135
       135
       +
       							if ans.RType == magna.AType {

     

       136
       136
       +
       								nextServers = append(nextServers, ans.RData.String())

     

       182
       137
        
       							}

     

       183
       138
        
       						}

     

       184
       139
        
       					}

     

       185
       140
        
       				}

     

       186
       141
        
       

     

       187
       142
        
       				if len(nextServers) > 0 {

     

       188
       188
       -
       					h.Logger.Debug("using glue records for resolution",

     

       189
       189
       -
       						"servers", nextServers)

     

       190
       190
       -
       					return h.resolveQuestionWithZone(ctx, question, nextServers, zone)

     

       143
       143
       +
       					return h.resolveQuestion(resolveCtx, question, nextServers)

     

       191
       144
        
       				}

     

       192
       145
        
       

     

       193
       193
       -
       				for _, ns := range needResolution {

     

       194
       194
       -
       					answers, _, err := h.resolveQuestionWithZone(

     

       195
       195
       -
       						ctx,

     

       196
       196
       -
       						magna.Question{

     

       197
       197
       -
       							QName:  ns,

     

       198
       198
       -
       							QType:  magna.AType,

     

       199
       199
       -
       							QClass: magna.IN,

     

       200
       200
       -
       						},

     

       201
       201
       -
       						h.RootServers,

     

       202
       202
       -
       						zone,

     

       203
       203
       -
       					)

     

       204
       204
       -
       					if err == nil {

     

       205
       205
       -
       						for _, ans := range answers {

     

       206
       206
       -
       							nextServers = append(nextServers, ans.RData.String())

     

       207
       207
       -
       						}

     

       208
       208
       -
       					}

     

       209
       209
       -
       				}

     

       146
       146
       +
       				slog.Warn("could not resolve any NS records for delegation", "question", question.QName)

     

       147
       147
       +
       				continue

     

       148
       148
       +
       			}

     

       210
       149
        
       

     

       211
       211
       -
       				if len(nextServers) > 0 {

     

       212
       212
       -
       					return h.resolveQuestionWithZone(ctx, question, nextServers, zone)

     

       213
       213
       -
       				}

     

       150
       150
       +
       			if msg.Header.RCode == magna.NOERROR && msg.Header.ANCount == 0 {

     

       151
       151
       +
       				return []magna.ResourceRecord{}, nil

     

       214
       152
        
       			}

     

       215
       153
        
       

     

       216
       216
       -
       		case <-ctx.Done():

     

       217
       217
       -
       			return nil, nil, ctx.Err()

     

       154
       154
       +
       			slog.Warn("unexpected response state", "question", question, "server", res.Server, "rcode", msg.Header.RCode)

     

       155
       155
       +
       			continue

     

       156
       156
       +
       		case <-resolveCtx.Done():

     

       157
       157
       +
       			slog.Debug("resolution cancelled or timed out", "question", question)

     

       158
       158
       +
       			return []magna.ResourceRecord{}, fmt.Errorf("resolution timed out or cancelled")

     

       218
       159
        
       		}

     

       219
       160
        
       	}

     

       220
       161
        
       

     

       221
       221
       -
       	return nil, nil, fmt.Errorf("all queries failed")

     

       162
       162
       +
       	slog.Warn("all resolution paths failed", "question", question)

     

       163
       163
       +
       	return []magna.ResourceRecord{}, fmt.Errorf("all resolution paths failed")

     

       222
       164
        
       }

     

       223
       165
        
       

     

       224
       224
       -
       func queryServer(ctx context.Context, question magna.Question, server string, ch chan<- queryResponse, timeout time.Duration) {

     

       225
       225
       -
       	done := make(chan struct{}, 1)

     

       226
       226
       -
       

     

       227
       227
       -
       	go func() {

     

       228
       228
       -
       		conn, err := net.Dial("udp", fmt.Sprintf("%s:53", server))

     

       229
       229
       -
       		if err != nil {

     

       230
       230
       -
       			ch <- queryResponse{Error: err}

     

       231
       231
       -
       			return

     

       232
       232
       -
       		}

     

       233
       233
       -
       		defer conn.Close()

     

       234
       234
       -
       

     

       235
       235
       -
       		query := magna.CreateRequest(0, false)

     

       236
       236
       -
       		query = query.AddQuestion(question)

     

       237
       237
       -
       		if _, err := conn.Write(query.Encode()); err != nil {

     

       238
       238
       -
       			ch <- queryResponse{Server: server, Error: err}

     

       239
       239
       -
       			return

     

       240
       240
       -
       		}

     

       166
       166
       +
       func queryServer(ctx context.Context, question magna.Question, server string, ch chan<- queryResponse) {

     

       167
       167
       +
       	var response queryResponse

     

       168
       168
       +
       	response.Server = server

     

       241
       169
        
       

     

       242
       242
       -
       		p := make([]byte, 512)

     

       243
       243
       -
       		nn, err := conn.Read(p)

     

       244
       244
       -
       

     

       245
       245
       -
       		// TODO: retry request with TCP

     

       246
       246
       -
       		if err != nil || nn > 512 {

     

       247
       247
       -
       			if err == nil {

     

       248
       248
       -
       				err = fmt.Errorf("truncated response")

     

       249
       249
       -
       			}

     

       250
       250
       -
       			ch <- queryResponse{Server: server, Error: err}

     

       251
       251
       -
       			return

     

       170
       170
       +
       	defer func() {

     

       171
       171
       +
       		select {

     

       172
       172
       +
       		case ch <- response:

     

       173
       173
       +
       		default:

     

       174
       174
       +
       			slog.Debug("queryServer response channel blocked or closed", "server", server)

     

       252
       175
        
       		}

     

       253
       253
       -
       

     

       254
       254
       -
       		var response magna.Message

     

       255
       255
       -
       		err = response.Decode(p)

     

       256
       256
       -
       		ch <- queryResponse{MSG: response, Server: server, Error: err}

     

       257
       176
        
       	}()

     

       258
       177
        
       

     

       259
       178
        
       	select {

     

       260
       179
        
       	case <-ctx.Done():

     

       261
       261
       -
       		ch <- queryResponse{Server: server, Error: ctx.Err()}

     

       262
       262
       -
       	case <-done:

     

       263
       263
       -
       	// goroutine finished with no cancellation

     

       264
       264
       -
       	case <-time.After(timeout):

     

       265
       265
       -
       		ch <- queryResponse{Server: server, Error: fmt.Errorf("timeout")}

     

       180
       180
       +
       		response.Error = ctx.Err()

     

       181
       181
       +
       		return

     

       182
       182
       +
       	default:

     

       266
       183
        
       	}

     

       267
       267
       -
       }

     

       268
       184
        
       

     

       269
       269
       -
       func convertCachedToMagna(cached []CachedResourceRecord, now time.Time) []magna.ResourceRecord {

     

       270
       270
       -
       	result := make([]magna.ResourceRecord, 0, len(cached))

     

       271
       271
       -
       	for _, record := range cached {

     

       272
       272
       -
       		if now.Before(record.ExpireAt) {

     

       273
       273
       -
       			rr := record.Record

     

       274
       274
       -
       			rr.TTL = uint32(record.ExpireAt.Sub(now).Seconds())

     

       275
       275
       -
       			result = append(result, rr)

     

       276
       276
       -
       		}

     

       185
       185
       +
       	dialer := net.Dialer{Timeout: 2 * time.Second}

     

       186
       186
       +
       	conn, err := dialer.DialContext(ctx, "udp", fmt.Sprintf("%s:53", server))

     

       187
       187
       +
       	if err != nil {

     

       188
       188
       +
       		response.Error = fmt.Errorf("dial error: %w", err)

     

       189
       189
       +
       		return

     

       277
       190
        
       	}

     

       278
       278
       -
       	return result

     

       279
       279
       -
       }

     

       191
       191
       +
       	defer conn.Close()

     

       280
       192
        
       

     

       281
       281
       -
       func getCurrentRequest(ctx context.Context) *Request {

     

       282
       282
       -
       	if ctx == nil {

     

       283
       283
       -
       		return nil

     

       193
       193
       +
       	deadline, ok := ctx.Deadline()

     

       194
       194
       +
       	if !ok {

     

       195
       195
       +
       		deadline = time.Now().Add(5 * time.Second)

     

       284
       196
        
       	}

     

       197
       197
       +
       	conn.SetDeadline(deadline)

     

       285
       198
        
       

     

       286
       286
       -
       	if r, ok := ctx.Value(contextKey("request")).(*Request); ok {

     

       287
       287
       -
       		return r

     

       199
       199
       +
       	query := magna.Message{

     

       200
       200
       +
       		Header: magna.Header{

     

       201
       201
       +
       			ID:      uint16(rand.Int() % 65535),

     

       202
       202
       +
       			QR:      false,

     

       203
       203
       +
       			OPCode:  magna.QUERY,

     

       204
       204
       +
       			AA:      false,

     

       205
       205
       +
       			TC:      false,

     

       206
       206
       +
       			RD:      false,

     

       207
       207
       +
       			RA:      false,

     

       208
       208
       +
       			Z:       0,

     

       209
       209
       +
       			RCode:   magna.NOERROR,

     

       210
       210
       +
       			QDCount: 1,

     

       211
       211
       +
       			ARCount: 0,

     

       212
       212
       +
       			NSCount: 0,

     

       213
       213
       +
       			ANCount: 0,

     

       214
       214
       +
       		},

     

       215
       215
       +
       		Question: []magna.Question{question},

     

       288
       216
        
       	}

     

       289
       217
        
       

     

       290
       290
       -
       	return nil

     

       291
       291
       -
       }

     

       218
       218
       +
       	msgBytes, err := query.Encode()

     

       219
       219
       +
       	if err != nil {

     

       220
       220
       +
       		response.Error = fmt.Errorf("encode error: %w", err)

     

       221
       221
       +
       		return

     

       222
       222
       +
       	}

     

       292
       223
        
       

     

       293
       293
       -
       func extractZone(msg *magna.Message) string {

     

       294
       294
       -
       	for _, auth := range msg.Authority {

     

       295
       295
       -
       		if auth.RType == magna.SOAType {

     

       296
       296
       -
       			return auth.Name

     

       224
       224
       +
       	_, err = conn.Write(msgBytes)

     

       225
       225
       +
       	if err != nil {

     

       226
       226
       +
       		if ctx.Err() != nil {

     

       227
       227
       +
       			response.Error = ctx.Err()

     

       228
       228
       +
       		} else {

     

       229
       229
       +
       			response.Error = fmt.Errorf("write error: %w", err)

     

       297
       230
        
       		}

     

       231
       231
       +
       		return

     

       232
       232
       +
       	}

     

       298
       233
        
       

     

       299
       299
       -
       		if auth.RType == magna.NSType {

     

       300
       300
       -
       			return auth.Name

     

       234
       234
       +
       	p := make([]byte, 512)

     

       235
       235
       +
       	n, err := conn.Read(p)

     

       236
       236
       +
       	if err != nil {

     

       237
       237
       +
       		if ctx.Err() != nil {

     

       238
       238
       +
       			response.Error = ctx.Err()

     

       239
       239
       +
       		} else if netErr, ok := err.(net.Error); ok && netErr.Timeout() {

     

       240
       240
       +
       			response.Error = fmt.Errorf("read timeout: %w", err)

     

       241
       241
       +
       		} else {

     

       242
       242
       +
       			response.Error = fmt.Errorf("read error: %w", err)

     

       301
       243
        
       		}

     

       244
       244
       +
       		return

     

       302
       245
        
       	}

     

       303
       246
        
       

     

       304
       304
       -
       	if len(msg.Question) > 0 {

     

       305
       305
       -
       		return msg.Question[0].QName

     

       247
       247
       +
       	// TODO: retry request with TCP

     

       248
       248
       +
       	if n >= 512 {

     

       249
       249
       +
       		response.Error = fmt.Errorf("response possibly truncated (size %d >= 512)", n)

     

       250
       250
       +
       		return

     

       251
       251
       +
       	}

     

       252
       252
       +
       

     

       253
       253
       +
       	var decodedMsg magna.Message

     

       254
       254
       +
       	err = decodedMsg.Decode(p[:n])

     

       255
       255
       +
       	if err != nil {

     

       256
       256
       +
       		response.Error = fmt.Errorf("decode error: %w", err)

     

       257
       257
       +
       		return

     

       306
       258
        
       	}

     

       307
       259
        
       

     

       308
       308
       -
       	return ""

     

       260
       260
       +
       	if decodedMsg.Header.ID != query.Header.ID {

     

       261
       261
       +
       		response.Error = fmt.Errorf("response ID mismatch (got %d, expected %d)", decodedMsg.Header.ID, query.Header.ID)

     

       262
       262
       +
       		return

     

       263
       263
       +
       	}

     

       264
       264
       +
       

     

       265
       265
       +
       	response.MSG = decodedMsg

     

       266
       266
       +
       	response.Error = nil

     

       309
       267
        
       }

+14 -5

pkg/dns/server.go

···

       64
       64
        
       }

     

       65
       65
        
       

     

       66
       66
        
       func (w *udpResponseWriter) WriteMsg(msg *magna.Message) {

     

       67
       67
       -
       	ans := msg.Encode()

     

       67
       67
       +
       	ans, err := msg.Encode()

     

       68
       68
       +
       	if err != nil {

     

       69
       69
       +
       		w.logger.Warn("err encoding msg", "error", err)

     

       70
       70
       +
       		return

     

       71
       71
       +
       	}

     

       72
       72
       +
       

     

       68
       73
        
       	if len(ans) > 512 {

     

       69
       74
        
       		ans[3] |= 1 << 6 // set the truncated bit

     

       70
       75
        
       	}

     

       71
       76
        
       

     

       72
       72
       -
       	err := w.udpConn.SetWriteDeadline(time.Now().Add(w.writeTimeout))

     

       77
       77
       +
       	err = w.udpConn.SetWriteDeadline(time.Now().Add(w.writeTimeout))

     

       73
       78
        
       	if err != nil {

     

       74
       79
        
       		w.logger.Warn("error setting write deadline for UDP", "error", err)

     

       75
       80
        
       	}

     
···

       87
       92
        
       }

     

       88
       93
        
       

     

       89
       94
        
       func (w *tcpResponseWriter) WriteMsg(msg *magna.Message) {

     

       90
       90
       -
       	ans := msg.Encode()

     

       95
       95
       +
       	ans, err := msg.Encode()

     

       96
       96
       +
       	if err != nil {

     

       97
       97
       +
       		w.logger.Warn("err encoding msg", "error", err)

     

       98
       98
       +
       		return

     

       99
       99
       +
       	}

     

       91
       100
        
       

     

       92
       92
       -
       	err := w.tcpConn.SetWriteDeadline(time.Now().Add(w.writeTiemout))

     

       101
       101
       +
       	err = w.tcpConn.SetWriteDeadline(time.Now().Add(w.writeTiemout))

     

       93
       102
        
       	if err != nil {

     

       94
       103
        
       		w.logger.Warn("error setting write deadline for TCP", "error", err)

     

       95
       104
        
       	}

     
···

       114
       123
        
       	ReadTimeout  time.Duration

     

       115
       124
        
       	WriteTimeout time.Duration

     

       116
       125
        
       	Logger       *slog.Logger

     

       117
       117
       -
       	Cache        *MemoryCache

     

       126
       126
       +
       	Cache        Cache

     

       118
       127
        
       }

     

       119
       128
        
       

     

       120
       129
        
       func (srv *Server) ListenAndServe() error {

+7 -7

pkg/metrics/clickhouse.go

···

       93
       93
        
       func (m *ClickHouseMetrics) RecordCacheStats(stats *dns.CacheStats) {

     

       94
       94
        
       	m.RecordCacheMetrics(CacheMetric{

     

       95
       95
        
       		Timestamp:    time.Now(),

     

       96
       96
       -
       		TotalQueries: stats.TotalQueries,

     

       97
       97
       -
       		CacheHits:    stats.CacheHits,

     

       98
       98
       -
       		CacheMisses:  stats.CacheMisses,

     

       99
       99
       -
       		NegativeHits: stats.NegativeHits,

     

       100
       100
       -
       		PositiveHits: stats.PositiveHits,

     

       101
       101
       -
       		Evictions:    stats.Evictions,

     

       102
       102
       -
       		Size:         stats.Size,

     

       96
       96
       +
       		TotalQueries: stats.TotalQueries.Load(),

     

       97
       97
       +
       		CacheHits:    stats.CacheHits.Load(),

     

       98
       98
       +
       		CacheMisses:  stats.CacheMisses.Load(),

     

       99
       99
       +
       		NegativeHits: stats.NegativeHits.Load(),

     

       100
       100
       +
       		PositiveHits: stats.PositiveHits.Load(),

     

       101
       101
       +
       		Evictions:    stats.Evictions.Load(),

     

       102
       102
       +
       		Size:         stats.Size.Load(),

     

       103
       103
        
       	})

     

       104
       104
        
       }

     

       105
       105