From de0b4536ad932a4705b85c688950456b87440c0a Mon Sep 17 00:00:00 2001
From: Dominik Schulz <mail@dschulz.eu>
Date: Thu, 13 Jan 2022 20:41:04 +0100
Subject: [PATCH] Output full secret when not properly encoded for cat

RELEASE_NOTES=[BUGFIX] Handle unencoded secret on cat

Fixes #2104

Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
---
 internal/action/binary.go      |  3 ++-
 internal/action/binary_test.go | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/internal/action/binary.go b/internal/action/binary.go
index 6d07479bdb..c6b3b60ebe 100644
--- a/internal/action/binary.go
+++ b/internal/action/binary.go
@@ -228,7 +228,8 @@ func (s *Action) binaryGet(ctx context.Context, name string) ([]byte, error) {
 	}
 
 	if cte, _ := sec.Get("content-transfer-encoding"); cte != "Base64" {
-		return []byte(sec.Body()), nil
+		// need to use sec.Bytes() otherwise the first line is missing.
+		return sec.Bytes(), nil
 	}
 
 	buf, err := base64.StdEncoding.DecodeString(sec.Body())
diff --git a/internal/action/binary_test.go b/internal/action/binary_test.go
index ad2cb1a0ac..f1ea411bf9 100644
--- a/internal/action/binary_test.go
+++ b/internal/action/binary_test.go
@@ -187,6 +187,26 @@ func TestBinarySum(t *testing.T) {
 	})
 }
 
+func TestBinaryGet(t *testing.T) {
+	u := gptest.NewUnitTester(t)
+	defer u.Remove()
+
+	ctx := context.Background()
+	ctx = ctxutil.WithAlwaysYes(ctx, true)
+	ctx = ctxutil.WithHidden(ctx, true)
+
+	act, err := newMock(ctx, u)
+	require.NoError(t, err)
+	require.NotNil(t, act)
+
+	data := []byte("1\n2\n3\n")
+	assert.NoError(t, act.insertStdin(ctx, "x", data, false))
+
+	out, err := act.binaryGet(ctx, "x")
+	assert.NoError(t, err)
+	assert.Equal(t, data, out)
+}
+
 func writeBinfile(t *testing.T, fn string) {
 	// tests should be predicable
 	rand.Seed(42)