Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion htdecodetoken
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,16 @@ if [ $? != 0 ]; then
# silently exit if scitokens-verify not found
exit
fi
VERIFYOUT="$($VERIFY $TOKEN)"
# scitokens-verify from scitokens-cpp versions greater than 1.2.0
# accepts token on stdin. That's safer to use so try it first.
# The echo command is a shell builtin so it won't show up even
# temporarily in a ps list.
VERIFYOUT="$(echo $TOKEN | $VERIFY 2>&1)"
RET=$?
if [ $RET != 0 ] && [[ "$VERIFYOUT" == *"Insufficient arguments"* ]]; then
VERIFYOUT="$($VERIFY $TOKEN)"
RET=$?
fi
if [ $RET != 0 ]; then
if [ -n "$VERIFYOUT" ]; then
echo "$VERIFYOUT" >&2
Expand Down
2 changes: 1 addition & 1 deletion htgettoken.1
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ order to work.
.TP
.BR \-\-novaulttoken
Disable all authentication methods that get vault tokens.
Currently this equivalent to
Currently this is equivalent to
.IR \-\-nooidc\ \-\-nokerberos\ \-\-nossh .
.BR
.TP
Expand Down
4 changes: 4 additions & 0 deletions htgettoken.spec
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT


%changelog

# - Have htdecodetoken take advantage of new scitokens-verify ability
# to read from stdin, when available.

* Mon Dec 1 2025 Dave Dykstra <dwd@fnal.gov> 2.5-1
- Add htdestroytoken -f option to force a removal of a refresh token in
vault.
Expand Down
Loading