comparing 6c036b7101fc498f6e352744617b2d68a2b28bf2 and main on seiso.moe/alky

+1 -1

Justfile

···

       18
       18
        
       build: format

     

       19
       19
        
         #!/usr/bin/env sh

     

       20
       20
        
         VERSION=$(just version)

     

       21
       21
       -
         go build -ldflags "-X code.kiri.systems/kiri/alky/pkg/metrics.version=$VERSION" .

     

       21
       21
       +
         go build -ldflags "-X tangled.sh/seiso.moe/alky/pkg/metrics.version=$VERSION" .

+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

+60

migrations/00002_modified_metrics.sql

···

       1
       1
       +
       -- +goose Up

     

       2
       2
       +
       ALTER TABLE alky_dns_queries

     

       3
       3
       +
           MODIFY COLUMN timestamp DateTime CODEC(Delta, ZSTD(1)),

     

       4
       4
       +
           MODIFY COLUMN instance_id String CODEC(ZSTD(1)),

     

       5
       5
       +
           MODIFY COLUMN query_name String CODEC(ZSTD(1)),

     

       6
       6
       +
           MODIFY COLUMN query_type LowCardinality(String) CODEC(ZSTD(1)),

     

       7
       7
       +
           MODIFY COLUMN query_class LowCardinality(String) CODEC(ZSTD(1)),

     

       8
       8
       +
           MODIFY COLUMN remote_addr String CODEC(ZSTD(1)),

     

       9
       9
       +
           MODIFY COLUMN response_code LowCardinality(String) CODEC(ZSTD(1)),

     

       10
       10
       +
           MODIFY COLUMN duration Int64 CODEC(T64, ZSTD(1)),

     

       11
       11
       +
           MODIFY COLUMN cache_hit Bool CODEC(ZSTD(1));

     

       12
       12
       +
       

     

       13
       13
       +
       ALTER TABLE alky_dns_queries MODIFY TTL timestamp + INTERVAL 30 DAY;

     

       14
       14
       +
       

     

       15
       15
       +
       ALTER TABLE alky_dns_cache_metrics 

     

       16
       16
       +
           DROP COLUMN IF EXISTS total_queries,

     

       17
       17
       +
           MODIFY COLUMN timestamp DateTime CODEC(Delta, ZSTD(1)),

     

       18
       18
       +
           MODIFY COLUMN instance_id String CODEC(ZSTD(1)),

     

       19
       19
       +
           MODIFY COLUMN cache_hits Int64 CODEC(T64, ZSTD(1)),

     

       20
       20
       +
           MODIFY COLUMN cache_misses Int64 CODEC(T64, ZSTD(1)),

     

       21
       21
       +
           MODIFY COLUMN negative_hits Int64 CODEC(T64, ZSTD(1)),

     

       22
       22
       +
           MODIFY COLUMN positive_hits Int64 CODEC(T64, ZSTD(1)),

     

       23
       23
       +
           MODIFY COLUMN evictions Int64 CODEC(T64, ZSTD(1)),

     

       24
       24
       +
           MODIFY COLUMN size Int64 CODEC(T64, ZSTD(1));

     

       25
       25
       +
       

     

       26
       26
       +
       ALTER TABLE alky_dns_cache_metrics 

     

       27
       27
       +
           ADD COLUMN IF NOT EXISTS expired_count Int64 CODEC(T64, ZSTD(1));

     

       28
       28
       +
       

     

       29
       29
       +
       ALTER TABLE alky_dns_cache_metrics MODIFY TTL timestamp + INTERVAL 30 DAY;

     

       30
       30
       +
       

     

       31
       31
       +
       -- +goose Down

     

       32
       32
       +
       ALTER TABLE alky_dns_queries

     

       33
       33
       +
           MODIFY COLUMN timestamp DateTime,

     

       34
       34
       +
           MODIFY COLUMN instance_id String,

     

       35
       35
       +
           MODIFY COLUMN query_name String,

     

       36
       36
       +
           MODIFY COLUMN query_type String,

     

       37
       37
       +
           MODIFY COLUMN query_class String,

     

       38
       38
       +
           MODIFY COLUMN remote_addr String,

     

       39
       39
       +
           MODIFY COLUMN response_code String,

     

       40
       40
       +
           MODIFY COLUMN duration Int64,

     

       41
       41
       +
           MODIFY COLUMN cache_hit Bool;

     

       42
       42
       +
       

     

       43
       43
       +
       ALTER TABLE alky_dns_queries MODIFY TTL timestamp + toIntervalDay(30);

     

       44
       44
       +
       

     

       45
       45
       +
       ALTER TABLE alky_dns_cache_metrics 

     

       46
       46
       +
           ADD COLUMN IF NOT EXISTS total_queries Int64 AFTER instance_id;

     

       47
       47
       +
       

     

       48
       48
       +
       ALTER TABLE alky_dns_cache_metrics 

     

       49
       49
       +
           MODIFY COLUMN timestamp DateTime,

     

       50
       50
       +
           MODIFY COLUMN instance_id String,

     

       51
       51
       +
           MODIFY COLUMN cache_hits Int64,

     

       52
       52
       +
           MODIFY COLUMN cache_misses Int64,

     

       53
       53
       +
           MODIFY COLUMN negative_hits Int64,

     

       54
       54
       +
           MODIFY COLUMN positive_hits Int64,

     

       55
       55
       +
           MODIFY COLUMN evictions Int64,

     

       56
       56
       +
           MODIFY COLUMN size Int;

     

       57
       57
       +
       

     

       58
       58
       +
       ALTER TABLE alky_dns_cache_metrics DROP COLUMN IF EXISTS expired_count;

     

       59
       59
       +
       

     

       60
       60
       +
       ALTER TABLE alky_dns_cache_metrics MODIFY TTL timestamp + toIntervalDay(30);

-388

pkg/dns/cache.go

···

       1
       1
       -
       package dns

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"container/list"

     

       5
       5
       -
       	"fmt"

     

       6
       6
       -
       	"log/slog"

     

       7
       7
       -
       	"strings"

     

       8
       8
       -
       	"sync"

     

       9
       9
       -
       	"sync/atomic"

     

       10
       10
       -
       	"time"

     

       11
       11
       -
       

     

       12
       12
       -
       	"tangled.sh/seiso.moe/magna"

     

       13
       13
       -
       )

     

       14
       14
       -
       

     

       15
       15
       -
       const (

     

       16
       16
       -
       	defaultNegativeTTL = 5 * time.Minute

     

       17
       17
       -
       	maxNegativeTTL     = 3 * time.Hour

     

       18
       18
       -
       )

     

       19
       19
       -
       

     

       20
       20
       -
       type CacheEntry struct {

     

       21
       21
       -
       	Key        string

     

       22
       22
       -
       	RCode      magna.RCode

     

       23
       23
       -
       	IsNegative bool

     

       24
       24
       -
       

     

       25
       25
       -
       	Answer     []magna.ResourceRecord

     

       26
       26
       -
       	Authority  []magna.ResourceRecord

     

       27
       27
       -
       	Additional []magna.ResourceRecord

     

       28
       28
       -
       

     

       29
       29
       -
       	CacheTime time.Time

     

       30
       30
       -
       	ExpireAt  time.Time

     

       31
       31
       -
       }

     

       32
       32
       -
       

     

       33
       33
       -
       type CacheStats struct {

     

       34
       34
       -
       	Hits         atomic.Int64

     

       35
       35
       -
       	Misses       atomic.Int64

     

       36
       36
       -
       	Evictions    atomic.Int64

     

       37
       37
       -
       	Expired      atomic.Int64

     

       38
       38
       -
       	Size         atomic.Int64

     

       39
       39
       -
       	NegativeHits atomic.Int64

     

       40
       40
       -
       	PositiveHits atomic.Int64

     

       41
       41
       -
       }

     

       42
       42
       -
       

     

       43
       43
       -
       type LRUCache struct {

     

       44
       44
       -
       	mu              sync.RWMutex

     

       45
       45
       -
       	maxSize         int

     

       46
       46
       -
       	cleanupInterval time.Duration

     

       47
       47
       -
       	lruList         *list.List

     

       48
       48
       -
       	cacheMap        map[string]*list.Element

     

       49
       49
       -
       	stats           CacheStats

     

       50
       50
       -
       	stopCleanup     chan struct{}

     

       51
       51
       -
       	logger          *slog.Logger

     

       52
       52
       -
       }

     

       53
       53
       -
       

     

       54
       54
       -
       type lruItem struct {

     

       55
       55
       -
       	key   string

     

       56
       56
       -
       	entry *CacheEntry

     

       57
       57
       -
       }

     

       58
       58
       -
       

     

       59
       59
       -
       type Cache interface {

     

       60
       60
       -
       	Get(key string) (*CacheEntry, bool)

     

       61
       61
       -
       	Set(key string, entry *CacheEntry)

     

       62
       62
       -
       	GetStats() CacheStats

     

       63
       63
       -
       	Stop()

     

       64
       64
       -
       }

     

       65
       65
       -
       

     

       66
       66
       -
       func NewLRUCache(maxSize int, cleanupInterval time.Duration, logger *slog.Logger) *LRUCache {

     

       67
       67
       -
       	if maxSize <= 0 {

     

       68
       68
       -
       		maxSize = 5000

     

       69
       69
       -
       	}

     

       70
       70
       -
       

     

       71
       71
       -
       	if cleanupInterval <= 0 {

     

       72
       72
       -
       		cleanupInterval = 5 * time.Minute

     

       73
       73
       -
       	}

     

       74
       74
       -
       

     

       75
       75
       -
       	cache := &LRUCache{

     

       76
       76
       -
       		maxSize:         maxSize,

     

       77
       77
       -
       		cleanupInterval: cleanupInterval,

     

       78
       78
       -
       		lruList:         list.New(),

     

       79
       79
       -
       		cacheMap:        make(map[string]*list.Element, maxSize),

     

       80
       80
       -
       		stopCleanup:     make(chan struct{}),

     

       81
       81
       -
       		logger:          logger.With("component", "cache"),

     

       82
       82
       -
       	}

     

       83
       83
       -
       

     

       84
       84
       -
       	cache.logger.Info("starting LRU cache", "max_size", maxSize, "cleanup_interval", cleanupInterval)

     

       85
       85
       -
       	go cache.periodicCleanup()

     

       86
       86
       -
       	return cache

     

       87
       87
       -
       }

     

       88
       88
       -
       

     

       89
       89
       -
       func GenerateCacheKey(q magna.Question) string {

     

       90
       90
       -
       	name := strings.ToLower(q.QName)

     

       91
       91
       -
       	if !strings.HasSuffix(name, ".") {

     

       92
       92
       -
       		name += "."

     

       93
       93
       -
       	}

     

       94
       94
       -
       	return fmt.Sprintf("%s:%s:%s", name, q.QType.String(), q.QClass.String())

     

       95
       95
       -
       }

     

       96
       96
       -
       

     

       97
       97
       -
       func (c *LRUCache) Get(key string) (*CacheEntry, bool) {

     

       98
       98
       -
       	c.mu.RLock()

     

       99
       99
       -
       	element, exists := c.cacheMap[key]

     

       100
       100
       -
       	c.mu.RUnlock()

     

       101
       101
       -
       

     

       102
       102
       -
       	if !exists {

     

       103
       103
       -
       		c.stats.Misses.Add(1)

     

       104
       104
       -
       		return nil, false

     

       105
       105
       -
       	}

     

       106
       106
       -
       

     

       107
       107
       -
       	c.mu.Lock()

     

       108
       108
       -
       	defer c.mu.Unlock()

     

       109
       109
       -
       

     

       110
       110
       -
       	element, exists = c.cacheMap[key]

     

       111
       111
       -
       	if !exists {

     

       112
       112
       -
       		c.stats.Misses.Add(1)

     

       113
       113
       -
       		return nil, false

     

       114
       114
       -
       	}

     

       115
       115
       -
       

     

       116
       116
       -
       	item := element.Value.(*lruItem)

     

       117
       117
       -
       	entry := item.entry

     

       118
       118
       -
       

     

       119
       119
       -
       	now := time.Now()

     

       120
       120
       -
       	if now.After(entry.ExpireAt) {

     

       121
       121
       -
       		c.stats.Misses.Add(1)

     

       122
       122
       -
       		c.stats.Expired.Add(1)

     

       123
       123
       -
       		c.removeItem(element)

     

       124
       124
       -
       		return nil, false

     

       125
       125
       -
       	}

     

       126
       126
       -
       

     

       127
       127
       -
       	c.stats.Hits.Add(1)

     

       128
       128
       -
       	if entry.IsNegative {

     

       129
       129
       -
       		c.stats.NegativeHits.Add(1)

     

       130
       130
       -
       	} else {

     

       131
       131
       -
       		c.stats.PositiveHits.Add(1)

     

       132
       132
       -
       	}

     

       133
       133
       -
       

     

       134
       134
       -
       	c.lruList.MoveToFront(element)

     

       135
       135
       -
       	respEntry := c.adjustTTLs(entry, now)

     

       136
       136
       -
       

     

       137
       137
       -
       	return respEntry, true

     

       138
       138
       -
       }

     

       139
       139
       -
       

     

       140
       140
       -
       func (c *LRUCache) adjustTTLs(original *CacheEntry, now time.Time) *CacheEntry {

     

       141
       141
       -
       	adjustedEntry := &CacheEntry{

     

       142
       142
       -
       		Key:        original.Key,

     

       143
       143
       -
       		RCode:      original.RCode,

     

       144
       144
       -
       		IsNegative: original.IsNegative,

     

       145
       145
       -
       		CacheTime:  original.CacheTime,

     

       146
       146
       -
       		ExpireAt:   original.ExpireAt,

     

       147
       147
       -
       		Answer:     make([]magna.ResourceRecord, len(original.Answer)),

     

       148
       148
       -
       		Authority:  make([]magna.ResourceRecord, len(original.Authority)),

     

       149
       149
       -
       		Additional: make([]magna.ResourceRecord, len(original.Additional)),

     

       150
       150
       -
       	}

     

       151
       151
       -
       

     

       152
       152
       -
       	remainingDuration := max(original.ExpireAt.Sub(now), 0)

     

       153
       153
       -
       	remainingTTL := uint32(remainingDuration.Seconds())

     

       154
       154
       -
       

     

       155
       155
       -
       	copyAndAdjust := func(dest *[]magna.ResourceRecord, src []magna.ResourceRecord) {

     

       156
       156
       -
       		for i, rr := range src {

     

       157
       157
       -
       			(*dest)[i] = rr

     

       158
       158
       -
       			rrExpireAt := original.CacheTime.Add(time.Duration(rr.TTL) * time.Second)

     

       159
       159
       -
       			rrRemainingDuration := max(rrExpireAt.Sub(now), 0)

     

       160
       160
       -
       			rrRemainingTTL := uint32(rrRemainingDuration.Seconds())

     

       161
       161
       -
       

     

       162
       162
       -
       			finalTTL := min(rrRemainingTTL, remainingTTL)

     

       163
       163
       -
       			(*dest)[i].TTL = finalTTL

     

       164
       164
       -
       		}

     

       165
       165
       -
       	}

     

       166
       166
       -
       

     

       167
       167
       -
       	copyAndAdjust(&adjustedEntry.Answer, original.Answer)

     

       168
       168
       -
       	copyAndAdjust(&adjustedEntry.Authority, original.Authority)

     

       169
       169
       -
       	copyAndAdjust(&adjustedEntry.Additional, original.Additional)

     

       170
       170
       -
       

     

       171
       171
       -
       	return adjustedEntry

     

       172
       172
       -
       }

     

       173
       173
       -
       

     

       174
       174
       -
       func (c *LRUCache) Set(key string, entry *CacheEntry) {

     

       175
       175
       -
       	c.logger.Info("setting key", "key", key)

     

       176
       176
       -
       	if entry == nil {

     

       177
       177
       -
       		c.logger.Warn("attempted to set nil entry in cache", "key", key)

     

       178
       178
       -
       		return

     

       179
       179
       -
       	}

     

       180
       180
       -
       

     

       181
       181
       -
       	if entry.ExpireAt.Before(time.Now().Add(1 * time.Second)) {

     

       182
       182
       -
       		return

     

       183
       183
       -
       	}

     

       184
       184
       -
       

     

       185
       185
       -
       	c.mu.Lock()

     

       186
       186
       -
       	defer c.mu.Unlock()

     

       187
       187
       -
       

     

       188
       188
       -
       	if element, exists := c.cacheMap[key]; exists {

     

       189
       189
       -
       		c.lruList.MoveToFront(element)

     

       190
       190
       -
       		element.Value.(*lruItem).entry = entry

     

       191
       191
       -
       		return

     

       192
       192
       -
       	}

     

       193
       193
       -
       

     

       194
       194
       -
       	newItem := &lruItem{

     

       195
       195
       -
       		key:   key,

     

       196
       196
       -
       		entry: entry,

     

       197
       197
       -
       	}

     

       198
       198
       -
       	element := c.lruList.PushFront(newItem)

     

       199
       199
       -
       	c.cacheMap[key] = element

     

       200
       200
       -
       	c.stats.Size.Store(int64(c.lruList.Len()))

     

       201
       201
       -
       

     

       202
       202
       -
       	for int64(c.lruList.Len()) > int64(c.maxSize) {

     

       203
       203
       -
       		c.evictLRU()

     

       204
       204
       -
       	}

     

       205
       205
       -
       }

     

       206
       206
       -
       

     

       207
       207
       -
       func (c *LRUCache) evictLRU() {

     

       208
       208
       -
       	element := c.lruList.Back()

     

       209
       209
       -
       	if element != nil {

     

       210
       210
       -
       		c.removeItem(element)

     

       211
       211
       -
       		c.stats.Evictions.Add(1)

     

       212
       212
       -
       	}

     

       213
       213
       -
       }

     

       214
       214
       -
       

     

       215
       215
       -
       func (c *LRUCache) removeItem(element *list.Element) {

     

       216
       216
       -
       	item := element.Value.(*lruItem)

     

       217
       217
       -
       	delete(c.cacheMap, item.key)

     

       218
       218
       -
       	c.lruList.Remove(element)

     

       219
       219
       -
       	c.stats.Size.Store(int64(c.lruList.Len()))

     

       220
       220
       -
       }

     

       221
       221
       -
       

     

       222
       222
       -
       func (c *LRUCache) GetStats() CacheStats {

     

       223
       223
       -
       	statsSnapshot := CacheStats{}

     

       224
       224
       -
       	statsSnapshot.Hits.Store(c.stats.Hits.Load())

     

       225
       225
       -
       	statsSnapshot.Misses.Store(c.stats.Misses.Load())

     

       226
       226
       -
       	statsSnapshot.Evictions.Store(c.stats.Evictions.Load())

     

       227
       227
       -
       	statsSnapshot.Expired.Store(c.stats.Expired.Load())

     

       228
       228
       -
       	statsSnapshot.Size.Store(c.stats.Size.Load())

     

       229
       229
       -
       	statsSnapshot.NegativeHits.Store(c.stats.NegativeHits.Load())

     

       230
       230
       -
       	statsSnapshot.PositiveHits.Store(c.stats.PositiveHits.Load())

     

       231
       231
       -
       	return statsSnapshot

     

       232
       232
       -
       }

     

       233
       233
       -
       

     

       234
       234
       -
       func (c *LRUCache) periodicCleanup() {

     

       235
       235
       -
       	ticker := time.NewTicker(c.cleanupInterval)

     

       236
       236
       -
       	defer ticker.Stop()

     

       237
       237
       -
       

     

       238
       238
       -
       	for {

     

       239
       239
       -
       		select {

     

       240
       240
       -
       		case <-ticker.C:

     

       241
       241
       -
       			c.cleanupExpired()

     

       242
       242
       -
       		case <-c.stopCleanup:

     

       243
       243
       -
       			return

     

       244
       244
       -
       		}

     

       245
       245
       -
       	}

     

       246
       246
       -
       }

     

       247
       247
       -
       

     

       248
       248
       -
       func (c *LRUCache) cleanupExpired() {

     

       249
       249
       -
       	c.mu.Lock()

     

       250
       250
       -
       	defer c.mu.Unlock()

     

       251
       251
       -
       

     

       252
       252
       -
       	now := time.Now()

     

       253
       253
       -
       	cleanedCount := 0

     

       254
       254
       -
       	element := c.lruList.Back()

     

       255
       255
       -
       

     

       256
       256
       -
       	for element != nil {

     

       257
       257
       -
       		item := element.Value.(*lruItem)

     

       258
       258
       -
       		prevElement := element.Prev()

     

       259
       259
       -
       

     

       260
       260
       -
       		if now.After(item.entry.ExpireAt) {

     

       261
       261
       -
       			c.removeItem(element)

     

       262
       262
       -
       			c.stats.Expired.Add(1)

     

       263
       263
       -
       			cleanedCount++

     

       264
       264
       -
       		}

     

       265
       265
       -
       

     

       266
       266
       -
       		element = prevElement

     

       267
       267
       -
       	}

     

       268
       268
       -
       	if cleanedCount > 0 {

     

       269
       269
       -
       		c.logger.Info("Cache cleanup finished", "items_removed", cleanedCount, "current_size", c.stats.Size.Load())

     

       270
       270
       -
       	}

     

       271
       271
       -
       }

     

       272
       272
       -
       

     

       273
       273
       -
       func (c *LRUCache) Stop() {

     

       274
       274
       -
       	close(c.stopCleanup)

     

       275
       275
       -
       }

     

       276
       276
       -
       

     

       277
       277
       -
       func CreateCacheEntry(query magna.Question, response *magna.Message) *CacheEntry {

     

       278
       278
       -
       	now := time.Now()

     

       279
       279
       -
       	entry := &CacheEntry{

     

       280
       280
       -
       		Key:        GenerateCacheKey(query),

     

       281
       281
       -
       		RCode:      response.Header.RCode,

     

       282
       282
       -
       		Answer:     response.Answer,

     

       283
       283
       -
       		Authority:  response.Authority,

     

       284
       284
       -
       		Additional: response.Additional,

     

       285
       285
       -
       		CacheTime:  now,

     

       286
       286
       -
       	}

     

       287
       287
       -
       

     

       288
       288
       -
       	var minTTL time.Duration = -1

     

       289
       289
       -
       

     

       290
       290
       -
       	if response.Header.RCode == magna.NXDOMAIN || (response.Header.RCode == magna.NOERROR && len(response.Answer) == 0) {

     

       291
       291
       -
       		entry.IsNegative = true

     

       292
       292
       -
       		negativeTTL := defaultNegativeTTL

     

       293
       293
       -
       

     

       294
       294
       -
       		for _, rr := range response.Authority {

     

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

     

       296
       296
       -
       				soa, ok := rr.RData.(*magna.SOA)

     

       297
       297
       -
       				if ok && soa != nil {

     

       298
       298
       -
       					ttl := time.Duration(rr.TTL) * time.Second

     

       299
       299
       -
       					minimum := time.Duration(soa.Minimum) * time.Second

     

       300
       300
       -
       

     

       301
       301
       -
       					if minimum > maxNegativeTTL {

     

       302
       302
       -
       						negativeTTL = ttl

     

       303
       303
       -
       					} else {

     

       304
       304
       -
       						negativeTTL = minDuration(ttl, minimum)

     

       305
       305
       -
       					}

     

       306
       306
       -
       

     

       307
       307
       -
       				} else {

     

       308
       308
       -
       					negativeTTL = time.Duration(rr.TTL) * time.Second

     

       309
       309
       -
       				}

     

       310
       310
       -
       				break

     

       311
       311
       -
       			}

     

       312
       312
       -
       		}

     

       313
       313
       -
       

     

       314
       314
       -
       		if negativeTTL < 0 {

     

       315
       315
       -
       			negativeTTL = defaultNegativeTTL

     

       316
       316
       -
       		}

     

       317
       317
       -
       		if negativeTTL > maxNegativeTTL {

     

       318
       318
       -
       			negativeTTL = maxNegativeTTL

     

       319
       319
       -
       		}

     

       320
       320
       -
       

     

       321
       321
       -
       		minTTL = negativeTTL

     

       322
       322
       -
       	} else if response.Header.RCode == magna.NOERROR {

     

       323
       323
       -
       		entry.IsNegative = false

     

       324
       324
       -
       

     

       325
       325
       -
       		if len(response.Answer) > 0 {

     

       326
       326
       -
       			minTTL = time.Duration(response.Answer[0].TTL) * time.Second

     

       327
       327
       -
       

     

       328
       328
       -
       			for _, rr := range response.Answer[1:] {

     

       329
       329
       -
       				currentTTL := time.Duration(rr.TTL) * time.Second

     

       330
       330
       -
       				if currentTTL < minTTL {

     

       331
       331
       -
       					minTTL = currentTTL

     

       332
       332
       -
       				}

     

       333
       333
       -
       			}

     

       334
       334
       -
       		} else {

     

       335
       335
       -
       			entry.IsNegative = true

     

       336
       336
       -
       			negativeTTL := defaultNegativeTTL

     

       337
       337
       -
       			for _, rr := range response.Authority {

     

       338
       338
       -
       				if rr.RType == magna.SOAType {

     

       339
       339
       -
       					soa, ok := rr.RData.(*magna.SOA)

     

       340
       340
       -
       					if ok && soa != nil {

     

       341
       341
       -
       						ttl := time.Duration(rr.TTL) * time.Second

     

       342
       342
       -
       						minimum := time.Duration(soa.Minimum) * time.Second

     

       343
       343
       -
       						if minimum > maxNegativeTTL {

     

       344
       344
       -
       							negativeTTL = ttl

     

       345
       345
       -
       						} else {

     

       346
       346
       -
       							negativeTTL = minDuration(ttl, minimum)

     

       347
       347
       -
       						}

     

       348
       348
       -
       

     

       349
       349
       -
       					} else {

     

       350
       350
       -
       						negativeTTL = time.Duration(rr.TTL) * time.Second

     

       351
       351
       -
       					}

     

       352
       352
       -
       					break

     

       353
       353
       -
       				}

     

       354
       354
       -
       			}

     

       355
       355
       -
       			if negativeTTL < 0 {

     

       356
       356
       -
       				negativeTTL = defaultNegativeTTL

     

       357
       357
       -
       			}

     

       358
       358
       -
       			if negativeTTL > maxNegativeTTL {

     

       359
       359
       -
       				negativeTTL = maxNegativeTTL

     

       360
       360
       -
       			}

     

       361
       361
       -
       			minTTL = negativeTTL

     

       362
       362
       -
       		}

     

       363
       363
       -
       

     

       364
       364
       -
       	} else {

     

       365
       365
       -
       		return nil

     

       366
       366
       -
       	}

     

       367
       367
       -
       

     

       368
       368
       -
       	if minTTL < 0 {

     

       369
       369
       -
       		return nil

     

       370
       370
       -
       	}

     

       371
       371
       -
       

     

       372
       372
       -
       	entry.ExpireAt = now.Add(minTTL)

     

       373
       373
       -
       	return entry

     

       374
       374
       -
       }

     

       375
       375
       -
       

     

       376
       376
       -
       func minDuration(a, b time.Duration) time.Duration {

     

       377
       377
       -
       	if a < b {

     

       378
       378
       -
       		return a

     

       379
       379
       -
       	}

     

       380
       380
       -
       	return b

     

       381
       381
       -
       }

     

       382
       382
       -
       

     

       383
       383
       -
       func min(a, b uint32) uint32 {

     

       384
       384
       -
       	if a < b {

     

       385
       385
       -
       		return a

     

       386
       386
       -
       	}

     

       387
       387
       -
       	return b

     

       388
       388
       -
       }

-43

main.go

···

       8
       8
        
       	"os/signal"

     

       9
       9
        
       	"strings"

     

       10
       10
        
       	"syscall"

     

       11
       11
       -
       	"time"

     

       12
       11
        
       

     

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

     

       14
       13
        
       	"tangled.sh/seiso.moe/alky/pkg/dns"

     
···

       49
       48
        
       	}

     

       50
       49
        
       	logger.Info("Root hints loaded", "count", len(rootServers), "path", cfg.Server.RootHintsFile)

     

       51
       50
        
       

     

       52
       52
       -
       	cache := dns.NewLRUCache(cfg.Cache.MaxItems, cfg.Cache.CleanupInterval.Duration, logger.With("component", "cache"))

     

       53
       53
       -
       	defer cache.Stop()

     

       54
       54
       -
       	logger.Info("DNS cache initialized")

     

       55
       55
       -
       

     

       56
       51
        
       	queryHandler := &dns.QueryHandler{

     

       57
       52
        
       		RootServers: rootServers,

     

       58
       53
        
       		Timeout:     cfg.Advanced.QueryTimeout.Duration,

     

       59
       59
       -
       		Cache:       cache,

     

       60
       54
        
       		Logger:      logger.With("component", "resolver"),

     

       61
       55
        
       	}

     

       62
       56
        
       

     

       63
       63
       -
       	go monitorCacheMetrics(cache, metricsClient, logger.With("component", "cache-monitor"))

     

       64
       64
       -
       

     

       65
       57
        
       	var currentHandler dns.Handler = queryHandler

     

       66
       58
        
       

     

       67
       59
        
       	if cfg.Ratelimit.Rate > 0 {

     
···

       94
       86
        
       		sig := <-sigChan

     

       95
       87
        
       		logger.Info("Received signal, shutting down gracefully...", "signal", sig.String())

     

       96
       88
        
       

     

       97
       97
       -
       		logger.Info("Stopping cache...")

     

       98
       98
       -
       		cache.Stop()

     

       99
       99
       -
       

     

       100
       89
        
       		logger.Info("Closing metrics client...")

     

       101
       90
        
       		metricsClient.Close()

     

       102
       91
        
       

     
···

       121
       110
        
       	}

     

       122
       111
        
       }

     

       123
       112
        
       

     

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

     

       125
       125
       -
       	interval := 1 * time.Minute

     

       126
       126
       -
       	logger.Info("Starting cache metrics monitoring", "interval", interval)

     

       127
       127
       -
       	ticker := time.NewTicker(interval)

     

       128
       128
       -
       	defer ticker.Stop()

     

       129
       129
       -
       

     

       130
       130
       -
       	for {

     

       131
       131
       -
       		select {

     

       132
       132
       -
       		case <-ticker.C:

     

       133
       133
       -
       			stats := cache.GetStats()

     

       134
       134
       -
       			logger.Debug("Recording cache metrics",

     

       135
       135
       -
       				"hits", stats.Hits.Load(),

     

       136
       136
       -
       				"misses", stats.Misses.Load(),

     

       137
       137
       -
       				"size", stats.Size.Load(),

     

       138
       138
       -
       				"evictions", stats.Evictions.Load(),

     

       139
       139
       -
       				"expired", stats.Expired.Load(),

     

       140
       140
       -
       				"pos_hits", stats.PositiveHits.Load(),

     

       141
       141
       -
       				"neg_hits", stats.NegativeHits.Load(),

     

       142
       142
       -
       			)

     

       143
       143
       -
       			metricsClient.RecordCacheStats(metrics.CacheMetric{

     

       144
       144
       -
       				Timestamp:    time.Now(),

     

       145
       145
       -
       				CacheHits:    stats.Hits.Load(),

     

       146
       146
       -
       				CacheMisses:  stats.Misses.Load(),

     

       147
       147
       -
       				NegativeHits: stats.NegativeHits.Load(),

     

       148
       148
       -
       				PositiveHits: stats.PositiveHits.Load(),

     

       149
       149
       -
       				Evictions:    stats.Evictions.Load() + stats.Expired.Load(),

     

       150
       150
       -
       				Size:         stats.Size.Load(),

     

       151
       151
       -
       			})

     

       152
       152
       -
       		}

     

       153
       153
       -
       	}

     

       154
       154
       -
       }

     

       155
       155
       -
       

     

       156
       113
        
       func setupLogger(cfg *config.Config) *slog.Logger {

     

       157
       114
        
       	var logLevel slog.Level

     

       158
       115
        
       	switch strings.ToLower(cfg.Logging.Level) {

pkg/rootservers/loader.go

···

       16
       16
        
       	}

     

       17
       17
        
       

     

       18
       18
        
       	for _, line := range bytes.Split(data, []byte{'\n'}) {

     

       19
       19
       +
       		if len(line) == 0 {

     

       20
       20
       +
       			continue

     

       21
       21
       +
       		}

     

       22
       22
       +
       

     

       19
       23
        
       		// skip comments

     

       20
       24
        
       		if line[0] == ';' {

     

       21
       25
        
       			continue

-1

pkg/config/config.go

···

       4
       4
        
       	"fmt"

     

       5
       5
        
       	"os"

     

       6
       6
        
       	"slices"

     

       7
       7
       -
       	"strings"

     

       8
       7
        
       	"time"

     

       9
       8
        
       

     

       10
       9
        
       	"github.com/BurntSushi/toml"

+1 -1

go.mod

···

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

     

       10
       10
        
       	github.com/stretchr/testify v1.10.0

     

       11
       11
        
       	golang.org/x/time v0.11.0

     

       12
       12
       -
       	tangled.sh/seiso.moe/magna v0.0.1

     

       12
       12
       +
       	tangled.sh/seiso.moe/magna v0.0.2

     

       13
       13
        
       )

     

       14
       14
        
       

     

       15
       15
        
       require (

go.sum

···

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

     

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

     

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

     

       120
       120
       +
       tangled.sh/seiso.moe/magna v0.0.2 h1:4VGPlqv/7tVyTtsR4Qkk8ZNypuNbmaeLogWzkpbHrRs=

     

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

+7 -7

pkg/dns/ratelimit.go

···

       17
       17
        
       }

     

       18
       18
        
       

     

       19
       19
        
       type rateLimiter struct {

     

       20
       20
       -
       	config RateLimitConfig

     

       21
       21
       -
       	limiters map[string]*ipRateLimiterEntry

     

       22
       22
       -
       	mu     sync.RWMutex

     

       20
       20
       +
       	config      RateLimitConfig

     

       21
       21
       +
       	limiters    map[string]*ipRateLimiterEntry

     

       22
       22
       +
       	mu          sync.RWMutex

     

       23
       23
        
       	stopCleanup chan struct{}

     

       24
       24
        
       }

     

       25
       25
        
       

     
···

       39
       39
        
       

     

       40
       40
        
       func newRateLimiter(config RateLimitConfig) *rateLimiter {

     

       41
       41
        
       	rl := &rateLimiter{

     

       42
       42
       -
       		config: config,

     

       43
       43
       -
       		limiters: make(map[string]*ipRateLimiterEntry),

     

       42
       42
       +
       		config:      config,

     

       43
       43
       +
       		limiters:    make(map[string]*ipRateLimiterEntry),

     

       44
       44
        
       		stopCleanup: make(chan struct{}),

     

       45
       45
        
       	}

     

       46
       46
        
       

     
···

       49
       49
        
       }

     

       50
       50
        
       

     

       51
       51
        
       func (rl *rateLimiter) allow(ip string) bool {

     

       52
       52
       -
       	rl.mu.Lock() 

     

       52
       52
       +
       	rl.mu.Lock()

     

       53
       53
        
       	defer rl.mu.Unlock()

     

       54
       54
        
       

     

       55
       55
        
       	entry, exists := rl.limiters[ip]

     
···

       58
       58
        
       	if !exists {

     

       59
       59
        
       		limiter := rate.NewLimiter(rate.Limit(rl.config.Rate), rl.config.Burst)

     

       60
       60
        
       		entry := &ipRateLimiterEntry{

     

       61
       61
       -
       			limiter: limiter,

     

       61
       61
       +
       			limiter:    limiter,

     

       62
       62
        
       			lastAccess: now,

     

       63
       63
        
       		}

     

       64
       64

+65 -11

pkg/dns/resolve.go

···

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

     

       12
       12
        
       )

     

       13
       13
        
       

     

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

     

       14
       14
       +
       var (

     

       15
       15
       +
       	errNXDOMAIN            = fmt.Errorf("alky: domain does not exist")

     

       16
       16
       +
       	errOnlySOA             = fmt.Errorf("alky: only an soa was reffered")

     

       17
       17
       +
       	errNoServers           = fmt.Errorf("alky: no servers responded")

     

       18
       18
       +
       	errMaxDepth            = fmt.Errorf("alky: maximum recursion depth exceeded")

     

       19
       19
       +
       	errNonMatchingID       = fmt.Errorf("alky: response ID mismatch")

     

       20
       20
       +
       	errNonMatchingQuestion = fmt.Errorf("alky: response question mismatch")

     

       21
       21
       +
       	errQueryTimeout        = fmt.Errorf("alky: query timeout")

     

       22
       22
       +
       )

     

       15
       23
        
       

     

       16
       24
        
       const (

     

       17
       25
        
       	depthKey contextKey = "dns_recursion_depth"

     
···

       20
       28
        
       func withIncrementedDepth(ctx context.Context, maxDepth int) (context.Context, error) {

     

       21
       29
        
       	depth := getDepth(ctx)

     

       22
       30
        
       	if depth >= maxDepth {

     

       23
       23
       -
       		return nil, fmt.Errorf("maximum recursion depth (%d) exceeded", maxDepth)

     

       31
       31
       +
       		return nil, errMaxDepth

     

       24
       32
        
       	}

     

       25
       33
        
       	return context.WithValue(ctx, depthKey, depth+1), nil

     

       26
       34
        
       }

     
···

       65
       73
        
       		msg.Header.NSCount = uint16(len(records))

     

       66
       74
        
       		msg.Header.ANCount = 0

     

       67
       75
        
       		msg.Answer = nil

     

       76
       76
       +
       	} else if err == errOnlySOA {

     

       77
       77
       +
       		msg = msg.SetRCode(magna.NOERROR)

     

       78
       78
       +
       		msg.Authority = records

     

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

     

       80
       80
       +
       		msg.Header.ANCount = 0

     

       81
       81
       +
       		msg.Header.ARCount = 0

     

       82
       82
       +
       		msg.Answer = nil

     

       68
       83
        
       	} else if err != nil {

     

       84
       84
       +
       		h.Logger.Warn("error", "error", err)

     

       69
       85
        
       		msg = msg.SetRCode(magna.SERVFAIL)

     

       70
       86
        
       	} else {

     

       71
       87
        
       		msg.Answer = records

     
···

       88
       104
        
       	for _, s := range servers {

     

       89
       105
        
       		msg, err := queryServer(ctx, question, s, h.Timeout)

     

       90
       106
        
       		if err != nil {

     

       91
       91
       -
       			h.Logger.Warn("unable to resolve question", "server", s)

     

       107
       107
       +
       			h.Logger.Warn("unable to resolve question", "server", s, "error", err)

     

       92
       108
        
       			continue

     

       93
       109
        
       		}

     

       94
       110
        
       

     

       111
       111
       +
       		if msg.Header.RCode == magna.NXDOMAIN {

     

       112
       112
       +
       			_, authority := ExtractSOA(msg)

     

       113
       113
       +
       			return authority, errNXDOMAIN

     

       114
       114
       +
       		}

     

       115
       115
       +
       

     

       95
       116
        
       		if ok, answers := ExtractAnswer(question, msg); ok {

     

       96
       117
        
       			if msg.Answer[0].RType == magna.CNAMEType {

     

       97
       118
        
       				cnameQuestion := magna.Question{QName: msg.Answer[0].RData.String(), QType: question.QType, QClass: question.QClass}

     
···

       112
       133
        
       		if ok, answers := h.HandleReferral(ctx, question, msg); ok {

     

       113
       134
        
       			return h.resolveQuestion(ctx, question, answers)

     

       114
       135
        
       		}

     

       136
       136
       +
       

     

       137
       137
       +
       		if ok, answers := ExtractSOA(msg); ok {

     

       138
       138
       +
       			return answers, errOnlySOA

     

       139
       139
       +
       		}

     

       115
       140
        
       	}

     

       116
       141
        
       

     

       117
       117
       -
       	return []magna.ResourceRecord{}, nil

     

       142
       142
       +
       	return []magna.ResourceRecord{}, errNoServers

     

       118
       143
        
       }

     

       119
       144
        
       

     

       120
       145
        
       func queryServer(ctx context.Context, question magna.Question, server string, timeout time.Duration) (magna.Message, error) {

     

       146
       146
       +
       	ctx, cancel := context.WithTimeout(ctx, timeout)

     

       147
       147
       +
       	defer cancel()

     

       148
       148
       +
       

     

       121
       149
        
       	var d net.Dialer

     

       122
       150
        
       	conn, err := d.DialContext(ctx, "udp", fmt.Sprintf("%s:53", server))

     

       123
       151
        
       	if err != nil {

     
···

       125
       153
        
       	}

     

       126
       154
        
       	defer conn.Close()

     

       127
       155
        
       

     

       128
       128
       -
       	go func() {

     

       129
       129
       -
       			<-ctx.Done()

     

       130
       130
       -
       			conn.Close()

     

       131
       131
       -
       	}()

     

       132
       132
       -
       

     

       133
       156
        
       	conn.SetDeadline(time.Now().Add(timeout))

     

       134
       157
        
       

     

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

     

       158
       158
       +
       	query := magna.CreateRequest(magna.QUERY, false)

     

       136
       159
        
       	query = query.AddQuestion(question)

     

       137
       160
        
       	msg, err := query.Encode()

     

       138
       161
        
       	if err != nil {

     
···

       155
       178
        
       	}

     

       156
       179
        
       

     

       157
       180
        
       	var response magna.Message

     

       158
       158
       -
       	err = response.Decode(p)

     

       181
       181
       +
       	if err := response.Decode(p); err != nil {

     

       182
       182
       +
       		return magna.Message{}, err

     

       183
       183
       +
       	}

     

       184
       184
       +
       

     

       185
       185
       +
       	if err := validateResponse(*query, response, question); err != nil {

     

       186
       186
       +
       		return magna.Message{}, err

     

       187
       187
       +
       	}

     

       159
       188
        
       	return response, err

     

       160
       189
        
       }

     

       161
       190
        
       

     

       191
       191
       +
       func validateResponse(query magna.Message, response magna.Message, question magna.Question) error {

     

       192
       192
       +
       	if response.Header.ID != query.Header.ID {

     

       193
       193
       +
       		return errNonMatchingID

     

       194
       194
       +
       	}

     

       195
       195
       +
       	if len(response.Question) < 1 || response.Question[0] != question {

     

       196
       196
       +
       		return errNonMatchingQuestion

     

       197
       197
       +
       	}

     

       198
       198
       +
       	return nil

     

       199
       199
       +
       }

     

       200
       200
       +
       

     

       162
       201
        
       func ExtractAnswer(q magna.Question, r magna.Message) (bool, []magna.ResourceRecord) {

     

       163
       202
        
       	answers := make([]magna.ResourceRecord, 0, r.Header.ANCount)

     

       164
       203
        
       	for _, a := range r.Answer {

     
···

       174
       213
        
       	return true, answers

     

       175
       214
        
       }

     

       176
       215
        
       

     

       216
       216
       +
       func ExtractSOA(r magna.Message) (bool, []magna.ResourceRecord) {

     

       217
       217
       +
       	answers := make([]magna.ResourceRecord, 0, r.Header.NSCount)

     

       218
       218
       +
       	for _, a := range r.Authority {

     

       219
       219
       +
       		if a.RType == magna.SOAType {

     

       220
       220
       +
       			answers = append(answers, a)

     

       221
       221
       +
       		}

     

       222
       222
       +
       	}

     

       223
       223
       +
       

     

       224
       224
       +
       	if len(answers) <= 0 {

     

       225
       225
       +
       		return false, []magna.ResourceRecord{}

     

       226
       226
       +
       	}

     

       227
       227
       +
       

     

       228
       228
       +
       	return true, answers

     

       229
       229
       +
       }

     

       230
       230
       +
       

     

       177
       231
        
       func HandleGlueRecords(q magna.Question, r magna.Message) (bool, []string) {

     

       178
       232
        
       	answers := make([]string, 0, r.Header.ARCount)

     

       179
       233
        
       	for _, a := range r.Authority {

Compare changes