o: handle expired bypass requests gracefully in approve/deny
This commit is contained in:
parent
1663d2d212
commit
2c8b301a59
|
|
@ -349,8 +349,16 @@ cmd_approve() {
|
||||||
|
|
||||||
echo "[$id] approving: $cmd"
|
echo "[$id] approving: $cmd"
|
||||||
echo " cwd: $cwd"
|
echo " cwd: $cwd"
|
||||||
printf '%s approve' "$id" | ollie-9p write "$bypass_path"
|
local result
|
||||||
echo "approved"
|
result=$(printf '%s approve' "$id" | ollie-9p write "$bypass_path" 2>&1)
|
||||||
|
if [[ $? -eq 0 ]]; then
|
||||||
|
echo "approved"
|
||||||
|
elif [[ "$result" == *"unknown request ID"* ]]; then
|
||||||
|
echo "request already resolved (expired or handled elsewhere)"
|
||||||
|
else
|
||||||
|
echo "error: $result" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_deny() {
|
cmd_deny() {
|
||||||
|
|
@ -396,8 +404,16 @@ cmd_deny() {
|
||||||
|
|
||||||
echo "[$id] denying: $cmd"
|
echo "[$id] denying: $cmd"
|
||||||
echo " cwd: $cwd"
|
echo " cwd: $cwd"
|
||||||
printf '%s deny' "$id" | ollie-9p write "$bypass_path"
|
local result
|
||||||
echo "denied"
|
result=$(printf '%s deny' "$id" | ollie-9p write "$bypass_path" 2>&1)
|
||||||
|
if [[ $? -eq 0 ]]; then
|
||||||
|
echo "denied"
|
||||||
|
elif [[ "$result" == *"unknown request ID"* ]]; then
|
||||||
|
echo "request already resolved (expired or handled elsewhere)"
|
||||||
|
else
|
||||||
|
echo "error: $result" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_new() {
|
cmd_new() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue