From 45445f91cfa60889db0f8b00af61d80756d5cba7 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Sat, 29 Aug 2026 16:39:39 +0200
Subject: [PATCH] cmd/age-keygen: report output write failures

Reported by Joe Doyle of Trail of Bits.
---
 cmd/age-keygen/keygen.go      | 16 +++++---
 cmd/age-keygen/keygen_test.go | 70 +++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 5 deletions(-)
 create mode 100644 cmd/age-keygen/keygen_test.go

diff --git a/cmd/age-keygen/keygen.go b/cmd/age-keygen/keygen.go
index a192bcf..62e4522 100644
--- a/cmd/age-keygen/keygen.go
+++ b/cmd/age-keygen/keygen.go
@@ -149,9 +149,15 @@ func generate(out *os.File, pq bool) {
 		fmt.Fprintf(os.Stderr, "Public key: %s\n", r)
 	}
 
-	fmt.Fprintf(out, "# created: %s\n", time.Now().Format(time.RFC3339))
-	fmt.Fprintf(out, "# public key: %s\n", r)
-	fmt.Fprintf(out, "%s\n", i)
+	writef(out, "# created: %s\n", time.Now().Format(time.RFC3339))
+	writef(out, "# public key: %s\n", r)
+	writef(out, "%s\n", i)
+}
+
+func writef(out io.Writer, format string, v ...any) {
+	if _, err := fmt.Fprintf(out, format, v...); err != nil {
+		errorf("failed to write output: %v", err)
+	}
 }
 
 func convert(in io.Reader, out io.Writer) {
@@ -165,9 +171,9 @@ func convert(in io.Reader, out io.Writer) {
 	for _, id := range ids {
 		switch id := id.(type) {
 		case *age.X25519Identity:
-			fmt.Fprintf(out, "%s\n", id.Recipient())
+			writef(out, "%s\n", id.Recipient())
 		case *age.HybridIdentity:
-			fmt.Fprintf(out, "%s\n", id.Recipient())
+			writef(out, "%s\n", id.Recipient())
 		default:
 			errorf("internal error: unexpected identity type: %T", id)
 		}
diff --git a/cmd/age-keygen/keygen_test.go b/cmd/age-keygen/keygen_test.go
new file mode 100644
index 0000000..ad88842
--- /dev/null
+++ b/cmd/age-keygen/keygen_test.go
@@ -0,0 +1,70 @@
+// Copyright 2019 The age Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"filippo.io/age"
+	"github.com/rogpeppe/go-internal/testscript"
+)
+
+func TestMain(m *testing.M) {
+	testscript.Main(m, map[string]func(){
+		"age-keygen": main,
+	})
+}
+
+func unwritable(t *testing.T) *os.File {
+	t.Helper()
+	name := filepath.Join(t.TempDir(), "out")
+	if err := os.WriteFile(name, nil, 0600); err != nil {
+		t.Fatal(err)
+	}
+	f, err := os.Open(name)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { f.Close() })
+	if _, err := f.Write([]byte("x")); err == nil {
+		t.Skip("writes to a read-only file descriptor succeed")
+	}
+	return f
+}
+
+func TestOutputWriteErrors(t *testing.T) {
+	identity, err := age.GenerateX25519Identity()
+	if err != nil {
+		t.Fatal(err)
+	}
+	tests := []struct {
+		name  string
+		args  []string
+		stdin string
+	}{
+		{"generate", nil, ""},
+		{"generate PQ", []string{"-pq"}, ""},
+		{"convert", []string{"-y"}, identity.String() + "\n"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			stderr := &strings.Builder{}
+			cmd := exec.Command("age-keygen", tt.args...)
+			cmd.Stdin = strings.NewReader(tt.stdin)
+			cmd.Stdout = unwritable(t)
+			cmd.Stderr = stderr
+			if err := cmd.Run(); err == nil {
+				t.Error("age-keygen succeeded")
+			}
+			if !strings.Contains(stderr.String(), "failed to write output") {
+				t.Errorf("stderr = %q", stderr)
+			}
+		})
+	}
+}