Skip to content

getuto: add manual timeout around GPG connection to keyserver. #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NHOrus wants to merge 1 commit into from
Closed

getuto: add manual timeout around GPG connection to keyserver. #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions getuto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ LASTRUNFILE=${GNUPGHOME}/.getuto.last
QUIET='1'
QUIET_GPG=''

GPG_TIMEOUT_TERM='3.5m'
GPG_TIMEOUT_KILL='5m'

[[ $1 == '-v' ]] && QUIET=''
# If QUIET is enabled, pass '--quiet' and suppress GPG homedir permission warnings
# These permission warnings cannot be suppressed using gpg.conf
Expand Down Expand Up @@ -73,7 +76,7 @@ getuto_refresh() {
# Refresh all keys from the keyserver if we can.
for keyserver in "${mykeyservers[@]}" ; do
# TODO: keys.openpgp.org lacks a UID for our keys, need to verify email
gpg ${QUIET_GPG} --batch --keyserver "${keyserver}" --refresh-keys || true
timeout -k ${GPG_TIMEOUT_KILL} ${GPG_TIMEOUT_TERM} gpg ${QUIET_GPG} --batch --keyserver "${keyserver}" --refresh-keys || true
done
# We only sign (-> ultimate trust) the keys we originally import, so this is fine and
# just serves as an additional refresh method.
Expand Down Expand Up @@ -167,7 +170,7 @@ if [[ ! -d ${GNUPGHOME} ]] ; then

# TODO: keys.openpgp.org lacks a UID for our keys, need to verify email
for keyserver in "${mykeyservers[@]}" ; do
gpg ${QUIET_GPG} --batch --keyserver "${keyserver}" --recv-keys ${myrelkeys} || true
timeout -k ${GPG_TIMEOUT_KILL} ${GPG_TIMEOUT_TERM} gpg ${QUIET_GPG} --batch --keyserver "${keyserver}" --recv-keys ${myrelkeys} || true
done
# We only sign (-> ultimate trust) the keys we originally import, so this is fine and
# just serves as an additional refresh method.
Expand Down