commit 0baaadbafb9ece540ea9010d8ce327e688372246 · seiso.moe/alky

+4

Justfile

···

       1
       1
        
       init:

     

       2
       2
       +
         docker-compose up -d

     

       3
       3
       +
         goose up

     

       4
       4
       +
       

     

       5
       5
       +
       status:

     

       2
       6
        
         goose status

     

       3
       7
        
       

     

       4
       8
        
       format:

+7

docs/alky.toml

···

       47
       47
        
       # This uses time.ParseDuration semantics

     

       48
       48
        
       retention_period = "720h"

     

       49
       49
        
       

     

       50
       50
       +
       [cache]

     

       51
       51
       +
       # The maximum number of items to store in the cache.

     

       52
       52
       +
       max_items = 5000

     

       53
       53
       +
       

     

       54
       54
       +
       # How often the cache will evict items.

     

       55
       55
       +
       cleanup_interval = "5m"

     

       56
       56
       +
       

     

       50
       57
        
       [advanced]

     

       51
       58
        
       # Timeout (in milliseconds) for outgoing queries before being cancelled.

     

       52
       59
        
       query_timeout = 100

+1 -1

main.go

···

       40
       40
        
       		log.Fatal(err)

     

       41
       41
        
       	}

     

       42
       42
        
       

     

       43
       43
       -
       	cache := dns.NewMemoryCache(5000, 5*time.Minute)

     

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

     

       44
       44
        
       

     

       45
       45
        
       	handler := &dns.QueryHandler{

     

       46
       46
        
       		RootServers: rootServers,

+14

pkg/config/config.go

···

       36
       36
        
       	QueryTimeout int `toml:"query_timeout"`

     

       37
       37
        
       }

     

       38
       38
        
       

     

       39
       39
       +
       type CacheConfig struct {

     

       40
       40
       +
       	MaxItems        int      `toml:"max_items"`

     

       41
       41
       +
       	CleanupInterval duration `toml:"cleanup_interval"`

     

       42
       42
       +
       }

     

       43
       43
       +
       

     

       39
       44
        
       type Config struct {

     

       40
       45
        
       	Server    ServerConfig    `toml:"server"`

     

       41
       46
        
       	Logging   LoggingConfig   `toml:"logging"`

     

       42
       47
        
       	Ratelimit RatelimitConfig `toml:"ratelimit"`

     

       43
       48
        
       	Metrics   MetricsConfig   `toml:"metrics"`

     

       49
       49
       +
       	Cache     CacheConfig     `toml:"cache"`

     

       44
       50
        
       	Advanced  AdvancedConfig  `toml:"advanced"`

     

       45
       51
        
       }

     

       46
       52
        
       

     
···

       90
       96
        
       

     

       91
       97
        
       	if cfg.Metrics.RetentionPeriod.Duration == 0 {

     

       92
       98
        
       		cfg.Metrics.RetentionPeriod.Duration = 30 * 24 * time.Hour

     

       99
       99
       +
       	}

     

       100
       100
       +
       

     

       101
       101
       +
       	if cfg.Cache.MaxItems == 0 {

     

       102
       102
       +
       		cfg.Cache.MaxItems = 5000

     

       103
       103
       +
       	}

     

       104
       104
       +
       

     

       105
       105
       +
       	if cfg.Cache.CleanupInterval.Duration == 0 {

     

       106
       106
       +
       		cfg.Cache.CleanupInterval.Duration = 5 * time.Minute

     

       93
       107
        
       	}

     

       94
       108
        
       

     

       95
       109
        
       	if cfg.Advanced.QueryTimeout == 0 {

+3 -42

pkg/dns/cache.go

···

       1
       1
        
       package dns

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"log"

     

       5
       4
        
       	"strings"

     

       6
       5
        
       	"sync"

     

       7
       6
        
       	"time"

     
···

       25
       24
        
       	ExpireAt    time.Time

     

       26
       25
        
       	CreateTime  time.Time

     

       27
       26
        
       	IsNegative  bool

     

       28
       28
       -
       	Bailiwick   string

     

       29
       27
        
       }

     

       30
       28
        
       

     

       31
       29
        
       type CachedResourceRecord struct {

     
···

       49
       47
        
       	NegativeHits int64

     

       50
       48
        
       	PositiveHits int64

     

       51
       49
        
       	Evictions    int64

     

       52
       52
       -
       	Size         int

     

       50
       50
       +
       	Size         int64

     

       53
       51
        
       }

     

       54
       52
        
       

     

       55
       53
        
       type Cache interface {

     

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

     

       57
       55
        
       	Set(key string, entry *CacheEntry)

     

       58
       58
       -
       	Clear()

     

       59
       56
        
       	GetStats() *CacheStats

     

       60
       57
        
       }

     

       61
       58
        
       

     
···

       75
       72
        
       	c.mu.RUnlock()

     

       76
       73
        
       

     

       77
       74
        
       	c.stats.TotalQueries++

     

       78
       78
       -
       

     

       79
       79
       -
       	log.Println("looking for: ", key)

     

       80
       80
       -
       	for k := range c.entries {

     

       81
       81
       -
       		log.Printf("\t%s\n", k)

     

       82
       82
       -
       	}

     

       83
       83
       -
       

     

       84
       84
       -
       	log.Println(c.entries[key])

     

       85
       75
        
       

     

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

     

       87
       77
        
       	if !exists {

     

       88
       88
       -
       		log.Println("cache miss")

     

       89
       78
        
       		c.stats.CacheMisses++

     

       90
       79
        
       		return nil, false

     

       91
       80
        
       	}

     

       92
       81
        
       

     

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

     

       94
       83
        
       		c.stats.CacheMisses++

     

       95
       95
       -
       		log.Println("cache expire")

     

       96
       84
        
       		return nil, false

     

       97
       85
        
       	}

     

       98
       86
        
       

     
···

       115
       103
        
       	}

     

       116
       104
        
       

     

       117
       105
        
       	c.entries[key] = entry

     

       118
       118
       -
       	c.stats.Size = len(c.entries)

     

       119
       119
       -
       }

     

       120
       120
       -
       

     

       121
       121
       -
       func (c *MemoryCache) Clear() {

     

       122
       122
       -
       	c.mu.Lock()

     

       123
       123
       -
       	defer c.mu.Unlock()

     

       124
       124
       -
       

     

       125
       125
       -
       	c.entries = make(map[string]*CacheEntry)

     

       126
       126
       -
       	c.stats = CacheStats{}

     

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

     

       127
       107
        
       }

     

       128
       108
        
       

     

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

     
···

       173
       153
        
       		}

     

       174
       154
        
       	}

     

       175
       155
        
       

     

       176
       176
       -
       	c.stats.Size = len(c.entries)

     

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

     

       177
       157
        
       }

     

       178
       158
        
       

     

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

     
···

       195
       175
        
       	entry := &CacheEntry{

     

       196
       176
        
       		CreateTime: now,

     

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

     

       198
       198
       -
       		Bailiwick:  zone,

     

       199
       178
        
       	}

     

       200
       179
        
       

     

       201
       180
        
       	if entry.IsNegative {

     
···

       281
       260
        
       

     

       282
       261
        
       	return BailiwickOutside

     

       283
       262
        
       }

     

       284
       284
       -
       

     

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

     

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

     

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

     

       288
       288
       -
       			return auth.Name

     

       289
       289
       -
       		}

     

       290
       290
       -
       

     

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

     

       292
       292
       -
       			return auth.Name

     

       293
       293
       -
       		}

     

       294
       294
       -
       	}

     

       295
       295
       -
       

     

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

     

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

     

       298
       298
       -
       	}

     

       299
       299
       -
       

     

       300
       300
       -
       	return ""

     

       301
       301
       -
       }

+20 -8

pkg/dns/resolve.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
        
       	"fmt"

     

       6
       6
       -
       	"log"

     

       7
       6
        
       	"log/slog"

     

       8
       7
        
       	"net"

     

       9
       8
        
       	"time"

     
···

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

     

       65
       64
        
       

     

       66
       65
        
       	if h.Cache != nil {

     

       67
       67
       -
       		log.Println("cache is set")

     

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

     

       69
       69
       -
       			log.Println("womp womp here here", entry, hit)

     

       70
       70
       -
       			log.Println("request context: ", getCurrentRequest(ctx))

     

       71
       67
        
       			now := time.Now()

     

       72
       68
        
       

     

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

     
···

       283
       279
        
       }

     

       284
       280
        
       

     

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

     

       286
       286
       -
       	log.Println(ctx)

     

       287
       282
        
       	if ctx == nil {

     

       288
       288
       -
       		log.Println(">>>>")

     

       289
       283
        
       		return nil

     

       290
       284
        
       	}

     

       285
       285
       +
       

     

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

     

       292
       292
       -
       		log.Println("<<<<")

     

       293
       287
        
       		return r

     

       294
       288
        
       	}

     

       295
       295
       -
       	log.Println("====")

     

       289
       289
       +
       

     

       296
       290
        
       	return nil

     

       297
       291
        
       }

     

       292
       292
       +
       

     

       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

     

       297
       297
       +
       		}

     

       298
       298
       +
       

     

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

     

       300
       300
       +
       			return auth.Name

     

       301
       301
       +
       		}

     

       302
       302
       +
       	}

     

       303
       303
       +
       

     

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

     

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

     

       306
       306
       +
       	}

     

       307
       307
       +
       

     

       308
       308
       +
       	return ""

     

       309
       309
       +
       }

+1 -4

pkg/dns/server.go

···

       5
       5
        
       	"encoding/binary"

     

       6
       6
        
       	"fmt"

     

       7
       7
        
       	"io"

     

       8
       8
       -
       	"log"

     

       9
       8
        
       	"log/slog"

     

       10
       9
        
       	"net"

     

       11
       10
        
       	"sync"

     
···

       21
       20
        
       )

     

       22
       21
        
       

     

       23
       22
        
       func setCacheHit(ctx context.Context) context.Context {

     

       24
       24
       -
       	log.Println("setting to true")

     

       25
       23
        
       	return context.WithValue(ctx, cacheHitKey, true)

     

       26
       24
        
       }

     

       27
       25
        
       

     

       28
       26
        
       func setCacheMiss(ctx context.Context) context.Context {

     

       29
       29
       -
       	log.Println("setting to false")

     

       30
       27
        
       	return context.WithValue(ctx, cacheHitKey, false)

     

       31
       28
        
       }

     

       32
       29
        
       

     
···

       263
       260
        
       		RemoteAddr: remoteAddr,

     

       264
       261
        
       	}

     

       265
       262
        
       

     

       266
       266
       -
         r.Context = context.WithValue(context.Background(), contextKey("request"), r)

     

       263
       263
       +
       	r.Context = context.WithValue(context.Background(), contextKey("request"), r)

     

       267
       264
        
       

     

       268
       265
        
       	srv.Handler.ServeDNS(w, r)

     

       269
       266
        
       }

+13 -5

pkg/metrics/clickhouse.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"database/sql"

     

       5
       5
        
       	"fmt"

     

       6
       6
       -
       	"log"

     

       7
       6
        
       	"log/slog"

     

       8
       7
        
       	"sync"

     

       9
       8
        
       	"time"

     
···

       42
       41
        
       	CacheHits    int64

     

       43
       42
        
       	CacheMisses  int64

     

       44
       43
        
       	NegativeHits int64

     

       44
       44
       +
       	PositiveHits int64

     

       45
       45
       +
       	Evictions    int64

     

       46
       46
       +
       	Size         int64

     

       45
       47
        
       }

     

       46
       48
        
       

     

       47
       49
        
       func NewClickHouseMetrics(config *config.MetricsConfig, logger *slog.Logger) (*ClickHouseMetrics, error) {

     
···

       95
       97
        
       		CacheHits:    stats.CacheHits,

     

       96
       98
        
       		CacheMisses:  stats.CacheMisses,

     

       97
       99
        
       		NegativeHits: stats.NegativeHits,

     

       100
       100
       +
       		PositiveHits: stats.PositiveHits,

     

       101
       101
       +
       		Evictions:    stats.Evictions,

     

       102
       102
       +
       		Size:         stats.Size,

     

       98
       103
        
       	})

     

       99
       104
        
       }

     

       100
       105
        
       

     
···

       167
       172
        
       	defer stmt.Close()

     

       168
       173
        
       

     

       169
       174
        
       	for _, metric := range m.queryBuffer {

     

       170
       170
       -
       		log.Println(metric)

     

       171
       175
        
       		_, err := stmt.Exec(

     

       172
       176
        
       			metric.Timestamp,

     

       173
       177
        
       			metric.InstanceID,

     
···

       196
       200
        
       

     

       197
       201
        
       	stmt, err := tx.Prepare(`

     

       198
       202
        
       		INSERT INTO alky_dns_cache_metrics (

     

       199
       199
       -
       			timestamp, total_queries, cache_hits, cache_misses,

     

       200
       200
       -
       			negative_hits 

     

       201
       201
       -
       		) VALUES (?, ?, ?, ?, ?)

     

       203
       203
       +
       			timestamp, instance_id, total_queries, cache_hits, cache_misses,

     

       204
       204
       +
       			negative_hits, positive_hits, evictions, size

     

       205
       205
       +
       		) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)

     

       202
       206
        
       	`)

     

       203
       207
        
       	if err != nil {

     

       204
       208
        
       		return err

     
···

       208
       212
        
       	for _, metric := range m.cacheBuffer {

     

       209
       213
        
       		_, err := stmt.Exec(

     

       210
       214
        
       			metric.Timestamp,

     

       215
       215
       +
       			GetInstanceID(),

     

       211
       216
        
       			metric.TotalQueries,

     

       212
       217
        
       			metric.CacheHits,

     

       213
       218
        
       			metric.CacheMisses,

     

       214
       219
        
       			metric.NegativeHits,

     

       220
       220
       +
       			metric.PositiveHits,

     

       221
       221
       +
       			metric.Evictions,

     

       222
       222
       +
       			metric.Size,

     

       215
       223
        
       		)

     

       216
       224
        
       		if err != nil {

     

       217
       225
        
       			return err

+9 -9

pkg/metrics/middleware.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
        
       	"fmt"

     

       6
       6
       -
       	"log"

     

       7
       6
        
       	"os"

     

       8
       7
        
       	"time"

     

       9
       8
        
       

     
···

       11
       10
        
       )

     

       12
       11
        
       

     

       13
       12
        
       var (

     

       14
       14
       -
       	hostID  string

     

       15
       15
       -
       	version string

     

       13
       13
       +
       	instanceID string

     

       14
       14
       +
       	version    string

     

       16
       15
        
       )

     

       17
       16
        
       

     

       18
       17
        
       func init() {

     
···

       23
       22
        
       	}

     

       24
       23
        
       

     

       25
       24
        
       	if version != "" {

     

       26
       26
       -
       		hostID = fmt.Sprintf("%s-%s", hostname, version)

     

       25
       25
       +
       		instanceID = fmt.Sprintf("%s-%s", hostname, version)

     

       27
       26
        
       	} else {

     

       28
       28
       -
       		hostID = hostname

     

       27
       27
       +
       		instanceID = hostname

     

       29
       28
        
       	}

     

       30
       29
        
       }

     

       31
       30
        
       

     
···

       41
       40
        
       			duration := time.Since(start)

     

       42
       41
        
       

     

       43
       42
        
       			question := r.Message.Question[0]

     

       44
       44
       -
       			log.Println(hostID)

     

       45
       45
       -
       			log.Println(dns.GetCacheHit(r.Context))

     

       46
       46
       -
       

     

       47
       43
        
       			metrics.RecordQuery(QueryMetric{

     

       48
       44
        
       				Timestamp:    time.Now(),

     

       49
       49
       -
       				InstanceID:   hostID,

     

       45
       45
       +
       				InstanceID:   instanceID,

     

       50
       46
        
       				QueryName:    question.QName,

     

       51
       47
        
       				QueryType:    question.QType.String(),

     

       52
       48
        
       				QueryClass:   question.QClass.String(),

     
···

       58
       54
        
       		})

     

       59
       55
        
       	}

     

       60
       56
        
       }

     

       57
       57
       +
       

     

       58
       58
       +
       func GetInstanceID() string {

     

       59
       59
       +
       	return instanceID

     

       60
       60
       +
       }