git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 3/4] sideband: do allow ANSI color sequences by default

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 16, 2026, 19:38 UTC
Message-ID
<53ed8f19-7084-b9ab-ca4c-cd558b75c1fc@gmx.de>
In-Reply-To
<aWD2wpyOo0Tr34OD@pks.im>
Hi Patrick,
On Fri, 9 Jan 2026, Patrick Steinhardt wrote:
Show 23 quoted lines
> On Wed, Dec 17, 2025 at 02:23:41PM +0000, Johannes Schindelin via GitGitGadget wrote:
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> > 
> > The preceding two commits introduced special handling of the sideband
> > channel to neutralize ANSI escape sequences before sending the payload
> > to the terminal, and `sideband.allowControlCharacters` to override that
> > behavior.
> > 
> > However, as reported by brian m. carlson, some `pre-receive` hooks that
> > are actively used in practice want to color their messages and therefore
> > rely on the fact that Git passes them through to the terminal, even
> > though they have no way to determine whether the receiving side can
> > actually handle Escape sequences (think e.g. about the practice
> > recommended by Git that third-party applications wishing to use Git
> > functionality parse the output of Git commands).
> > 
> > In contrast to other ANSI escape sequences, it is highly unlikely that
> > coloring sequences can be essential tools in attack vectors that mislead
> > Git users e.g. by hiding crucial information.
> 
> The worst that they can do is to set up both fore- and background color
> to be the same so that text isn't visible. But I think that's an okay
> tradeoff.
Indeed.

The major concern here is to hide the fact from the user that Git already exited and that what they see in their terminal is not actually Git asking them to input something.

Technically, this would be possible by setting the text to "invisible" (which would be a fine thing when pretending to ask for a password, anyway). But without the ability to move the cursor, attackers will have a much harder time to cover their tracks.

Show 34 quoted lines
> > Therefore we can have both: Continue to allow ANSI coloring sequences to
> > be passed to the terminal by default, and neutralize all other ANSI
> > Escape sequences.
> 
> Makes sense.
> 
> > diff --git a/Documentation/config/sideband.txt b/Documentation/config/sideband.txt
> > index 3fb5045cd7..e5b7383c7a 100644
> > --- a/Documentation/config/sideband.txt
> > +++ b/Documentation/config/sideband.txt
> > @@ -1,5 +1,17 @@
> >  sideband.allowControlCharacters::
> >  	By default, control characters that are delivered via the sideband
> > -	are masked, to prevent potentially unwanted ANSI escape sequences
> > -	from being sent to the terminal. Use this config setting to override
> > -	this behavior.
> > +	are masked, except ANSI color sequences. This prevents potentially
> > +	unwanted ANSI escape sequences from being sent to the terminal. Use
> > +	this config setting to override this behavior:
> > ++
> > +--
> > +	default::
> > +	color::
> > +		Allow ANSI color sequences, line feeds and horizontal tabs,
> > +		but mask all other control characters. This is the default.
> > +	false::
> > +		Mask all control characters other than line feeds and
> > +		horizontal tabs.
> > +	true::
> > +		Allow all control characters to be sent to the terminal.
> > +--
> 
> Nit: I think that our modern doc style requires the values to use
> backticks. E.g. "`default`::".
Will change.
Show 25 quoted lines
> > diff --git a/sideband.c b/sideband.c
> > index 997430f2ea..fb43008ab7 100644
> > --- a/sideband.c
> > +++ b/sideband.c
> > @@ -40,8 +45,26 @@ static int use_sideband_colors(void)
> >  	if (use_sideband_colors_cached >= 0)
> >  		return use_sideband_colors_cached;
> >  
> > -	git_config_get_bool("sideband.allowcontrolcharacters",
> > -			    &allow_control_characters);
> > +	switch (git_config_get_maybe_bool("sideband.allowcontrolcharacters", &i)) {
> > +	case 0: /* Boolean value */
> > +		allow_control_characters = i ? ALLOW_ALL_CONTROL_CHARACTERS :
> > +			ALLOW_NO_CONTROL_CHARACTERS;
> > +		break;
> > +	case -1: /* non-Boolean value */
> > +		if (git_config_get_string_tmp("sideband.allowcontrolcharacters",
> > +					      &value))
> > +			; /* huh? `get_maybe_bool()` returned -1 */
> 
> This case is something that shouldn't happen in practice because we know
> that the config ought to exist. I guess it _could_ indicate a race
> condition, even though it's extremely unlikely to ever happen. So I was
> thinking about whether we want to `BUG()` here, but I guess just
> ignoring this is fine, as well.

I don't think that we can even get into a race condition because the config is cached after it is read.

Show 29 quoted lines
> > @@ -70,9 +93,41 @@ void list_config_color_sideband_slots(struct string_list *list, const char *pref
> >  		list_config_item(list, prefix, keywords[i].keyword);
> >  }
> >  
> > +static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int n)
> > +{
> > +	int i;
> > +
> > +	/*
> > +	 * Valid ANSI color sequences are of the form
> > +	 *
> > +	 * ESC [ [<n> [; <n>]*] m
> > +	 *
> > +	 * These are part of the Select Graphic Rendition sequences which
> > +	 * contain more than just color sequences, for more details see
> > +	 * https://en.wikipedia.org/wiki/ANSI_escape_code#SGR.
> > +	 */
> > +
> > +	if (allow_control_characters != ALLOW_ANSI_COLOR_SEQUENCES ||
> > +	    n < 3 || src[0] != '\x1b' || src[1] != '[')
> > +		return 0;
> 
> This would break in case `allow_control_characters` allows _all_ ANSI
> sequences. But that doesn't matter right now because the function is
> only called via `strbuf_add_sanitized()` when we're sanitizing at least
> some characters.
> 
> Might be worth though to add a call to `BUG()` in case we see an
> unsupported value for `allow_control_characters`.

Later patches change the logic, though, to make `allow_control_characters` a bit field. So maybe it can be left as-is here?

Show 12 quoted lines
> 
> > +	for (i = 2; i < n; i++) {
> > +		if (src[i] == 'm') {
> > +			strbuf_add(dest, src, i + 1);
> > +			return i;
> > +		}
> > +		if (!isdigit(src[i]) && src[i] != ';')
> > +			break;
> > +	}
> 
> Okay, so this loop scans until we find the final "m" character that
> terminates the sequence. Looks good to me.

Thank you for your review! Johannes

Previous: Patrick SteinhardtNext: Johannes Schindelin via GitGitGadget
Message 30 of 86 in “Sanitize sideband channel messages”
  1. 0/3 Sanitize sideband channel messagesJohannes Schindelin via GitGitGadget, Jan 14, 2025
  2. 1/3 sideband: mask control charactersJohannes Schindelin via GitGitGadget, Jan 14, 2025
  3. Phillip WoodJan 15, 2025
  4. Johannes SchindelinDec 2, 2025
  5. Andreas SchwabJan 15, 2025
  6. Junio C HamanoJan 15, 2025
  7. 2/3 sideband: introduce an "escape hatch" to allow control charactersJohannes Schindelin via GitGitGadget, Jan 14, 2025
  8. 3/3 sideband: do allow ANSI color sequences by defaultJohannes Schindelin via GitGitGadget, Jan 14, 2025
  9. brian m. carlsonJan 14, 2025
  10. Junio C HamanoJan 16, 2025
  11. Ondrej PohorelskyJan 28, 2025
  12. Junio C HamanoJan 31, 2025
  13. Johannes SchindelinDec 2, 2025
  14. brian m. carlsonDec 3, 2025
  15. Johannes SchindelinDec 3, 2025
  16. Phillip WoodJan 15, 2025
  17. Johannes SchindelinDec 2, 2025
  18. 0/4 Sanitize sideband channel messagesJohannes Schindelin via GitGitGadget, Dec 17, 2025
  19. 1/4 sideband: mask control charactersJohannes Schindelin via GitGitGadget, Dec 17, 2025
  20. Patrick SteinhardtJan 9, 2026
  21. Johannes SchindelinJan 16, 2026
  22. 2/4 sideband: introduce an "escape hatch" to allow control charactersJohannes Schindelin via GitGitGadget, Dec 17, 2025
  23. Junio C HamanoDec 18, 2025
  24. Johannes SchindelinDec 18, 2025
  25. Junio C HamanoDec 19, 2025
  26. Johannes SchindelinJan 16, 2026
  27. Patrick SteinhardtJan 9, 2026
  28. 3/4 sideband: do allow ANSI color sequences by defaultJohannes Schindelin via GitGitGadget, Dec 17, 2025
  29. Patrick SteinhardtJan 9, 2026
  30. Johannes SchindelinJan 16, 2026
  31. 4/4 sideband: add options to allow more control sequences to be passed throughJohannes Schindelin via GitGitGadget, Dec 17, 2025
  32. Patrick SteinhardtJan 9, 2026
  33. brian m. carlsonJan 10, 2026
  34. Jeff KingJan 15, 2026
  35. Junio C HamanoJan 15, 2026
  36. Johannes SchindelinJan 15, 2026
  37. Patrick SteinhardtJan 16, 2026
  38. Ondrej PohorelskyJan 16, 2026
  39. Junio C HamanoJan 16, 2026
  40. Johannes SchindelinJan 16, 2026
  41. Junio C HamanoJan 16, 2026
  42. Patrick SteinhardtJan 19, 2026
  43. brian m. carlsonJan 19, 2026
  44. D. Ben KnobleJan 20, 2026
  45. Junio C HamanoJan 20, 2026
  46. Jeff KingJan 20, 2026
  47. Junio C HamanoJan 20, 2026
  48. Patrick SteinhardtJan 21, 2026
  49. Johannes SchindelinJan 22, 2026
  50. Junio C HamanoJan 22, 2026
  51. brian m. carlsonJan 15, 2026
  52. Junio C HamanoFeb 3, 2026
  53. Johannes SchindelinFeb 3, 2026
  54. Junio C HamanoFeb 3, 2026
  55. Junio C HamanoFeb 4, 2026
  56. Johannes SchindelinJan 16, 2026
  57. 0/5 Sanitize sideband channel messagesJohannes Schindelin via GitGitGadget, Jan 16, 2026
  58. 1/5 sideband: mask control charactersJohannes Schindelin via GitGitGadget, Jan 16, 2026
  59. 2/5 sideband: introduce an "escape hatch" to allow control charactersJohannes Schindelin via GitGitGadget, Jan 16, 2026
  60. 3/5 sideband: do allow ANSI color sequences by defaultJohannes Schindelin via GitGitGadget, Jan 16, 2026
  61. 4/5 sideband: add options to allow more control sequences to be passed throughJohannes Schindelin via GitGitGadget, Jan 16, 2026
  62. 5/5 sideband: offer to configure sanitizing on a per-URL basisJohannes Schindelin via GitGitGadget, Jan 16, 2026
  63. Johannes SchindelinJan 16, 2026
  64. 0/6 Sanitize sideband channel messagesJohannes Schindelin via GitGitGadget, Feb 3, 2026
  65. 1/6 sideband: mask control charactersJohannes Schindelin via GitGitGadget, Feb 3, 2026
  66. 2/6 sideband: introduce an "escape hatch" to allow control charactersJohannes Schindelin via GitGitGadget, Feb 3, 2026
  67. 3/6 sideband: do allow ANSI color sequences by defaultJohannes Schindelin via GitGitGadget, Feb 3, 2026
  68. 4/6 sideband: add options to allow more control sequences to be passed throughJohannes Schindelin via GitGitGadget, Feb 3, 2026
  69. 5/6 sideband: offer to configure sanitizing on a per-URL basisJohannes Schindelin via GitGitGadget, Feb 3, 2026
  70. 6/6 sideband: delay sanitizing by default to Git v3.0Johannes Schindelin via GitGitGadget, Feb 3, 2026
  71. Junio C HamanoFeb 4, 2026
  72. Junio C HamanoFeb 5, 2026
  73. Junio C HamanoFeb 13, 2026
  74. 0/3 Sanitizing sideband outputJunio C Hamano, Mar 2, 2026
  75. 1/3 sideband: drop 'default' configurationJunio C Hamano, Mar 2, 2026
  76. 2/3 sideband: delay sanitizing by default to Git v3.0Junio C Hamano, Mar 2, 2026
  77. 3/3 sideband: conditional documentation fixJunio C Hamano, Mar 2, 2026
  78. 0/7 Sanitizing sideband outputJunio C Hamano, Mar 5, 2026
  79. 1/7 sideband: mask control charactersJunio C Hamano, Mar 5, 2026
  80. 2/7 sideband: introduce an "escape hatch" to allow control charactersJunio C Hamano, Mar 5, 2026
  81. 3/7 sideband: do allow ANSI color sequences by defaultJunio C Hamano, Mar 5, 2026
  82. 4/7 sideband: add options to allow more control sequences to be passed throughJunio C Hamano, Mar 5, 2026
  83. 5/7 sideband: offer to configure sanitizing on a per-URL basisJunio C Hamano, Mar 5, 2026
  84. 6/7 sideband: drop 'default' configurationJunio C Hamano, Mar 5, 2026
  85. 7/7 sideband: delay sanitizing by default to Git v3.0Junio C Hamano, Mar 5, 2026
  86. Shipping 2.55 with stricter "neuter sideband" topicJunio C Hamano, Jun 11, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.