fix(cef): cap the visual copy allowance at one and tighten accent color validation

commit: a877e408d24dd128b5b18663115c0111e2e7ba67
author: brice · 18d ago · 2026-10-04 16:42 UTC
committer: brice · 12d ago · 2026-10-10 08:28 UTC
parent: fea7b72
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email
refs: feat/vim-hints-visual-yank

2 files · +17 -4

M internal/infrastructure/cef/vim_page.go +5 -3


@@ -29,7 +29,7 @@ var (
29	29		errVimPagePayloadTooLarge = errors.New("vim page: payload too large")
30	30		// vimPageAccentColor admits the CSS hex colors the runtime paints with;
31	31		// anything else is replaced by the runtime default before reaching JS.
32		-	vimPageAccentColor = regexp.MustCompile(`^#[0-9a-fA-F]{3,8}$`)
	32	+	vimPageAccentColor = regexp.MustCompile(`^#(?:[0-9a-fA-F]{3,4}\|[0-9a-fA-F]{6}\|[0-9a-fA-F]{8})$`)
33	33		)
34	34
35	35		// vimPageBridgePayload is one result reported by the page runtime. Token is

@@ -323,14 +323,16 @@ func vimPageKeyRequestsCopy(key string) bool {
323	323		}
324	324
325	325		// grantVimPageCopyAllowance records that the user pressed a copy key for the
326		-	// armed visual interaction, so one visual copy result will be accepted.
	326	+	// armed visual interaction, so one visual copy result will be accepted. The
	327	+	// allowance is capped at one: y/Enter presses the page ignores (caret or hint
	328	+	// phase, empty selection) must not bank copies for a page holding the token.
327	329		func (wv *WebView) grantVimPageCopyAllowance(token, key string) {
328	330		if !vimPageKeyRequestsCopy(key) {
329	331		return
330	332		}
331	333		wv.mu.Lock()
332	334		if wv.vimPageToken == token && wv.vimPageKind == dto.VimPageVisual {
333		-	wv.vimPageCopyAllowance++
	335	+	wv.vimPageCopyAllowance = 1
334	336		}
335	337		wv.mu.Unlock()
336	338		}

 	errVimPagePayloadTooLarge  = errors.New("vim page: payload too large")
 	// vimPageAccentColor admits the CSS hex colors the runtime paints with;
 	// anything else is replaced by the runtime default before reaching JS.
-	vimPageAccentColor = regexp.MustCompile(`^#[0-9a-fA-F]{3,8}$`)
+	vimPageAccentColor = regexp.MustCompile(`^#(?:[0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$`)
 )
 // vimPageBridgePayload is one result reported by the page runtime. Token is
 }
 // grantVimPageCopyAllowance records that the user pressed a copy key for the
-// armed visual interaction, so one visual copy result will be accepted.
+// armed visual interaction, so one visual copy result will be accepted. The
+// allowance is capped at one: y/Enter presses the page ignores (caret or hint
+// phase, empty selection) must not bank copies for a page holding the token.
 func (wv *WebView) grantVimPageCopyAllowance(token, key string) {
 	if !vimPageKeyRequestsCopy(key) {
 		return
 	}
 	wv.mu.Lock()
 	if wv.vimPageToken == token && wv.vimPageKind == dto.VimPageVisual {
-		wv.vimPageCopyAllowance++
+		wv.vimPageCopyAllowance = 1
 	}
 	wv.mu.Unlock()
 }

M internal/infrastructure/cef/vim_page_test.go +12 -1


@@ -110,6 +110,8 @@ func TestVimPageRequestJSONValidatesAccentColor(t *testing.T) {
110	110		"": `{"kind":"visual"}`,
111	111		"red": `{"kind":"visual"}`,
112	112		"#12": `{"kind":"visual"}`,
	113	+	"#12345": `{"kind":"visual"}`,
	114	+	"#1234567": `{"kind":"visual"}`,
113	115		"#123456789": `{"kind":"visual"}`,
114	116		"#abc;} body{display:none": `{"kind":"visual"}`,
115	117		"url(javascript:alert(1))": `{"kind":"visual"}`,

@@ -402,10 +404,19 @@ func TestWebViewHandleVimPageResultVisualCopyNeedsForwardedCopyKey(t *testing.T)
402	404		wv.grantVimPageCopyAllowance("other", "y")
403	405		wv.handleVimPageResult(copyResult)
404	406		assert.Len(t, *queued, 2)
	407	+
	408	+	// y presses the page ignored (caret phase, empty selection) do not bank
	409	+	// copies for later.
	410	+	wv.grantVimPageCopyAllowance("tok", "y")
	411	+	wv.grantVimPageCopyAllowance("tok", "y")
	412	+	wv.grantVimPageCopyAllowance("tok", "y")
	413	+	wv.handleVimPageResult(copyResult)
	414	+	wv.handleVimPageResult(copyResult)
	415	+	assert.Len(t, *queued, 3, "ignored copy keys do not accumulate allowance")
405	416		}
406	417
407	418		func TestWebViewSendVimPageKeyGrantsCopyAllowanceOnlyForVisual(t *testing.T) {
408		-	for kind, want := range map[dto.VimPageInteractionKind]int{dto.VimPageVisual: 2, dto.VimPageHintYankURL: 0} {
	419	+	for kind, want := range map[dto.VimPageInteractionKind]int{dto.VimPageVisual: 1, dto.VimPageHintYankURL: 0} {
409	420		browser := cefmocks.NewMockBrowser(t)
410	421		frame := cefmocks.NewMockFrame(t)
411	422		browser.EXPECT().GetMainFrame().Return(frame).Times(3)

 		"":                         `{"kind":"visual"}`,
 		"red":                      `{"kind":"visual"}`,
 		"#12":                      `{"kind":"visual"}`,
+		"#12345":                   `{"kind":"visual"}`,
+		"#1234567":                 `{"kind":"visual"}`,
 		"#123456789":               `{"kind":"visual"}`,
 		"#abc;} body{display:none": `{"kind":"visual"}`,
 		"url(javascript:alert(1))": `{"kind":"visual"}`,
 	wv.grantVimPageCopyAllowance("other", "y")
 	wv.handleVimPageResult(copyResult)
 	assert.Len(t, *queued, 2)
+	// y presses the page ignored (caret phase, empty selection) do not bank
+	// copies for later.
+	wv.grantVimPageCopyAllowance("tok", "y")
+	wv.grantVimPageCopyAllowance("tok", "y")
+	wv.grantVimPageCopyAllowance("tok", "y")
+	wv.handleVimPageResult(copyResult)
+	wv.handleVimPageResult(copyResult)
+	assert.Len(t, *queued, 3, "ignored copy keys do not accumulate allowance")
 }
 func TestWebViewSendVimPageKeyGrantsCopyAllowanceOnlyForVisual(t *testing.T) {
-	for kind, want := range map[dto.VimPageInteractionKind]int{dto.VimPageVisual: 2, dto.VimPageHintYankURL: 0} {
+	for kind, want := range map[dto.VimPageInteractionKind]int{dto.VimPageVisual: 1, dto.VimPageHintYankURL: 0} {
 		browser := cefmocks.NewMockBrowser(t)
 		frame := cefmocks.NewMockFrame(t)
 		browser.EXPECT().GetMainFrame().Return(frame).Times(3)