Fix panic on backup call if the SpiceDB version is unsupported

authzed · Dec 5, 2023 · 6e62b42 · 6e62b42
1 parent 97172df
commit 6e62b42
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/internal/cmd/backup.go b/internal/cmd/backup.go
@@ -74,6 +74,10 @@ func backupCmdFunc(cmd *cobra.Command, args []string) error {
 		hasProgressbar = true
 	}
 
+	if schemaResp.ReadAt == nil {
+		return fmt.Errorf("`backup` is not supported on this version of SpiceDB")
+	}
+
 	encoder, err := backupformat.NewEncoder(relWriter, schemaResp.SchemaText, schemaResp.ReadAt)
 	if err != nil {
 		return fmt.Errorf("error creating backup file encoder: %w", err)

diff --git a/pkg/backupformat/encoder.go b/pkg/backupformat/encoder.go
@@ -1,6 +1,7 @@
 package backupformat
 
 import (
+	"errors"
 	"fmt"
 	"io"
 
@@ -15,6 +16,10 @@ func NewEncoder(w io.Writer, schema string, token *v1.ZedToken) (*Encoder, error
 		return nil, fmt.Errorf("unable to create avro schema: %w", err)
 	}
 
+	if token == nil {
+		return nil, errors.New("missing expected token")
+	}
+
 	md := map[string][]byte{
 		metadataKeyZT: []byte(token.Token),
 	}