fix(gmail): accept padded raw message encoding (#923)

goutamadwant · web-flow · commit 7785477091f9 · 2026-07-16T00:01:14.000-07:00
Accept Gmail API raw payloads in both padded and unpadded base64url forms by reusing the shared decoder. Add command-level regression coverage and changelog credit. Fixes #922. Co-authored-by: goutamadwant <workwithgoutam@gmail.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Docs: preserve external and internal text-run link targets in `docs cat --chips`, JSON, tab, table, and numbered output while keeping default text unchanged. (#917, #921) — thanks @neo-wanderer.
 - Gmail: enforce per-account no-send guards before dry-run exits for first-class and Discovery send paths while preserving no-guard keyring avoidance. (#915, #916) — thanks @veteranbv.
+- Gmail: accept padded Gmail API base64url payloads in `gmail get --format raw` while retaining unpadded compatibility. (#922, #923) — thanks @goutamadwant.
 - MCP: add optional global and per-account capability ceilings in `config.json`, with narrow persistent write authorization, runtime-only restriction, and fail-closed selector validation. (#913) — thanks @mcaldas.
 
 ## 0.34.0 - 2026-07-11
diff --git a/internal/cmd/gmail_get.go b/internal/cmd/gmail_get.go
@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"context"
-	"encoding/base64"
 	"strings"
 
 	"github.com/steipete/gogcli/internal/gmailcontent"
@@ -127,7 +126,7 @@ func (c *GmailGetCmd) Run(ctx context.Context, flags *RootFlags) error {
 			u.Err().Println("Empty raw message")
 			return nil
 		}
-		decoded, err := base64.RawURLEncoding.DecodeString(msg.Raw)
+		decoded, err := decodeGmailRaw(msg.Raw)
 		if err != nil {
 			return err
 		}
diff --git a/internal/cmd/gmail_get_cmd_test.go b/internal/cmd/gmail_get_cmd_test.go
@@ -322,6 +322,41 @@ func TestGmailGetCmd_Text_Metadata_WithAttachments(t *testing.T) {
 	}
 }
 
+func TestGmailGetCmd_RawAcceptsPaddedBase64URL(t *testing.T) {
+	rawMessage := "Subject: padded\r\nContent-Type: multipart/mixed\r\n\r\nbody!"
+	encoded := base64.URLEncoding.EncodeToString([]byte(rawMessage))
+	if !strings.HasSuffix(encoded, "=") {
+		t.Fatal("test fixture must include base64 padding")
+	}
+
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if !strings.Contains(r.URL.Path, "/gmail/v1/users/me/messages/") {
+			http.NotFound(w, r)
+			return
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_ = json.NewEncoder(w).Encode(map[string]any{
+			"id":       "m1",
+			"threadId": "t1",
+			"labelIds": []string{"INBOX"},
+			"raw":      encoded,
+		})
+	}))
+	defer srv.Close()
+
+	result := executeWithGmailTestService(
+		t,
+		[]string{"--plain", "--account", "a@b.com", "gmail", "get", "m1", "--format", "raw"},
+		newGmailServiceFromServer(t, srv),
+	)
+	if result.err != nil {
+		t.Fatalf("execute: %v\nstderr=%q", result.err, result.stderr)
+	}
+	if !strings.Contains(result.stdout, rawMessage) {
+		t.Fatalf("expected decoded raw message, got: %q", result.stdout)
+	}
+}
+
 func TestGmailGetCmd_RawEmpty(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if !strings.Contains(r.URL.Path, "/gmail/v1/users/me/messages/") {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package cmd`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`- "encoding/base64"`
`6`	`5`	`"strings"`
`7`	`6`
`8`	`7`	`"github.com/steipete/gogcli/internal/gmailcontent"`
`@@ -127,7 +126,7 @@ func (c GmailGetCmd) Run(ctx context.Context, flags RootFlags) error {`
`127`	`126`	`u.Err().Println("Empty raw message")`
`128`	`127`	`return nil`
`129`	`128`	`}`
`130`		`- decoded, err := base64.RawURLEncoding.DecodeString(msg.Raw)`
	`129`	`+ decoded, err := decodeGmailRaw(msg.Raw)`
`131`	`130`	`if err != nil {`
`132`	`131`	`return err`
`133`	`132`	`}`