o/devicemgmtstate,o/assertstate: address import cycle

Author: st3v3nmw

overlord/assertstate/assertstate.go

@@ -34,6 +34,7 @@ import (
 	"github.com/snapcore/snapd/httputil"
 	"github.com/snapcore/snapd/logger"
 	"github.com/snapcore/snapd/overlord/confdbstate"
+	"github.com/snapcore/snapd/overlord/devicemgmtstate"
 	"github.com/snapcore/snapd/overlord/snapstate"
 	"github.com/snapcore/snapd/overlord/state"
 	"github.com/snapcore/snapd/release"
@@ -406,6 +407,11 @@ func delayedCrossMgrInit() {
 	// wire confdbstate helpers that look up confdb-schema assertions
 	confdbstate.AssertstateFetchConfdbSchemaAssertion = FetchConfdbSchemaAssertion
 	confdbstate.AssertstateConfdbSchema = ConfdbSchema
+	// wire devicemgmtstate helpers that look up the assertion database and
+	// account-key assertions
+	devicemgmtstate.AssertstateDB = DB
+	devicemgmtstate.AssertstateAccountKey = AccountKey
+	devicemgmtstate.AssertstateFetchAccountKey = FetchAccountKey
 }
 
 // AutoRefreshAssertions tries to refresh all assertions

overlord/devicemgmtstate/devicemgmtmgr.go

@@ -36,7 +36,6 @@ import (
 	"github.com/snapcore/snapd/asserts"
 	"github.com/snapcore/snapd/features"
 	"github.com/snapcore/snapd/logger"
-	"github.com/snapcore/snapd/overlord/assertstate"
 	"github.com/snapcore/snapd/overlord/configstate/config"
 	"github.com/snapcore/snapd/overlord/snapstate"
 	"github.com/snapcore/snapd/overlord/state"
@@ -55,15 +54,22 @@ const (
 )
 
 var (
-	timeNow                    = time.Now
-	assertstateFetchAccountKey = assertstate.FetchAccountKey
+	timeNow = time.Now
 
 	maxSequences                  = 256
 	maxBlockedMessagesPerSequence = 8
 
 	awaitSubsystemRetryInterval = 30 * time.Second
 
 	deviceMgmtExchangeChangeKind = swfeats.RegisterChangeKind("device-management-exchange")
+
+	// AssertstateDB, AssertstateAccountKey and AssertstateFetchAccountKey are
+	// wired to the corresponding assertstate helpers by
+	// assertstate.delayedCrossMgrInit. They exist to break the import cycle
+	// assertstate -> confdbstate -> devicemgmtstate -> assertstate.
+	AssertstateDB              func(s *state.State) asserts.RODatabase
+	AssertstateAccountKey      func(st *state.State, signKeyID string) (*asserts.AccountKey, error)
+	AssertstateFetchAccountKey func(st *state.State, userID int, signKeyID string) error
 )
 
 // deviceBackend provides device identity and response message signing.
@@ -660,7 +666,7 @@ func (m *DeviceMgmtManager) doValidateMessage(t *state.Task, _ *tomb.Tomb) error
 		}
 	}
 
-	err = assertstate.DB(m.state).Check(a)
+	err = AssertstateDB(m.state).Check(a)
 	if err != nil {
 		rejectMsg(fmt.Sprintf("cannot verify message signature: %v", err))
 		return nil
@@ -720,15 +726,15 @@ func (m *DeviceMgmtManager) doValidateMessage(t *state.Task, _ *tomb.Tomb) error
 // ensureAccountKey fetches the account-key assertion for signKeyID from the
 // store if it is not already in the local database.
 func (m *DeviceMgmtManager) ensureAccountKey(signKeyID string) (fetched bool, err error) {
-	_, err = assertstate.AccountKey(m.state, signKeyID)
+	_, err = AssertstateAccountKey(m.state, signKeyID)
 	if err == nil {
 		return false, nil
 	}
 	if !errors.Is(err, &asserts.NotFoundError{}) {
 		return false, err
 	}
 
-	err = assertstateFetchAccountKey(m.state, 0, signKeyID)
+	err = AssertstateFetchAccountKey(m.state, 0, signKeyID)
 	if err != nil && !errors.Is(err, &asserts.NotFoundError{}) {
 		return true, err
 	}

overlord/devicemgmtstate/devicemgmtmgr_test.go

@@ -161,6 +161,10 @@ func (s *deviceMgmtMgrSuite) SetUpTest(c *C) {
 	c.Assert(db.Add(s.storeStack.StoreAccountKey("")), IsNil)
 	assertstate.ReplaceDB(s.st, db)
 
+	devicemgmtstate.AssertstateDB = assertstate.DB
+	devicemgmtstate.AssertstateAccountKey = assertstate.AccountKey
+	devicemgmtstate.AssertstateFetchAccountKey = assertstate.FetchAccountKey
+
 	s.runner = s.o.TaskRunner()
 	s.o.AddManager(s.runner)
 

overlord/devicemgmtstate/export_test.go

@@ -38,7 +38,7 @@ var (
 )
 
 func MockFetchAccountKey(f func(st *state.State, userID int, signKeyID string) error) func() {
-	return testutil.Mock(&assertstateFetchAccountKey, f)
+	return testutil.Mock(&AssertstateFetchAccountKey, f)
 }
 
 func MockMaxSequences(n int) func() {