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

Put recovery script directories in variables
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 16:50:53 -05:00
parent d5f8e1db7f
commit da0d4e3a3b
Signed by: cobra
GPG Key ID: 4FD8F812083FF6F9
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
en/recovery-challenge.cgi
View File

@ -8,6 +8,9 @@ do
declare arg_${parm[i]}=${parm[i+1]}
done
runtime_dir=/var/log/challenges
gpg_home="$runtime_dir"/.gnupg
urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
sig="$(urldecode "$arg_signature")"
key="$(urldecode "$arg_newkey")"
@ -26,7 +29,7 @@ generate_challenge() {
page=default
return
fi
openssl rand -hex 32 > "/var/log/challenges/$arg_username"
openssl rand -hex 32 > "$runtime_dir/$arg_username"
page=submit
return
}
@ -57,16 +60,16 @@ submit_challenge() {
page=default
return
fi
echo "$sig" > "/var/log/challenges/$arg_username.gpg"
gpg --homedir /var/log/challenges --import "/vm/$arg_username/.pgp.asc" &> /dev/null
if gpg --homedir /var/log/challenges \
echo "$sig" > "$runtime_dir/$arg_username.gpg"
gpg --homedir "$gpg_home" --import "/vm/$arg_username/.pgp.asc" &> /dev/null
if gpg --homedir "$gpg_home" \
--trust-model always \
--verify "/var/log/challenges/$arg_username.gpg" \
"/var/log/challenges/$arg_username" &> /dev/null; then
if [[ "$(gpg --homedir /var/log/challenges \
--verify "$runtime_dir/$arg_username.gpg" \
"$runtime_dir/$arg_username" &> /dev/null; then
if [[ "$(gpg --homedir $gpg_home \
--trust-model always \
--verify "/var/log/challenges/$arg_username.gpg" \
"/var/log/challenges/$arg_username" 2>&1 |
--verify "$runtime_dir/$arg_username.gpg" \
"$runtime_dir/$arg_username" 2>&1 |
sed -n 's/.*using.*key \(.*\)/\1/p')" == \
"$keyid" ]]; then
echo "$key" >> "/vm/$username/.ssh/authorized_keys"
@ -101,7 +104,7 @@ case "$arg_method" in
;;
esac
sedcmd=" -e 's/USERNAME/$arg_username/' -e 's/CHALLENGE/$(</var/log/challenges/$arg_username)/' -e 's/KEYID/$keyid/'"
sedcmd=" -e 's/USERNAME/$arg_username/' -e 's/CHALLENGE/$(<$runtime_dir/$arg_username)/' -e 's/KEYID/$keyid/'"
sedcmd="$sedcmd $(if [[ $nokey == 1 ]]; then
printf '%s' '-e "s/NOKEY/This user has no <code>.pgp.asc</code> file/"'
else