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

Move <br> in other files
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:36:11 -05:00
parent ea39651af2
commit 37dcc331a6
Signed by: cobra
GPG Key ID: 4FD8F812083FF6F9
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
en/recovery-challenge.cgi
View File

@ -12,7 +12,7 @@ runtime_dir=/var/log/challenges
gpg_home="$runtime_dir"/.gnupg
urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
sig="$(urldecode "$arg_signature")"
sig="$(urldecode "$arg_signature" | sed 's/\r//g')"
key="$(urldecode "$arg_newkey")"
if [[ $arg_username ]]; then
keyid="$(gpg --import-options show-only --import "/vm/$arg_username/.pgp.asc" 2>&1 | grep '^ ' | xargs)"
@ -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)\\' -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')\\'"
sedcmd="$sedcmd $(if [[ $nokey == 1 ]]; then
printf '%s' '-e "s/NOKEY/This user has no <code>.pgp.asc</code> file/"'
else

10
en/recovery-scripts/pgp/submit.html
View File

@ -12,21 +12,21 @@
NAV
<div class=h><h1 id=pgp-recovery>PGP-based Account Recovery</h1> <a aria-hidden=true href=#pgp-recovery>#pgp-recovery</a></div>
<p>Generate your signature by going into a terminal and running the following:</p>
<pre><code>echo 'CHALLENGE' | gpg -a --detach-sig --default-key KEYID</code></pre>
<pre style='white-space:pre-line;word-break:keep-all;'><code>echo 'CHALLENGE' | gpg -a --detach-sig --default-key KEYID</code></pre>
<form method="post" action="/en/recovery-challenge">
<input hidden type=text name=method value="submit">
<p>Username:
<input type=text name=username value=USERNAME>
<span class=red>NOUSERNOKEY</span></p>
<p>New SSH key(s): <span class=red>NOSSHBADSSH</span>
<p>New SSH key(s): <span class=red>NOSSHBADSSH</span><br>
<textarea name=newkey rows=3 cols=50></textarea></p>
<p>Signature: <span class=red>NOSIGBADSIG</span>
<textarea name=singature rows=10 cols=50></textarea></p>
<p>Signature: <span class=red>NOSIGBADSIG</span><br>
<textarea name=singature rows=15 cols=60></textarea></p>
<br>
<span><input type=submit value=Submit style="width:100px;height:40px;font-size:20px"></span>
</form>
<br>
FOOTER
</body>
</html>

1
en/recovery-scripts/pgp/success.html
View File

@ -14,6 +14,7 @@
<div class=h><h1 id=pgp-recovery>PGP-based Account Recovery</h1> <a aria-hidden=true href=#pgp-recovery>#pgp-recovery</a></div>
<p>Your new key has successfully been added.</p>
<p>You will be redirected back <a href=/en/>home</a> in 5 seconds.</p>
<br>
FOOTER
</body>
</html>