gaschz/dotfiles
1
0
Fork 0
mirror of https://github.com/gaschz/dotfiles.git synced 2025-06-06 18:08:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: avoid multiple ssh-agent spawns

Browse Source 
#
The SSH_AUTH_SOCK is unset when executing user shell through Qrexec,
spawning multiple agents. Using a constant path avoids this problem.
This commit is contained in:
Ben Grande 2024-06-02 20:27:17 +02:00
parent ab355f9abf
commit dfc548e567
No known key found for this signature in database
GPG Key ID: 00C64E14F51F9E56
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
files/sh/.config/sh/profile
View File

@ -62,7 +62,7 @@ BLOCKSIZE="K"
RSYNC_RSH="ssh -ax" RSYNC_RSH="ssh -ax"
SYSTEMD_PAGER="" SYSTEMD_PAGER=""
if test -s /rw/config/gpg-split-domain; then if test -s /rw/config/gpg-split-domain; then
QUBES_GPG_DOMAIN="$(cat /rw/config/gpg-split-domain)" read -r QUBES_GPG_DOMAIN < /rw/config/gpg-split-domain
else else
QUBES_GPG_DOMAIN="@default" QUBES_GPG_DOMAIN="@default"
fi fi
@ -91,7 +91,6 @@ fi
## XDG_CONFIG_HOME: user-specific configuration files ## XDG_CONFIG_HOME: user-specific configuration files
GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0"
KDEHOME="$XDG_CONFIG_HOME/kde" KDEHOME="$XDG_CONFIG_HOME/kde"
#KDEROOTHOME="/root/.config/kde"
INPUTRC="$BASHDIR/inputrc" INPUTRC="$BASHDIR/inputrc"
if has less; then if has less; then
lesskey_src=0 lesskey_src=0
@ -108,7 +107,7 @@ if has less; then
fi fi
unset lesskey_src less_version unset lesskey_src less_version
fi fi
export GTK2_RC_FILES KDEHOME KDEROOTHOME INPUTRC LESSKEY export GTK2_RC_FILES KDEHOME INPUTRC LESSKEY
## XDG_DATA_HOME: user-specific data files ## XDG_DATA_HOME: user-specific data files
RUSTUP_HOME="$XDG_DATA_HOME/rustup" RUSTUP_HOME="$XDG_DATA_HOME/rustup"
@ -130,9 +129,28 @@ GOMODCACHE="$XDG_CACHE_HOME/go/mod"
export GOCACHE GOMODCACHE export GOCACHE GOMODCACHE
## Start agents ## Start agents
ssh_agent_dir="$TMPDIR/ssh-agent-$USER"
ssh_agent_sock="$ssh_agent_dir/agent.sock"
ssh_agent_pid="$ssh_agent_dir/agent.pid"
if test -z "${SSH_AUTH_SOCK-}" && has ssh-agent; then if test -z "${SSH_AUTH_SOCK-}" && has ssh-agent; then
eval "$(ssh-agent -s)" >/dev/null test -d "$ssh_agent_dir" || mkdir -p "$ssh_agent_dir"
if test -S "$ssh_agent_sock" &&
test -r "$ssh_agent_sock" &&
test -w "$ssh_agent_sock" &&
test -f "$ssh_agent_pid" &&
test -r "$ssh_agent_pid" &&
test -s "$ssh_agent_pid"
then
SSH_AUTH_SOCK="$ssh_agent_sock"
read -r SSH_AGENT_PID < "$ssh_agent_pid"
export SSH_AUTH_SOCK SSH_AGENT_PID
else
rm -f "$ssh_agent_sock" "$ssh_agent_pid"
eval "$(ssh-agent -s -a "$ssh_agent_sock")" >/dev/null
echo "$SSH_AGENT_PID" | tee "$ssh_agent_pid" >/dev/null
fi
fi fi
unset ssh_agent_dir ssh_agent_sock ssh_agent_pid
## Zsh sources this shell profile before no_nomatch is set in zshrc, thus ## Zsh sources this shell profile before no_nomatch is set in zshrc, thus
## fails with "no matches found" when the glob can't be expanded. ## fails with "no matches found" when the glob can't be expanded.