2020-09-21 12:39:58 +02:00
#!/bin/bash
2020-10-08 06:19:47 +02:00
# loggerfactory
LANG=C
for f in logerror logwarn loginfo logdebug logtrace ENTRY EXIT SCRIPTENTRY SCRIPTEXIT; do
if LANG=C type -t $f 2> /dev/null| grep -q 'function'; then
:
else
fx=${f//log/}
2020-12-30 00:12:12 +01:00
echo create function $f for $fx
2020-10-08 06:19:47 +02:00
eval "$f () { \
local loglevels; \
declare -a loglevels; \
case $fx in
error)
loglevels=()
;;
warn)
loglevels=(\"ERROR\")
;;
info)
loglevels=(\"ERROR\" \"WARN\" )
;;
debug)
loglevels=( \"ERROR\" \"WARN\" \"INFO\" )
;;
trace|ENTRY|EXIT|SCRIPTENTRY|SCRIPTEXIT)
loglevels=( \"ERROR\" \"WARN\" \"INFO\" \"DEBUG\" )
;;
esac
if [[ ! \${loglevels[*]} =~ \"\${LOGLEVEL-\${LOGLEVEL_DEFAULT}}\" ]];then \
echo "\$@" >&2
fi; \
}"
unset fx
fi
done
unset f
2020-09-22 13:18:45 +02:00
usage(){
cat << EOF
2020-09-22 20:35:47 +02:00
Usage: ssh-agent-start-or-restart [[-c]|[--create-only]]|[[-t]|[--token-only]]|[[-k]|[--key-only]]|[[-r]|[-f]|[--readd]|[--force]] [<ssh-identity>]
2020-09-22 13:18:45 +02:00
If started only with <ssh-identity>, the script looks up in configured identity-path \$SSH_IDENTITIES_DIR (${SSH_IDENTITIES_DIR}) if it can find a directory named after <ssh-identity>.
If no <ssh_identity> is given, the identity is set to \$SSH_DEFAULT_IDENTITY ($SSH_DEFAULT_IDENTITY) configured via Environment.
IF \$SSH_DEFAULT_IDENTITY is also not set, default is the SSH_DEFAULT_IDENTITY
The output is the name of the file, where ssh-agent infomations are hold to load it to current shell for further actions.
Use "$ eval \$(<outputfilenam>)", if you want to load the SSH_AUTH_SOCK and SSH_AGENT_PID in current shell or shorter "$ loadagent [<ssh_identity>]"
-c|--create-only Create or restart only the agent. Do not load any
key or token in it.
The Output is used for loading the agent in the current
shell. (loadagent <identity>)
-t|--token-only To add or renew only configured pkcs11-hardware-token
configured in ${SSH_IDENTITIES_DIR}/<ssh-identity>,
just use this.
-k|--key-only To add or renew only configured keys configured in
${SSH_IDENTITIES_DIR}/<ssh-identity>, just use this.
2020-09-22 20:35:47 +02:00
-r|-f|--readd-token|--force remove all in ${SSH_IDENTITIES_DIR}/<ssh-identity>
2020-09-22 13:18:45 +02:00
configured keys and tokens and readd them again.
Depends on -t an -k Option to select wheter only
keys or tokens only. If no -t and -k is given, all
keys and token are removed and readded again.
Just to be asked for password again, if you plugged off
hardware-token and plugged it in again.
2020-09-22 20:35:47 +02:00
--rm|--remove remove keys and token instead of adding them.
2020-09-22 13:18:45 +02:00
-h|--info Show this info
EOF
}
createonly=false
2020-09-22 09:47:15 +02:00
tokenonly=false
2020-09-22 20:35:47 +02:00
readd=false
2020-09-22 13:18:45 +02:00
keyonly=false
2020-09-22 20:35:47 +02:00
remove=false
2020-09-22 09:47:15 +02:00
while :; do
case $1 in
2020-09-22 13:18:45 +02:00
-c|--create-only)
createonly=true
2020-09-22 09:47:15 +02:00
shift
;;
-t|--token-only)
tokenonly=true
shift
;;
2020-09-22 13:18:45 +02:00
-k|--key-only)
keyonly=true
2020-09-22 12:13:19 +02:00
shift
;;
2020-09-22 20:35:47 +02:00
-r|-f|--readd-token|--force)
readd=true
shift
;;
--rm|--remove)
remove=true
2020-09-22 13:18:45 +02:00
shift
;;
-h|--info)
usage
exit 0
;;
-*)
echo "Unknown urgument: »$1«"
exit 1
;;
2020-09-22 09:47:15 +02:00
*)
2020-09-24 13:38:30 +02:00
#ssh_identity=${1-${SSH_DEFAULT_IDENTITY}}
ssh_identity=${1}
2020-09-22 09:47:15 +02:00
break
;;
esac
done
2020-09-21 23:31:11 +02:00
SCRIPTENTRY
2020-09-21 16:47:59 +02:00
[ -z "${SSH_IDENTITIES_DIR+x}" ] && { SSH_IDENTITIES_DIR="${SSH_IDENTITIES_DEFAULT_DIR-${HOME}/.ssh/identities}"; export SSH_IDENTITIES_DIR; }
[ -z "${SSH_AGENTS_DIR+x}" ] && { SSH_AGENTS_DIR=${SSH_AGENTS_DEFAULT_DIR-~/.ssh/agents}; export SSH_AGENTS_DIR; }
[ -z "${SSH_AGENT_SOCKETS_DIR+x}" ] && { SSH_AGENT_SOCKETS_DIR=${SSH_AGENT_SOCKETS_DEFAULT_DIR-~/.ssh/agents}; export SSH_AGENT_SOCKETS_DIR; }
2020-09-22 12:24:14 +02:00
[ -z "${SSH_AGENT_OPTIONS+x}" ] && { SSH_AGENT_OPTIONS=${SSH_AGENT_DEFAULT_OPTIONS--t 7200 }; export SSH_AGENT_OPTIONS; }
2020-10-01 08:04:15 +02:00
logtrace "SSH_AGENTS_DIR: $SSH_AGENTS_DIR"
logtrace "SSH_AGENT_SOCKETS_DIR: $SSH_AGENT_SOCKETS_DIR"
logtrace "SSH_IDENTITIES_DIR: $SSH_IDENTITIES_DIR"
2020-09-21 17:58:23 +02:00
[ -z "${SSH_AGENTS_DIR-x}" ] || mkdir -vp "$SSH_AGENTS_DIR"
[ -z "${SSH_AGENT_SOCKETS_DIR-x}" ] || mkdir -vp "$SSH_AGENT_SOCKETS_DIR"
[ -z "${SSH_IDENTITIES_DIR-x}" ] || mkdir -vp "$SSH_IDENTITIES_DIR"
2020-09-22 09:08:16 +02:00
2020-09-22 13:18:45 +02:00
2020-09-21 12:39:58 +02:00
agent-start-or-restart () {
2020-09-21 23:31:11 +02:00
ENTRY
2020-09-21 12:39:58 +02:00
local ssh_identity
local agentfile
local agentsocket
2020-09-22 12:13:19 +02:00
local ret
2020-09-21 12:39:58 +02:00
if [ -n "${1+x}" ]; then
2020-09-26 07:03:47 +02:00
ssh_identity="${1}"
2020-09-22 12:13:19 +02:00
identitydir=${SSH_IDENTITIES_DIR}/${ssh_identity}
2020-09-26 07:03:47 +02:00
loginfo "ssh-identität: ${ssh_identity}" >&2
2020-09-22 12:13:19 +02:00
if [ -d ${identitydir} ]; then
[ -e "${identitydir}/config" ] && . "${identitydir}/config"
agentfile="${SSH_AGENTS_DIR}/agent-${ssh_identity}-$(hostname)"
agentsocket="${SSH_AGENT_SOCKETS_DIR}/socket-${ssh_identity}-$(hostname)"
2020-10-01 08:04:15 +02:00
logtrace "agentfile for ${ssh_identity}: $agentfile"
logtrace "agentsocket for ${ssh_identity}: $agentsocket"
2020-09-22 20:35:47 +02:00
if (! $keyonly && ! $tokenonly ) && $remove ; then
2020-10-01 08:04:15 +02:00
logdebug "delete keys and tokens in this ssh-agent"
2020-10-01 06:58:55 +02:00
logdebug "$(ssh-runinagent $agentfile ssh-add -D 2>&1)"
2020-09-22 20:35:47 +02:00
createonly=true
2020-09-22 12:13:19 +02:00
else
2020-09-22 20:35:47 +02:00
if [ -e $agentfile ]; then
local msg
2020-09-24 10:35:56 +02:00
# TODO make in runinagent
2020-09-22 20:35:47 +02:00
msg="$(/bin/sh -c "unset SSH_AUTH_SOCK SSH_AGENT_PID; . $agentfile >/dev/null 2>&1; ssh-add -l 2>&1")"
local ret=$?
2020-10-01 08:04:15 +02:00
logtrace "Output from check for running: $msg"
2020-09-22 20:35:47 +02:00
case $ret in
0)
2020-10-01 06:58:55 +02:00
logdebug "agent is running"
2020-09-22 20:35:47 +02:00
;;
1)
2020-10-01 06:58:55 +02:00
logdebug "agent is running, but:"
2020-09-22 20:35:47 +02:00
logwarn "$msg"
;;
2)
2020-10-01 06:58:55 +02:00
logdebug "former agent is not running -> start it"
2020-10-01 08:04:15 +02:00
logdebug "SSH_AGENT_OPTIONS: $SSH_AGENT_OPTIONS"
2020-09-22 20:35:47 +02:00
[ -e $agentsocket ] && { logdebug -n "remove socketfile: $( rm -v "$agentsocket" )"; }
2020-10-01 06:58:55 +02:00
logtrace "$(ssh-agent -a $agentsocket ${SSH_AGENT_OPTIONS} > $agentfile )"
logdebug "agent started"
2020-09-22 20:35:47 +02:00
;;
esac
else
2020-10-01 06:58:55 +02:00
logdebug "agent did not exist -> create it"
logtrace "ssh-agent -a $agentsocket \> $agentfile"
logtrace "$(ssh-agent -a $agentsocket $SSH_AGENT_OPTIONS > $agentfile )"
logdebug "agent started"
2020-09-22 20:35:47 +02:00
fi
2020-09-22 12:13:19 +02:00
fi
2020-10-01 08:04:15 +02:00
#logdebug "ssh-agent for identity »$ssh_identity«: $agentfile"
2020-10-01 06:58:55 +02:00
$createonly && logtrace "current loaded keys after action:
2020-09-24 13:38:30 +02:00
$(ssh-runinagent $agentfile ssh-add -l)"
2020-09-22 12:13:19 +02:00
echo $agentfile
ret=0
2020-09-21 16:47:59 +02:00
else
2020-09-24 13:15:16 +02:00
logwarn "ssh-identity »$ssh_identity« is not configured. Please create $identitydir and add keys"
2020-09-22 12:13:19 +02:00
ret=2
2020-09-21 12:39:58 +02:00
fi
2020-09-21 16:47:59 +02:00
2020-09-21 12:39:58 +02:00
else
2020-09-24 10:35:56 +02:00
if which gnome-keyring-daemon >/dev/null 2>&1; then
2020-10-01 06:58:55 +02:00
logdebug "no identity given -> gnome-keyrings ssh-agent"
2020-09-24 10:35:56 +02:00
agentfile="${SSH_AGENTS_DIR}/agent-gnome_session-$(hostname)"
agentsocket="${SSH_AGENT_SOCKETS_DIR}/socket-gnome-session-$(hostname)"
gnome-keyring-daemon -s > $agentfile
2020-09-26 07:03:47 +02:00
logdebug "$(cat $agentfile)"
2020-09-24 13:38:30 +02:00
logdebug "ssh-agent for identity »$ssh_identity«: $agentfile"
2020-09-26 07:03:47 +02:00
# logdebug "currently loaded keys after action:
#$(ssh-runinagent $agentfile ssh-add -l)"
2020-09-24 10:35:56 +02:00
echo $agentfile
ret=0
else
logwarn "no identity given -> exit"
ret=1
fi
2020-09-21 12:39:58 +02:00
fi
2020-09-21 23:31:11 +02:00
EXIT
2020-09-22 12:13:19 +02:00
return $ret
2020-09-21 12:39:58 +02:00
}
2020-09-21 16:47:59 +02:00
agent-load-identity-keys () {
2020-09-21 23:31:11 +02:00
ENTRY
2020-09-21 16:47:59 +02:00
local ssh_identity
local agentfile
local agentsocket
local fingerprints
declare -a fingerprints
2021-03-02 22:41:52 +01:00
local pubkeysonly
declare -a pubkeysonly
2020-09-21 16:47:59 +02:00
local fingerprint
local tokenfingerprint
if [ -n "${1+x}" ]; then
2020-09-26 07:03:47 +02:00
ssh_identity="${1}"
2020-09-21 18:47:37 +02:00
identitydir=${SSH_IDENTITIES_DIR}/${ssh_identity}
2020-09-22 12:13:19 +02:00
if [ -d ${identitydir} ]; then
[ -e "${identitydir}/config" ] && . "${identitydir}/config"
agentfile="${SSH_AGENTS_DIR}/agent-${ssh_identity}-$(hostname)"
agentsocket="${SSH_AGENT_SOCKETS_DIR}/socket-${ssh_identity}-$(hostname)"
2020-09-24 10:35:56 +02:00
logdebug "SSH_ADD_OPTIONS: $SSH_ADD_OPTIONS"
2020-09-26 11:33:33 +02:00
logtrace "agentfile: $agentfile"
logtrace "agentsocket: $agentsocket"
2020-09-24 10:35:56 +02:00
logtrace "identitydir: $identitydir"
2020-09-22 12:13:19 +02:00
fingerprints=( $(ssh-runinagent $agentfile "ssh-add -l|awk '{print \$2}'") )
2020-09-24 13:38:30 +02:00
logdebug "fingerprints from loaded keys before action:"
2020-09-24 13:05:26 +02:00
for f in ${fingerprints[*]};do
logdebug "$f"
done
2020-09-22 12:13:19 +02:00
if ! $tokenonly ; then
2021-03-02 22:41:52 +01:00
# load keys
2020-09-22 12:13:19 +02:00
for key in $(ls ${SSH_IDENTITIES_DIR}/${ssh_identity}/id_*|grep -v "pub$\|so$\|config$\|public$"); do
2020-09-24 10:35:56 +02:00
fingerprint=$(ssh-keygen -l -f $key|awk '{print $2}')
2020-09-22 12:13:19 +02:00
if [[ ${fingerprints[*]} =~ "$fingerprint" ]]; then
2020-09-26 11:33:33 +02:00
logdebug "key: $(basename $key) (with fp $fingerprint) is loaded"
2020-09-22 21:03:25 +02:00
if $readd || $remove ; then
2020-10-01 06:58:55 +02:00
$readd && logdebug "re-add key $key"
$remove && logdebug "remove key $key"
logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -d ${key} 2>&1)"
$remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} ${key} 2>&1)"
2020-09-22 13:18:45 +02:00
fi
2020-09-22 12:13:19 +02:00
else
2020-10-01 06:58:55 +02:00
logdebug "key: $key is not loaded -> load it"
#logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -d ${key} 2>&1)"
$remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} ${key} 2>&1)"
2020-09-22 12:13:19 +02:00
fi
done
fi
2020-09-22 13:18:45 +02:00
if ! $keyonly ; then
2021-03-02 22:41:52 +01:00
# load tokens
for pubkey in $(ls ${SSH_IDENTITIES_DIR}/${ssh_identity}/id_*|grep "pub$\|public$"|grep -v "cert.pub"); do
if $( ls ${pubkey%.pub} 1>/dev/null 2>&1);then
echo "pk1 $pubkey"
else
echo "pk2 $pubkey"
pubkeysonly+=($pubkey)
fi
done
loginfo "pubkeysonly: ${pubkeysonly[@]} ${#pubkeysonly[*]}"
2020-09-26 07:03:47 +02:00
for key in $(ls ${SSH_IDENTITIES_DIR}/${ssh_identity}/*|grep "\.so$"); do
tokenfingerprint="$(ssh-keygen -l -D $key|tr -s ' '|awk '{print $2}')"
2020-09-22 13:18:45 +02:00
if [[ ${fingerprints[*]} =~ "$tokenfingerprint" ]]; then
2020-10-03 00:34:47 +02:00
logdebug "token: $key ($tokenfingerprint) is loaded"
2021-03-21 00:58:17 +01:00
check-pubkeysonly
2020-09-22 21:03:25 +02:00
if $readd || $remove ; then
2020-10-01 06:58:55 +02:00
$readd && logdebug "re-add token $key"
$remove && logdebug "remove token $key"
logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${key} 2>&1)"
$remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s ${key} 2>&1)"
2020-09-22 13:18:45 +02:00
fi
else
2020-10-01 06:58:55 +02:00
logdebug "token: $key is not loaded -> load it"
logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${key} 2>&1)"
$remove || logdebug "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s ${key} 2>&1)"
2020-09-22 12:13:19 +02:00
fi
2020-09-22 13:18:45 +02:00
done
fi
2020-11-08 10:07:36 +01:00
loginfo "currently loaded keys after action: $(ssh-runinagent $agentfile ssh-add -l|wc -l)"
logdebug "$(ssh-runinagent $agentfile ssh-add -l)"
2020-09-22 12:13:19 +02:00
else
logwarn "ssh-identity $ssh_identity is not configured. Please create $identitydir and add keys"
2020-09-22 09:47:15 +02:00
fi
2020-09-21 16:47:59 +02:00
fi
2020-09-21 23:31:11 +02:00
EXIT
2020-09-21 16:47:59 +02:00
}
2021-03-21 00:58:17 +01:00
function check-pubkeysonly () {
if [ ${#pubkeysonly[*]} -gt 0 ] ; then
for p in ${pubkeysonly[@]}; do
ssh-runinagent $agentfile ssh-add -T ${p} 2>&1 || { $remove || readd=true; break; }
done
else
logwarn "obviously there is no pubkey for the token in ${SSH_IDENTITIES_DIR}/${ssh_identity}/"
logwarn "you can add the pubkey with"
logwarn " ssh-add -L > ${SSH_IDENTITIES_DIR}/${ssh_identity}/id_etoken.pub"
logwarn "make sure, only the token is loaded into ssh-agent with"
logwarn " ssh-add -l"
logwarn "only one line should be the output"
fi
logdebug "readd: $readd"
}
2020-09-21 16:47:59 +02:00
ssh-runinagent () {
2020-09-21 23:31:11 +02:00
ENTRY
2020-09-21 16:47:59 +02:00
local agentfile
local command
2020-09-22 12:13:19 +02:00
local agentfile=${1}
2020-09-21 16:47:59 +02:00
shift
2020-09-22 12:13:19 +02:00
local sshcommand=${@}
2020-09-21 16:47:59 +02:00
2020-09-26 11:33:33 +02:00
logtrace "run command »$sshcommand« in agent $agentfile"
2020-09-21 16:47:59 +02:00
if [ -e "$agentfile" ]; then
/bin/sh -c "unset SSH_AUTH_SOCK SSH_AGENT_PID; . $agentfile >/dev/null 2>/dev/null; $sshcommand"
2020-09-22 12:13:19 +02:00
ret=$?
2020-09-21 16:47:59 +02:00
else
2020-09-26 11:33:33 +02:00
logwarn "agentfile not existent"
2020-09-22 12:13:19 +02:00
ret=99
2020-09-21 16:47:59 +02:00
fi
2020-09-21 23:31:11 +02:00
2020-09-22 12:13:19 +02:00
EXIT
return $ret
2020-09-21 23:31:11 +02:00
2020-09-21 16:47:59 +02:00
}
2020-09-21 12:39:58 +02:00
2020-09-22 09:47:15 +02:00
agent-start-or-restart $ssh_identity
2020-09-22 13:18:45 +02:00
! $createonly && agent-load-identity-keys $ssh_identity
2020-09-21 23:31:11 +02:00
SCRIPTEXIT
2020-09-21 12:39:58 +02:00
exit $?