From c161a9d35cdb4fb944a1546f040e654431494473 Mon Sep 17 00:00:00 2001
From: Matthew Brown <matthew@bargrove.com>
Date: Fri, 2 Jun 2023 12:30:57 +0100
Subject: [PATCH] Use State Store Instead of File for Cert Cache

Fixes Custom IPN State Store Not Used #8254

Signed-off-by: Matthew Brown <matthew@bargrove.com>
---
 ipn/ipnlocal/cert.go | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/ipn/ipnlocal/cert.go b/ipn/ipnlocal/cert.go
index ef19a6571..b7afcedfc 100644
--- a/ipn/ipnlocal/cert.go
+++ b/ipn/ipnlocal/cert.go
@@ -34,11 +34,8 @@ import (
 	"golang.org/x/exp/slices"
 	"tailscale.com/atomicfile"
 	"tailscale.com/envknob"
-	"tailscale.com/hostinfo"
 	"tailscale.com/ipn"
 	"tailscale.com/ipn/ipnstate"
-	"tailscale.com/ipn/store"
-	"tailscale.com/ipn/store/mem"
 	"tailscale.com/types/logger"
 	"tailscale.com/version"
 	"tailscale.com/version/distro"
@@ -154,22 +151,9 @@ type certStore interface {
 var errCertExpired = errors.New("cert expired")
 
 func (b *LocalBackend) getCertStore() (certStore, error) {
-	switch b.store.(type) {
-	case *store.FileStore:
-	case *mem.Store:
-	default:
-		if hostinfo.GetEnvType() == hostinfo.Kubernetes {
-			// We're running in Kubernetes with a custom StateStore,
-			// use that instead of the cert directory.
-			// TODO(maisem): expand this to other environments?
-			return certStateStore{StateStore: b.store}, nil
-		}
-	}
-	dir, err := b.certDir()
-	if err != nil {
-		return nil, err
-	}
-	return certFileStore{dir: dir}, nil
+	return certStateStore{
+		StateStore: b.sys.StateStore.Get(),
+	}, nil
 }
 
 // certFileStore implements certStore by storing the cert & key files in the named directory.