Skip to content

manifest safety checks #9269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
macneale4 merged 4 commits into from
May 29, 2025
Merged

manifest safety checks #9269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddc0380
Ensure file manifests have non-empty data before writing to disk
macneale4 May 29, 2025
37d0195
To aggresive on check. empty roots are a thing
macneale4 May 29, 2025
780975b
Provide valid manifest contents in test
macneale4 May 29, 2025
862f22b
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/upda…
macneale4 May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions go/store/nbs/file_manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,13 @@ func parseManifest(r io.Reader) (manifestContents, error) {
}

func writeManifest(temp io.Writer, contents manifestContents) error {
if len(contents.nbfVers) == 0 {
return errors.New("runtime error: Noms format version cannot be empty")
}
if contents.lock.IsEmpty() {
return errors.New("runtime error: Lock hash cannot be empty")
}

strs := make([]string, 2*len(contents.specs)+prefixLen)
strs[0], strs[1], strs[2], strs[3], strs[4] = StorageVersion, contents.nbfVers, contents.lock.String(), contents.root.String(), contents.gcGen.String()
tableInfo := strs[prefixLen:]
Expand Down
6 changes: 5 additions & 1 deletion go/store/nbs/store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"github.com/dolthub/dolt/go/libraries/utils/set"
"github.com/dolthub/dolt/go/libraries/utils/test"
"github.com/dolthub/dolt/go/store/chunks"
"github.com/dolthub/dolt/go/store/constants"
"github.com/dolthub/dolt/go/store/hash"
"github.com/dolthub/dolt/go/store/types"
"github.com/dolthub/dolt/go/store/util/tempfiles"
Expand All @@ -49,7 +50,10 @@ func makeTestLocalStore(t *testing.T, maxTableFiles int) (st *NomsBlockStore, no
// create a v5 manifest
fm, err := getFileManifest(ctx, nomsDir, asyncFlush)
require.NoError(t, err)
_, err = fm.Update(ctx, hash.Hash{}, manifestContents{}, &Stats{}, nil)
_, err = fm.Update(ctx, hash.Hash{}, manifestContents{
nbfVers: constants.FormatDoltString,
lock: journalAddr, // Any valid address will do here
}, &Stats{}, nil)
require.NoError(t, err)

q = NewUnlimitedMemQuotaProvider()
Expand Down