vern
/
website
4
4
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move & escape to correct location, redirect to submit page when submit errors
ci/woodpecker/push/woodpecker Pipeline was successful Details 

Signed-off-by: Skylar "The Cobra" Widulski <cobra@vern.cc>
This commit is contained in:
Skylar "The Cobra" Widulski 2023-11-22 17:40:29 -05:00
parent 37dcc331a6
commit 64a0480c0e
Signed by: cobra
GPG Key ID: 4FD8F812083FF6F9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
en/recovery-challenge.cgi
View File

@ -37,27 +37,27 @@ generate_challenge() {
submit_challenge() {
if [[ -z "$arg_username" ]]; then
nouser=1
page=default
page=submit
return
fi
if [[ -z "$key" ]]; then
nossh=1
page=default
page=submit
return
fi
if ! ssh-keygen -l -f /dev/stdin <<< "$key" &> /dev/null; then
badssh=1
page=default
page=submit
return
fi
if ! gpg --import-options show-only --import "/vm/$arg_username/.pgp.asc" &> /dev/null; then
nokey=1
page=default
page=submit
return
fi
if [[ -z "$sig" ]]; then
nosig=1
page=default
page=submit
return
fi
echo "$sig" > "$runtime_dir/$arg_username.gpg"
@ -106,7 +106,7 @@ case "$arg_method" in
;;
esac
sedcmd=" -e 's/USERNAME/$arg_username/' -e 's/CHALLENGE/$(<$runtime_dir/$arg_username)/' -e 's/KEYID/$keyid/' -e 's\\NAV\\$(php $(dirname $0)/nav.php | sed 's/\&/\\\&/g')\\' -e 's\\FOOTER\\$($(dirname $0)/footer.cgi | sed '1,2d')\\'"
sedcmd=" -e 's/USERNAME/$arg_username/' -e 's/CHALLENGE/$(<$runtime_dir/$arg_username)/' -e 's/KEYID/$keyid/' -e 's\\NAV\\$(php $(dirname $0)/nav.php | sed 's/\&/\\\&/g')\\' -e 's\\FOOTER\\$($(dirname $0)/footer.cgi | sed '1,2d;s/\&/\\\&/g')\\'"
sedcmd="$sedcmd $(if [[ $nokey == 1 ]]; then
printf '%s' '-e "s/NOKEY/This user has no <code>.pgp.asc</code> file/"'
else