devicestate/firstboot: check for missing bases early

image/image.go

@@ -789,6 +789,32 @@ func copyLocalSnapFile(snapPath, targetDir string, info *snap.Info) (dstPath str
 	return dst, osutil.CopyFile(snapPath, dst, 0)
 }
 
+// CheckBasesAndProviders checks that all bases/default-providers are part of the seed
+func CheckBasesAndProviders(snapInfos map[string]*snap.Info) []error {
+	var errs []error
+	for _, info := range snapInfos {
+		// ensure base is available
+		if info.Base != "" && info.Base != "none" {
+			if _, ok := snapInfos[info.Base]; !ok {
+				errs = append(errs, fmt.Errorf("cannot use snap %q: base %q is missing", info.InstanceName(), info.Base))
+			}
+		}
+		// ensure core is available
+		if info.Base == "" && info.SnapType == snap.TypeApp && info.InstanceName() != "snapd" {
+			if _, ok := snapInfos["core"]; !ok {
+				errs = append(errs, fmt.Errorf(`cannot use snap %q: required snap "core" missing`, info.InstanceName()))
+			}
+		}
+		// ensure default-providers are available
+		for _, dp := range neededDefaultProviders(info) {
+			if _, ok := snapInfos[dp]; !ok {
+				errs = append(errs, fmt.Errorf("cannot use snap %q: default provider %q is missing", info.InstanceName(), dp))
+			}
+		}
+	}
+	return errs
+}
+
 func ValidateSeed(seedFile string) error {
 	seed, err := snap.ReadSeedYaml(seedFile)
 	if err != nil {
@@ -820,28 +846,9 @@ func ValidateSeed(seedFile string) error {
 		errs = append(errs, fmt.Errorf("the core or snapd snap must be part of the seed"))
 	}
 
-	// check that all bases/default-providers are part of the seed
-	for _, info := range snapInfos {
-		// ensure base is available
-		if info.Base != "" && info.Base != "none" {
-			if _, ok := snapInfos[info.Base]; !ok {
-				errs = append(errs, fmt.Errorf("cannot use snap %q: base %q is missing", info.InstanceName(), info.Base))
-			}
-		}
-		// ensure core is available
-		if info.Base == "" && info.SnapType == snap.TypeApp && info.InstanceName() != "snapd" {
-			if _, ok := snapInfos["core"]; !ok {
-				errs = append(errs, fmt.Errorf(`cannot use snap %q: required snap "core" missing`, info.InstanceName()))
-			}
-		}
-		// ensure default-providers are available
-		for _, dp := range neededDefaultProviders(info) {
-			if _, ok := snapInfos[dp]; !ok {
-				errs = append(errs, fmt.Errorf("cannot use snap %q: default provider %q is missing", info.InstanceName(), dp))
-			}
-		}
+	if errs2 := CheckBasesAndProviders(snapInfos); errs2 != nil {
+		errs = append(errs, errs2...)
 	}
-
 	if errs != nil {
 		var buf bytes.Buffer
 		for _, err := range errs {

overlord/devicestate/firstboot.go

@@ -31,6 +31,7 @@ import (
 	"github.com/snapcore/snapd/asserts/snapasserts"
 	"github.com/snapcore/snapd/dirs"
 	"github.com/snapcore/snapd/i18n"
+	"github.com/snapcore/snapd/image"
 	"github.com/snapcore/snapd/osutil"
 	"github.com/snapcore/snapd/overlord/assertstate"
 	"github.com/snapcore/snapd/overlord/devicestate/internal"
@@ -127,6 +128,9 @@ func populateStateFromSeedImpl(st *state.State, tm timings.Measurer) ([]*state.T
 	}
 	alreadySeeded := make(map[string]bool, 3)
 
+	// allSnapInfos are collected for cross-check validation of bases
+	allSnapInfos := make(map[string]*snap.Info, len(seed.Snaps))
+
 	tsAll := []*state.TaskSet{}
 	configTss := []*state.TaskSet{}
 
@@ -149,6 +153,7 @@ func populateStateFromSeedImpl(st *state.State, tm timings.Measurer) ([]*state.T
 		}
 		tsAll = append(tsAll, ts)
 		alreadySeeded[snapName] = true
+		allSnapInfos[snapName] = info
 		return info, nil
 	}
 
@@ -238,6 +243,14 @@ func populateStateFromSeedImpl(st *state.State, tm timings.Measurer) ([]*state.T
 		}
 		infos = append(infos, info)
 		infoToTs[info] = ts
+		allSnapInfos[info.InstanceName()] = info
+	}
+
+	// validate that all snaps have bases
+	errs := image.CheckBasesAndProviders(allSnapInfos)
+	if errs != nil {
+		// only report the first error encountered
+		return nil, errs[0]
 	}
 
 	// now add/chain the tasksets in the right order, note that we

overlord/devicestate/firstboot_test.go

@@ -1657,3 +1657,60 @@ snaps:
 	c.Check(conn.(map[string]interface{})["auto"], Equals, true)
 	c.Check(conn.(map[string]interface{})["interface"], Equals, "content")
 }
+
+func (s *FirstBootTestSuite) TestPopulateFromSeedMissingBase(c *C) {
+	devAcct := assertstest.NewAccount(s.storeSigning, "developer", map[string]interface{}{
+		"account-id": "developerid",
+	}, "")
+
+	devAcctFn := filepath.Join(dirs.SnapSeedDir, "assertions", "developer.account")
+	c.Assert(ioutil.WriteFile(devAcctFn, asserts.Encode(devAcct), 0644), IsNil)
+
+	// add a model assertion and its chain
+	assertsChain := s.makeModelAssertionChain(c, "my-model", nil, "bar")
+	for i, as := range assertsChain {
+		fn := filepath.Join(dirs.SnapSeedDir, "assertions", strconv.Itoa(i))
+		err := ioutil.WriteFile(fn, asserts.Encode(as), 0644)
+		c.Assert(err, IsNil)
+	}
+
+	coreFname, kernelFname, gadgetFname := s.makeCoreSnaps(c, "")
+
+	// local snap with unknown base
+	snapYaml = `name: local
+base: foo
+unasserted: true
+version: 1.0`
+	mockSnapFile := snaptest.MakeTestSnapWithFiles(c, snapYaml, nil)
+	targetSnapFile2 := filepath.Join(dirs.SnapSeedDir, "snaps", filepath.Base(mockSnapFile))
+	fooFname, fooDecl, fooRev := s.makeAssertedSnap(c, snapYaml, nil, snap.R(128), "developerid")
+	c.Assert(os.Rename(mockSnapFile, targetSnapFile2), IsNil)
+
+	declFn := filepath.Join(dirs.SnapSeedDir, "assertions", "foo.snap-declaration")
+	c.Assert(ioutil.WriteFile(declFn, asserts.Encode(fooDecl), 0644), IsNil)
+
+	revFn := filepath.Join(dirs.SnapSeedDir, "assertions", "foo.snap-revision")
+	c.Assert(ioutil.WriteFile(revFn, asserts.Encode(fooRev), 0644), IsNil)
+
+	// create a seed.yaml
+	content := []byte(fmt.Sprintf(`
+snaps:
+ - name: core
+   file: %s
+ - name: pc-kernel
+   file: %s
+ - name: pc
+   file: %s
+ - name: local
+   file: %s
+`, coreFname, kernelFname, gadgetFname, fooFname))
+
+	c.Assert(ioutil.WriteFile(filepath.Join(dirs.SnapSeedDir, "seed.yaml"), content, 0644), IsNil)
+
+	// run the firstboot stuff
+	st := s.overlord.State()
+	st.Lock()
+	defer st.Unlock()
+	_, err := devicestate.PopulateStateFromSeedImpl(st, s.perfTimings)
+	c.Assert(err, ErrorMatches, `cannot use snap "local": base "foo" is missing`)
+}