From 0fdb57971e30249219ee54fe08b17c752dafdd66 Mon Sep 17 00:00:00 2001 From: Moritz Marquardt Date: Tue, 16 Apr 2024 22:22:09 +0200 Subject: [PATCH] Use hashicorp's LRU cache for DNS & certificates DNS caching is also limited to 30 seconds now instead of 5 minutes --- go.mod | 1 + go.sum | 2 ++ server/certificates/certificates.go | 23 +++++++++++------- server/dns/dns.go | 31 ++++++++++++++++++------- server/handler/handler.go | 6 ++--- server/handler/handler_custom_domain.go | 8 +++---- server/handler/handler_test.go | 4 +--- server/startup.go | 10 ++------ 8 files changed, 49 insertions(+), 36 deletions(-) diff --git a/go.mod b/go.mod index 985c4b1..4217aa3 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,7 @@ require ( github.com/creasty/defaults v1.7.0 github.com/go-acme/lego/v4 v4.5.3 github.com/go-sql-driver/mysql v1.6.0 + github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/joho/godotenv v1.4.0 github.com/lib/pq v1.10.7 github.com/mattn/go-sqlite3 v1.14.16 diff --git a/go.sum b/go.sum index 8befa87..e742c16 100644 --- a/go.sum +++ b/go.sum @@ -332,6 +332,8 @@ github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= +github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= diff --git a/server/certificates/certificates.go b/server/certificates/certificates.go index 763c6cf..b5ea1fd 100644 --- a/server/certificates/certificates.go +++ b/server/certificates/certificates.go @@ -6,12 +6,11 @@ import ( "crypto/x509" "errors" "fmt" + "github.com/hashicorp/golang-lru/v2" "strconv" "strings" "time" - "github.com/OrlovEvgeny/go-mcache" - "github.com/go-acme/lego/v4/certcrypto" "github.com/go-acme/lego/v4/certificate" "github.com/go-acme/lego/v4/challenge/tlsalpn01" @@ -28,12 +27,14 @@ import ( var ErrUserRateLimitExceeded = errors.New("rate limit exceeded: 10 certificates per user per 24 hours") +var keyCache *lru.Cache[string, tls.Certificate] + // TLSConfig returns the configuration for generating, serving and cleaning up Let's Encrypt certificates. func TLSConfig(mainDomainSuffix string, giteaClient *gitea.Client, acmeClient *AcmeClient, firstDefaultBranch string, - keyCache *mcache.CacheDriver, challengeCache cache.ICache, dnsLookupCache *mcache.CacheDriver, canonicalDomainCache cache.ICache, + challengeCache cache.ICache, canonicalDomainCache cache.ICache, certDB database.CertDB, noDNS01 bool, rawDomain string, @@ -88,7 +89,7 @@ func TLSConfig(mainDomainSuffix string, } } else { var targetRepo, targetBranch string - targetOwner, targetRepo, targetBranch = dnsutils.GetTargetFromDNS(domain, mainDomainSuffix, firstDefaultBranch, dnsLookupCache) + targetOwner, targetRepo, targetBranch = dnsutils.GetTargetFromDNS(domain, mainDomainSuffix, firstDefaultBranch) if targetOwner == "" { // DNS not set up, return main certificate to redirect to the docs domain = mainDomainSuffix @@ -107,9 +108,17 @@ func TLSConfig(mainDomainSuffix string, } } + if keyCache == nil { + var err error + keyCache, err = lru.New[string, tls.Certificate](4096) + if err != nil { + panic(err) // This should only happen if 4096 < 0 at the time of writing, which should be reason enough to panic. + } + } + if tlsCertificate, ok := keyCache.Get(domain); ok { // we can use an existing certificate object - return tlsCertificate.(*tls.Certificate), nil + return &tlsCertificate, nil } var tlsCertificate *tls.Certificate @@ -134,9 +143,7 @@ func TLSConfig(mainDomainSuffix string, } } - if err := keyCache.Set(domain, tlsCertificate, 15*time.Minute); err != nil { - return nil, err - } + keyCache.Add(domain, *tlsCertificate) return tlsCertificate, nil }, NextProtos: []string{ diff --git a/server/dns/dns.go b/server/dns/dns.go index 22be42c..09d5e35 100644 --- a/server/dns/dns.go +++ b/server/dns/dns.go @@ -1,26 +1,38 @@ package dns import ( + "github.com/hashicorp/golang-lru/v2" "net" "strings" "time" - - "github.com/OrlovEvgeny/go-mcache" ) -// lookupCacheTimeout specifies the timeout for the DNS lookup cache. -var lookupCacheTimeout = 15 * time.Minute +type lookupCacheEntry struct { + cachedName string + timestamp time.Time +} + +var lookupCacheValidity = 30 * time.Second + +var lookupCache *lru.Cache[string, lookupCacheEntry] var defaultPagesRepo = "pages" // GetTargetFromDNS searches for CNAME or TXT entries on the request domain ending with MainDomainSuffix. // If everything is fine, it returns the target data. -func GetTargetFromDNS(domain, mainDomainSuffix, firstDefaultBranch string, dnsLookupCache *mcache.CacheDriver) (targetOwner, targetRepo, targetBranch string) { +func GetTargetFromDNS(domain, mainDomainSuffix, firstDefaultBranch string) (targetOwner, targetRepo, targetBranch string) { // Get CNAME or TXT var cname string var err error - if cachedName, ok := dnsLookupCache.Get(domain); ok { - cname = cachedName.(string) + + if lookupCache == nil { + lookupCache, err = lru.New[string, lookupCacheEntry](4096) + if err != nil { + panic(err) // This should only happen if 4096 < 0 at the time of writing, which should be reason enough to panic. + } + } + if entry, ok := lookupCache.Get(domain); ok && time.Now().Before(entry.timestamp.Add(lookupCacheValidity)) { + cname = entry.cachedName } else { cname, err = net.LookupCNAME(domain) cname = strings.TrimSuffix(cname, ".") @@ -38,7 +50,10 @@ func GetTargetFromDNS(domain, mainDomainSuffix, firstDefaultBranch string, dnsLo } } } - _ = dnsLookupCache.Set(domain, cname, lookupCacheTimeout) + _ = lookupCache.Add(domain, lookupCacheEntry{ + cname, + time.Now(), + }) } if cname == "" { return diff --git a/server/handler/handler.go b/server/handler/handler.go index 63a98ba..c038c2d 100644 --- a/server/handler/handler.go +++ b/server/handler/handler.go @@ -4,8 +4,6 @@ import ( "net/http" "strings" - "github.com/OrlovEvgeny/go-mcache" - "github.com/rs/zerolog/log" "codeberg.org/codeberg/pages/config" @@ -25,7 +23,7 @@ const ( func Handler( cfg config.ServerConfig, giteaClient *gitea.Client, - dnsLookupCache *mcache.CacheDriver, canonicalDomainCache, redirectsCache cache.ICache, + canonicalDomainCache, redirectsCache cache.ICache, ) http.HandlerFunc { return func(w http.ResponseWriter, req *http.Request) { log.Debug().Msg("\n----------------------------------------------------------") @@ -110,7 +108,7 @@ func Handler( trimmedHost, pathElements, cfg.PagesBranches[0], - dnsLookupCache, canonicalDomainCache, redirectsCache) + canonicalDomainCache, redirectsCache) } } } diff --git a/server/handler/handler_custom_domain.go b/server/handler/handler_custom_domain.go index ef6e11e..852001a 100644 --- a/server/handler/handler_custom_domain.go +++ b/server/handler/handler_custom_domain.go @@ -5,8 +5,6 @@ import ( "path" "strings" - "github.com/OrlovEvgeny/go-mcache" - "codeberg.org/codeberg/pages/html" "codeberg.org/codeberg/pages/server/cache" "codeberg.org/codeberg/pages/server/context" @@ -21,10 +19,10 @@ func handleCustomDomain(log zerolog.Logger, ctx *context.Context, giteaClient *g trimmedHost string, pathElements []string, firstDefaultBranch string, - dnsLookupCache *mcache.CacheDriver, canonicalDomainCache, redirectsCache cache.ICache, + canonicalDomainCache, redirectsCache cache.ICache, ) { // Serve pages from custom domains - targetOwner, targetRepo, targetBranch := dns.GetTargetFromDNS(trimmedHost, mainDomainSuffix, firstDefaultBranch, dnsLookupCache) + targetOwner, targetRepo, targetBranch := dns.GetTargetFromDNS(trimmedHost, mainDomainSuffix, firstDefaultBranch) if targetOwner == "" { html.ReturnErrorPage(ctx, "could not obtain repo owner from custom domain", @@ -55,7 +53,7 @@ func handleCustomDomain(log zerolog.Logger, ctx *context.Context, giteaClient *g return } else if canonicalDomain != trimmedHost { // only redirect if the target is also a codeberg page! - targetOwner, _, _ = dns.GetTargetFromDNS(strings.SplitN(canonicalDomain, "/", 2)[0], mainDomainSuffix, firstDefaultBranch, dnsLookupCache) + targetOwner, _, _ = dns.GetTargetFromDNS(strings.SplitN(canonicalDomain, "/", 2)[0], mainDomainSuffix, firstDefaultBranch) if targetOwner != "" { ctx.Redirect("https://"+canonicalDomain+"/"+targetOpt.TargetPath, http.StatusTemporaryRedirect) return diff --git a/server/handler/handler_test.go b/server/handler/handler_test.go index 5c3aa50..fe82da1 100644 --- a/server/handler/handler_test.go +++ b/server/handler/handler_test.go @@ -6,8 +6,6 @@ import ( "testing" "time" - "github.com/OrlovEvgeny/go-mcache" - "codeberg.org/codeberg/pages/config" "codeberg.org/codeberg/pages/server/cache" "codeberg.org/codeberg/pages/server/gitea" @@ -31,7 +29,7 @@ func TestHandlerPerformance(t *testing.T) { AllowedCorsDomains: []string{"raw.codeberg.org", "fonts.codeberg.org", "design.codeberg.org"}, PagesBranches: []string{"pages"}, } - testHandler := Handler(serverCfg, giteaClient, mcache.New(), cache.NewInMemoryCache(), cache.NewInMemoryCache()) + testHandler := Handler(serverCfg, giteaClient, cache.NewInMemoryCache(), cache.NewInMemoryCache()) testCase := func(uri string, status int) { t.Run(uri, func(t *testing.T) { diff --git a/server/startup.go b/server/startup.go index b10f93b..6c08da7 100644 --- a/server/startup.go +++ b/server/startup.go @@ -11,7 +11,6 @@ import ( "strings" "time" - "github.com/OrlovEvgeny/go-mcache" "github.com/redis/go-redis/v9" "github.com/rs/zerolog" @@ -73,11 +72,6 @@ func Serve(ctx *cli.Context) error { } defer closeFn() - // keyCache stores the parsed certificate objects (Redis is no advantage here) - keyCache := mcache.New() - // dnsLookupCache stores DNS lookups for custom domains (Redis is no advantage here) - dnsLookupCache := mcache.New() - var redisErr error = nil createCache := func(name string) cache.ICache { if cfg.Cache.RedisURL != "" { @@ -129,7 +123,7 @@ func Serve(ctx *cli.Context) error { giteaClient, acmeClient, cfg.Server.PagesBranches[0], - keyCache, challengeCache, dnsLookupCache, canonicalDomainCache, + challengeCache, canonicalDomainCache, certDB, cfg.ACME.NoDNS01, cfg.Server.RawDomain, @@ -155,7 +149,7 @@ func Serve(ctx *cli.Context) error { } // Create ssl handler based on settings - sslHandler := handler.Handler(cfg.Server, giteaClient, dnsLookupCache, canonicalDomainCache, redirectsCache) + sslHandler := handler.Handler(cfg.Server, giteaClient, canonicalDomainCache, redirectsCache) // Start the ssl listener log.Info().Msgf("Start SSL server using TCP listener on %s", listener.Addr())