Added binary mode

cmd/sops/main.go

@@ -185,7 +185,7 @@ func store(path string) sops.Store {
 	} else if strings.HasSuffix(path, ".json") {
 		return &json.Store{}
 	}
-	panic("Unknown file type for file " + path)
+	return &json.BinaryStore{}
 }
 
 func decryptFile(store sops.Store, fileBytes []byte, ignoreMac bool) (tree sops.Tree, stash map[string][]interface{}, err error) {
@@ -397,6 +397,11 @@ const exampleJson = `
 }
 `
 
+const exampleBinary = `
+Welcome to SOPS!
+Remove this text and add your content to the file.
+`
+
 func loadExample(c *cli.Context, file string) (sops.Tree, error) {
 	var in []byte
 	var tree sops.Tree
@@ -404,6 +409,8 @@ func loadExample(c *cli.Context, file string) (sops.Tree, error) {
 		in = []byte(exampleYaml)
 	} else if strings.HasSuffix(file, ".json") {
 		in = []byte(exampleJson)
+	} else {
+		in = []byte(exampleBinary)
 	}
 	branch, _ := store(file).Unmarshal(in)
 	tree.Branch = branch

json/store.go

@@ -12,10 +12,49 @@ import (
 	"time"
 )
 
-// Store handles storage of JSON data. It's not finished yet, and therefore you should not use it.
+// Store handles storage of JSON data.
 type Store struct {
 }
 
+// BinaryStore handles storage of binary data in a JSON envelope.
+type BinaryStore struct {
+	store Store
+}
+
+// Marshal takes a sops tree branch and returns a json formatted string
+func (store BinaryStore) Marshal(tree sops.TreeBranch) ([]byte, error) {
+	for _, item := range tree {
+		if item.Key == "data" {
+			return []byte(item.Value.(string)), nil
+		}
+	}
+	return nil, fmt.Errorf("No binary data found in tree")
+}
+
+// MarshalWithMetadata takes a sops tree branch and sops metadata and marshals them to json.
+func (store BinaryStore) MarshalWithMetadata(tree sops.TreeBranch, metadata sops.Metadata) ([]byte, error) {
+	return store.store.MarshalWithMetadata(tree, metadata)
+}
+
+// Unmarshal takes an input byte slice and returns a sops tree branch
+func (store BinaryStore) Unmarshal(in []byte) (sops.TreeBranch, error) {
+	branch, err := store.store.Unmarshal(in)
+	if err != nil {
+		return sops.TreeBranch{
+			sops.TreeItem{
+				Key:   "data",
+				Value: string(in),
+			},
+		}, nil
+	}
+	return branch, nil
+}
+
+// UnmarshalMetadata takes a binary format sops file and extracts sops' metadata from it
+func (store BinaryStore) UnmarshalMetadata(in []byte) (sops.Metadata, error) {
+	return store.store.UnmarshalMetadata(in)
+}
+
 func (store Store) sliceFromJSONDecoder(dec *json.Decoder) ([]interface{}, error) {
 	var slice []interface{}
 	for {

sops.go

@@ -80,6 +80,8 @@ func (tree TreeBranch) walkValue(in interface{}, path []string, onLeaves func(in
 	switch in := in.(type) {
 	case string:
 		return onLeaves(in, path)
+	case []byte:
+		return onLeaves(string(in), path)
 	case int:
 		return onLeaves(in, path)
 	case bool: