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.
47 lines
1.2 KiB
Bash
47 lines
1.2 KiB
Bash
#
|
|
# Based on Geoffrey Grosenbach's peepcode zsh theme from
|
|
# https://github.com/topfunky/zsh-simple
|
|
#
|
|
|
|
git_repo_path() {
|
|
command git rev-parse --git-dir 2>/dev/null
|
|
}
|
|
|
|
git_commit_id() {
|
|
command git rev-parse --short HEAD 2>/dev/null
|
|
}
|
|
|
|
git_mode() {
|
|
if [[ -e "$repo_path/BISECT_LOG" ]]; then
|
|
echo "+bisect"
|
|
elif [[ -e "$repo_path/MERGE_HEAD" ]]; then
|
|
echo "+merge"
|
|
elif [[ -e "$repo_path/rebase" || -e "$repo_path/rebase-apply" || -e "$repo_path/rebase-merge" || -e "$repo_path/../.dotest" ]]; then
|
|
echo "+rebase"
|
|
fi
|
|
}
|
|
|
|
git_dirty() {
|
|
if [[ "$repo_path" != '.' && -n "$(command git ls-files -m)" ]]; then
|
|
echo " %{$fg_bold[grey]%}✗%{$reset_color%}"
|
|
fi
|
|
}
|
|
|
|
git_prompt() {
|
|
local cb=$(git_current_branch)
|
|
if [[ -n "$cb" ]]; then
|
|
local repo_path=$(git_repo_path)
|
|
echo " %{$fg_bold[grey]%}${cb//\%/%%} %{$fg[white]%}$(git_commit_id)%{$reset_color%}$(git_mode)$(git_dirty)"
|
|
fi
|
|
}
|
|
|
|
local smiley='%(?.%F{green}☺%f.%F{red}☹%f)'
|
|
|
|
PROMPT='
|
|
${VIRTUAL_ENV:+"($VIRTUAL_ENV) "}%~
|
|
${smiley} '
|
|
|
|
RPROMPT='%F{white} $(ruby_prompt_info)$(git_prompt)%{$reset_color%}'
|
|
|
|
# Disable automatic virtualenv prompt change
|
|
export VIRTUAL_ENV_DISABLE_PROMPT=1
|