n/anubis-patches-nyx
1
0
Fork 0
forked from Fijxu/anubis-patches
Code Pull requests Activity
anubis-patches-nyx/patches/0002-remove-images-from-captcha.patch

203 lines
8.8 KiB
Diff
Raw Blame History

From b10b01f6ff70ab6d40d8cf90da8057212441d678 Mon Sep 17 00:00:00 2001
From: Fijxu <fijxu@nadeko.net>
Date: Tue, 8 Apr 2025 02:07:27 -0400
Subject: [PATCH 2/2] remove images from captcha
---
web/index.templ | 25 -------------------------
web/index_templ.go | 10 +++++-----
web/js/main.mjs | 13 +------------
3 files changed, 6 insertions(+), 42 deletions(-)
diff --git a/web/index.templ b/web/index.templ
index 01d12b6..4e4d8c6 100644
--- a/web/index.templ
+++ b/web/index.templ
@@ -71,7 +71,6 @@ templ base(title string, body templ.Component, ogTags map[string]string) {
href="https://techaro.lol"
>Techaro</a>. Made with ❤️ in 🇨🇦.
</p>
- <p>Mascot design by <a href="https://bsky.app/profile/celphase.bsky.social">CELPHASE</a>.</p>
</center>
</footer>
</main>
@@ -81,18 +80,6 @@ templ base(title string, body templ.Component, ogTags map[string]string) {
templ index() {
<div class="centered-div">
- <img
- id="image"
- style="width:100%;max-width:256px;"
- src={ "/.within.website/x/cmd/anubis/static/img/pensive.webp?cacheBuster=" +
- anubis.Version }
- />
- <img
- style="display:none;"
- style="width:100%;max-width:256px;"
- src={ "/.within.website/x/cmd/anubis/static/img/happy.webp?cacheBuster=" +
- anubis.Version }
- />
<p id="status">Loading...</p>
<script async type="module" src={
"/.within.website/x/cmd/anubis/static/js/main.mjs?cacheBuster=" + anubis.Version }></script>
@@ -131,12 +118,6 @@ templ index() {
templ errorPage(message string, mail string) {
<div class="centered-div">
- <img
- id="image"
- alt="Sad Anubis"
- style="width:100%;max-width:256px;"
- src={ "/.within.website/x/cmd/anubis/static/img/reject.webp?cacheBuster=" + anubis.Version }
- />
<p>{ message }.</p>
<button onClick="window.location.reload();">Try again</button>
if mail != "" {
@@ -168,12 +149,6 @@ templ bench() {
style="padding-top:0.25rem;display:grid;grid-template-columns:subgrid;grid-auto-rows:min-content;grid-column:1/-1;row-gap:0.25rem;overflow-y:auto;font-variant-numeric:tabular-nums"></tbody>
</table>
<div class="centered-div">
- <img
- id="image"
- style="width:100%;max-width:256px;"
- src={ "/.within.website/x/cmd/anubis/static/img/pensive.webp?cacheBuster=" +
- anubis.Version }
- />
<p id="status" style="max-width:256px">Loading...</p>
<script async type="module" src={
"/.within.website/x/cmd/anubis/static/js/bench.mjs?cacheBuster=" + anubis.Version }></script>
diff --git a/web/index_templ.go b/web/index_templ.go
index e4cece2..bfbec96 100644
--- a/web/index_templ.go
+++ b/web/index_templ.go
@@ -125,7 +125,7 @@ func base(title string, body templ.Component, ogTags map[string]string) templ.Co
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<footer><center><p>Protected by <a href=\"https://github.com/TecharoHQ/anubis\">Anubis</a> from <a href=\"https://techaro.lol\">Techaro</a>. Made with ❤️ in 🇨🇦.</p><p>Mascot design by <a href=\"https://bsky.app/profile/celphase.bsky.social\">CELPHASE</a>.</p></center></footer></main></body></html>")
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<footer><center><p>Protected by <a href=\"https://github.com/TecharoHQ/anubis\">Anubis</a> from <a href=\"https://techaro.lol\">Techaro</a>. Made with ❤️ in 🇨🇦.</p></center></footer></main></body></html>")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -162,7 +162,7 @@ func index() templ.Component {
templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(
"/.within.website/x/cmd/anubis/static/js/main.mjs?cacheBuster=" + anubis.Version)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 86, Col: 84}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 85, Col: 84}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
if templ_7745c5c3_Err != nil {
@@ -204,7 +204,7 @@ func errorPage(message string, mail string) templ.Component {
var templ_7745c5c3_Var10 string
templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(message)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 122, Col: 16}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 121, Col: 16}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
if templ_7745c5c3_Err != nil {
@@ -231,7 +231,7 @@ func errorPage(message string, mail string) templ.Component {
var templ_7745c5c3_Var12 string
templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(mail)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 126, Col: 9}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 125, Col: 9}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
if templ_7745c5c3_Err != nil {
@@ -284,7 +284,7 @@ func bench() templ.Component {
templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(
"/.within.website/x/cmd/anubis/static/js/bench.mjs?cacheBuster=" + anubis.Version)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 155, Col: 89}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 154, Col: 89}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
if templ_7745c5c3_Err != nil {
diff --git a/web/js/main.mjs b/web/js/main.mjs
index a093c74..94f6458 100644
--- a/web/js/main.mjs
+++ b/web/js/main.mjs
@@ -14,9 +14,6 @@ const u = (url = "", params = {}) => {
return result.toString();
};
-const imageURL = (mood, cacheBuster) =>
- u(`/.within.website/x/cmd/anubis/static/img/${mood}.webp`, { cacheBuster });
-
const dependencies = [
{
name: "WebCrypto",
@@ -77,7 +74,6 @@ function showContinueBar(hash, nonce, t0, t1) {
(async () => {
const status = document.getElementById('status');
- const image = document.getElementById('image');
const title = document.getElementById('title');
const progress = document.getElementById('progress');
const anubisVersion = JSON.parse(document.getElementById('anubis_version').textContent);
@@ -92,10 +88,9 @@ function showContinueBar(hash, nonce, t0, t1) {
});
}
- const ohNoes = ({ titleMsg, statusMsg, imageSrc }) => {
+ const ohNoes = ({ titleMsg, statusMsg }) => {
title.innerHTML = titleMsg;
status.innerHTML = statusMsg;
- image.src = imageSrc;
progress.style.display = "none";
};
@@ -103,7 +98,6 @@ function showContinueBar(hash, nonce, t0, t1) {
ohNoes({
titleMsg: "Your context is not secure!",
statusMsg: `Try connecting over HTTPS or let the admin know to set up HTTPS. For more information, see <a href="https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts#when_is_a_context_considered_secure">MDN</a>.`,
- imageSrc: imageURL("reject", anubisVersion),
});
return;
}
@@ -128,7 +122,6 @@ function showContinueBar(hash, nonce, t0, t1) {
ohNoes({
titleMsg: `Missing feature ${name}`,
statusMsg: msg,
- imageSrc: imageURL("reject", anubisVersion),
});
}
}
@@ -142,7 +135,6 @@ function showContinueBar(hash, nonce, t0, t1) {
ohNoes({
titleMsg: "Internal error!",
statusMsg: `Failed to fetch challenge config: ${err.message}`,
- imageSrc: imageURL("reject", anubisVersion),
});
throw err;
});
@@ -152,7 +144,6 @@ function showContinueBar(hash, nonce, t0, t1) {
ohNoes({
titleMsg: "Challenge error!",
statusMsg: `Failed to resolve check algorithm. You may want to reload the page.`,
- imageSrc: imageURL("reject", anubisVersion),
});
return;
}
@@ -210,7 +201,6 @@ function showContinueBar(hash, nonce, t0, t1) {
title.innerHTML = "Success!";
status.innerHTML = `Done! Took ${t1 - t0}ms, ${nonce} iterations`;
- image.src = imageURL("happy", anubisVersion);
progress.style.display = "none";
if (userReadDetails) {
@@ -265,7 +255,6 @@ function showContinueBar(hash, nonce, t0, t1) {
ohNoes({
titleMsg: "Calculation error!",
statusMsg: `Failed to calculate challenge: ${err.message}`,
- imageSrc: imageURL("reject", anubisVersion),
});
}
})();
\ No newline at end of file
--
2.49.0
View git blame Copy permalink