Merge branch 'lukeshu/json'

5 files changed, 77 insertions, 63 deletions

diff --git a/lib/btrfs/btrfssum/shortsum.go b/lib/btrfs/btrfssum/shortsum.go
index 754a79d..a3a6d11 100644
--- a/lib/btrfs/btrfssum/shortsum.go
+++ b/lib/btrfs/btrfssum/shortsum.go
@@ -5,12 +5,13 @@
 package btrfssum
 
 import (
-	"fmt"
 	"io"
-	"math"
 	"strings"
 
 	"git.lukeshu.com/go/lowmemjson"
+
+	"git.lukeshu.com/btrfs-progs-ng/lib/jsonutil"
+	"git.lukeshu.com/btrfs-progs-ng/lib/textui"
 )
 
 type ShortSum string
@@ -27,72 +28,13 @@ func (sum ShortSum) ToFullSum() CSum {
 }
 
 func (sum ShortSum) EncodeJSON(w io.Writer) error {
-	const hextable = "0123456789abcdef"
-	var buf [2]byte
-	buf[0] = '"'
-	if _, err := w.Write(buf[:1]); err != nil {
-		return err
-	}
-	for i := 0; i < len(sum); i++ {
-		buf[0] = hextable[sum[i]>>4]
-		buf[1] = hextable[sum[i]&0x0f]
-		if _, err := w.Write(buf[:]); err != nil {
-			return err
-		}
-	}
-	buf[0] = '"'
-	if _, err := w.Write(buf[:1]); err != nil {
-		return err
-	}
-	return nil
-}
-
-func deHex(r rune) (byte, bool) {
-	if r > math.MaxUint8 {
-		return 0, false
-	}
-	c := byte(r)
-	//nolint:gomnd // Hex conversion.
-	switch {
-	case '0' <= c && c <= '9':
-		return c - '0', true
-	case 'a' <= c && c <= 'f':
-		return c - 'a' + 10, true
-	case 'A' <= c && c <= 'F':
-		return c - 'A' + 10, true
-	default:
-		return 0, false
-	}
+	return jsonutil.EncodeSplitHexString(w, sum, textui.Tunable(80))
 }
 
 func (sum *ShortSum) DecodeJSON(r io.RuneScanner) error {
 	var out strings.Builder
-	if c, _, err := r.ReadRune(); err != nil {
+	if err := jsonutil.DecodeSplitHexString(r, &out); err != nil {
 		return err
-	} else if c != '"' {
-		return fmt.Errorf("expected %q, got %q", '"', c)
-	}
-	for {
-		a, _, err := r.ReadRune()
-		if err != nil {
-			return err
-		}
-		if a == '"' {
-			break
-		}
-		aN, ok := deHex(a)
-		if !ok {
-			return fmt.Errorf("expected a hex digit, got %q", a)
-		}
-		b, _, err := r.ReadRune()
-		if err != nil {
-			return err
-		}
-		bN, ok := deHex(b)
-		if !ok {
-			return fmt.Errorf("expected a hex digit, got %q", b)
-		}
-		out.WriteByte(aN<<4 | bN)
 	}
 	*sum = ShortSum(out.String())
 	return nil
diff --git a/lib/btrfs/btrfssum/shortsum_test.go b/lib/btrfs/btrfssum/shortsum_test.go
new file mode 100644
index 0000000..aa7849a
--- /dev/null
+++ b/lib/btrfs/btrfssum/shortsum_test.go
@@ -0,0 +1,66 @@
+// Copyright (C) 2023  Luke Shumaker <lukeshu@lukeshu.com>
+//
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package btrfssum_test
+
+import (
+	"bytes"
+	"testing"
+
+	"git.lukeshu.com/go/lowmemjson"
+	"github.com/stretchr/testify/assert"
+
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum"
+)
+
+func TestShortSumEncodeJSON(t *testing.T) {
+	t.Parallel()
+	type TestCase struct {
+		InputSum   btrfssum.ShortSum
+		OutputJSON string
+	}
+	testcases := map[string]TestCase{
+		"short": {
+			InputSum:   "xyz",
+			OutputJSON: `"78797a"`,
+		},
+		"long": {
+			InputSum:   "0123456789abcdefghijklmnopqrstuvwxyz;:.,ABCDEFG",
+			OutputJSON: `["303132333435363738396162636465666768696a6b6c6d6e6f707172737475767778797a3b3a2e2c","41424344454647"]`,
+		},
+		"medium": { // exactly the maximum string length
+			InputSum:   "0123456789abcdefghijklmnopqrstuvwxyz;:.,",
+			OutputJSON: `"303132333435363738396162636465666768696a6b6c6d6e6f707172737475767778797a3b3a2e2c"`,
+		},
+	}
+	for tcName, tc := range testcases {
+		tc := tc
+		t.Run(tcName, func(t *testing.T) {
+			t.Parallel()
+
+			var jsonBuf bytes.Buffer
+			assert.NoError(t, lowmemjson.NewEncoder(&jsonBuf).Encode(tc.InputSum))
+			assert.Equal(t, tc.OutputJSON, jsonBuf.String())
+
+			var rtSum btrfssum.ShortSum
+			assert.NoError(t, lowmemjson.NewDecoder(&jsonBuf).DecodeThenEOF(&rtSum))
+			assert.Equal(t, tc.InputSum, rtSum)
+		})
+	}
+}
+
+func FuzzShortSumJSONFuzz(f *testing.F) {
+	f.Fuzz(func(t *testing.T, _inSum []byte) {
+		t.Logf("in = %q", _inSum)
+		inSum := btrfssum.ShortSum(_inSum)
+
+		var jsonBuf bytes.Buffer
+		assert.NoError(t, lowmemjson.NewEncoder(&jsonBuf).Encode(inSum))
+		t.Logf("json = %q", jsonBuf.Bytes())
+
+		var outSum btrfssum.ShortSum
+		assert.NoError(t, lowmemjson.NewDecoder(&jsonBuf).DecodeThenEOF(&outSum))
+		assert.Equal(t, inSum, outSum)
+	})
+}
diff --git a/lib/btrfs/btrfssum/testdata/fuzz/FuzzShortSumJSONFuzz/162fbf5f010234baa3e0f8c91825ebb8bce17b9ad8365ae1cad6977b4114d1ec b/lib/btrfs/btrfssum/testdata/fuzz/FuzzShortSumJSONFuzz/162fbf5f010234baa3e0f8c91825ebb8bce17b9ad8365ae1cad6977b4114d1ec
new file mode 100644
index 0000000..338adec
--- /dev/null
+++ b/lib/btrfs/btrfssum/testdata/fuzz/FuzzShortSumJSONFuzz/162fbf5f010234baa3e0f8c91825ebb8bce17b9ad8365ae1cad6977b4114d1ec
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("00000000000000000000000000000000000000000")
diff --git a/lib/btrfs/btrfssum/testdata/fuzz/FuzzShortSumJSONFuzz/b15b16f1ef330f9113455291780be2915cecf2bd1b7dbe2e3af0505f042751e8 b/lib/btrfs/btrfssum/testdata/fuzz/FuzzShortSumJSONFuzz/b15b16f1ef330f9113455291780be2915cecf2bd1b7dbe2e3af0505f042751e8
new file mode 100644
index 0000000..c9fd0e4
--- /dev/null
+++ b/lib/btrfs/btrfssum/testdata/fuzz/FuzzShortSumJSONFuzz/b15b16f1ef330f9113455291780be2915cecf2bd1b7dbe2e3af0505f042751e8
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("Z")
diff --git a/lib/btrfs/btrfssum/testdata/fuzz/FuzzShortSumJSONFuzz/fecd8dd05aeedabe b/lib/btrfs/btrfssum/testdata/fuzz/FuzzShortSumJSONFuzz/fecd8dd05aeedabe
new file mode 100644
index 0000000..66b87de
--- /dev/null
+++ b/lib/btrfs/btrfssum/testdata/fuzz/FuzzShortSumJSONFuzz/fecd8dd05aeedabe
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\xb8")