mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-05-29 04:53:17 +02:00
c90141ed77
This patch adds missing % character escaping for custom git prompts used in a few themes. It also includes escaping for git-prompt.sh. In combination with CVE-2021-45444, this could allow code execution when displaying branch information in cloned malicious git repositories. However, zsh 5.8.1 and newer are largely the default zsh versions, and on those supported distributions with older zsh versions, the CVE has been found to be also patched. For this reason, this doesn't qualify as a security patch, but a bug fix for proper printing of git branches.
25 lines
988 B
Bash
25 lines
988 B
Bash
# Depends on the git plugin for work_in_progress()
|
|
(( $+functions[work_in_progress] )) || work_in_progress() {}
|
|
|
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
|
|
ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
|
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
|
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
|
|
|
# Customized git status, oh-my-zsh currently does not allow render dirty status before branch
|
|
git_custom_status() {
|
|
local branch=$(git_current_branch)
|
|
[[ -n "$branch" ]] || return 0
|
|
branch="${branch//\%/%%}"
|
|
echo "$(parse_git_dirty)\
|
|
%{${fg_bold[yellow]}%}$(work_in_progress)%{$reset_color%}\
|
|
${ZSH_THEME_GIT_PROMPT_PREFIX}${branch}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
|
|
}
|
|
|
|
# RVM component of prompt
|
|
ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[red]%}["
|
|
ZSH_THEME_RUBY_PROMPT_SUFFIX="]%{$reset_color%}"
|
|
|
|
# Combine it all into a final right-side prompt
|
|
RPS1="\$(git_custom_status)\$(ruby_prompt_info)${RPS1:+ $RPS1}"
|
|
PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '
|