diff --git a/anubis b/anubis index b15017d..6daf082 160000 --- a/anubis +++ b/anubis @@ -1 +1 @@ -Subproject commit b15017d097666b40124ccc07c697d60a25a38ec8 +Subproject commit 6daf08216e0856b0c16c7e1c9a045a4d89cbca4d diff --git a/patches/0001-xess-change-default-background-color.patch b/patches/0001-xess-change-default-background-color.patch index 9f14544..dcaeab5 100644 --- a/patches/0001-xess-change-default-background-color.patch +++ b/patches/0001-xess-change-default-background-color.patch @@ -1,126 +1,25 @@ -From 70e6958d69a18ed6d0a6ff2c16c1c1fbdb06361a Mon Sep 17 00:00:00 2001 +From 11d4f6fd20a6f0d016f8016a7d487cfe48c93e2f Mon Sep 17 00:00:00 2001 From: Fijxu Date: Sun, 30 Mar 2025 01:06:20 -0300 -Subject: [PATCH 1/3] xess: change default background color +Subject: [PATCH 1/2] xess: change default background color --- - web/index_templ.go | 20 ++++++++++---------- - xess/xess.css | 4 ++-- - 2 files changed, 12 insertions(+), 12 deletions(-) + xess/xess.css | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/web/index_templ.go b/web/index_templ.go -index 7f501e3..0bc3cf2 100644 ---- a/web/index_templ.go -+++ b/web/index_templ.go -@@ -96,7 +96,7 @@ func base(title string, body templ.Component, challenge any, ogTags map[string]s - return templ_7745c5c3_Err - } - } -- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "") -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } -@@ -117,7 +117,7 @@ func base(title string, body templ.Component, challenge any, ogTags map[string]s - var templ_7745c5c3_Var6 string - templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(title) - if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 67, Col: 52} -+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 65, Col: 52} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) - if templ_7745c5c3_Err != nil { -@@ -168,7 +168,7 @@ func index() templ.Component { - templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs("/.within.website/x/cmd/anubis/static/img/pensive.webp?cacheBuster=" + - anubis.Version) - if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 91, Col: 18} -+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 89, Col: 18} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) - if templ_7745c5c3_Err != nil { -@@ -182,7 +182,7 @@ func index() templ.Component { - templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs("/.within.website/x/cmd/anubis/static/img/happy.webp?cacheBuster=" + - anubis.Version) - if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 97, Col: 18} -+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 95, Col: 18} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) - if templ_7745c5c3_Err != nil { -@@ -196,7 +196,7 @@ func index() templ.Component { - templ_7745c5c3_Var10, 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: 101, Col: 84} -+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 99, Col: 84} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) - if templ_7745c5c3_Err != nil { -@@ -238,7 +238,7 @@ func errorPage(message string, mail string) templ.Component { - var templ_7745c5c3_Var12 string - templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs("/.within.website/x/cmd/anubis/static/img/reject.webp?cacheBuster=" + anubis.Version) - if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 141, Col: 102} -+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 139, Col: 102} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) - if templ_7745c5c3_Err != nil { -@@ -251,7 +251,7 @@ func errorPage(message string, mail string) templ.Component { - var templ_7745c5c3_Var13 string - templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(message) - if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 143, Col: 16} -+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 141, Col: 16} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) - if templ_7745c5c3_Err != nil { -@@ -278,7 +278,7 @@ func errorPage(message string, mail string) templ.Component { - var templ_7745c5c3_Var15 string - templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(mail) - if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 147, Col: 9} -+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 145, Col: 9} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) - if templ_7745c5c3_Err != nil { -@@ -331,7 +331,7 @@ func bench() templ.Component { - templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs("/.within.website/x/cmd/anubis/static/img/pensive.webp?cacheBuster=" + - anubis.Version) - if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 178, Col: 22} -+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 176, Col: 22} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) - if templ_7745c5c3_Err != nil { -@@ -345,7 +345,7 @@ func bench() templ.Component { - templ_7745c5c3_Var18, 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: 182, Col: 89} -+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 180, Col: 89} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18)) - if templ_7745c5c3_Err != nil { diff --git a/xess/xess.css b/xess/xess.css -index 86cbd42..94c7deb 100644 +index c07143f..497317c 100644 --- a/xess/xess.css +++ b/xess/xess.css -@@ -33,12 +33,12 @@ main { - } +@@ -3,7 +3,7 @@ + --body-preformatted-font: Iosevka Curly Iaso, monospace; + --body-title-font: Podkova, serif; - body { -- background: #1d2021; -+ background: #181818; - color: #f9f5d7; - } - - pre { -- background-color: #3c3836; -+ background-color: #181818; - padding: 1em; - border: 0; - font-family: Iosevka Curly Iaso, monospace; +- --dark-background: #1d2021; ++ --dark-background: #181818; + --dark-text: #f9f5d7; + --dark-text-selection: #d3869b; + --dark-preformatted-background: #3c3836; -- 2.49.0 diff --git a/patches/0002-add-option-to-enable-or-disable-the-anubis-mascot.patch b/patches/0002-add-option-to-enable-or-disable-the-anubis-mascot.patch index 561f755..42a1901 100644 --- a/patches/0002-add-option-to-enable-or-disable-the-anubis-mascot.patch +++ b/patches/0002-add-option-to-enable-or-disable-the-anubis-mascot.patch @@ -1,31 +1,31 @@ -From c039d0ac8dac7808fd77bd725f93d8626e50e3f3 Mon Sep 17 00:00:00 2001 +From e2dd5f9982304f41aeb7002f5ccbaf9e60d96a18 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 14 Apr 2025 15:37:58 -0400 -Subject: [PATCH 2/3] add option to enable or disable the anubis mascot +Subject: [PATCH 2/2] add option to enable or disable the anubis mascot --- anubis.go | 2 + cmd/anubis/main.go | 1 + - web/index.templ | 11 +++ - web/index_templ.go | 168 +++++++++++++++++++++++++++++---------------- + web/index.templ | 9 +++ + web/index_templ.go | 178 ++++++++++++++++++++++++++++----------------- web/js/main.mjs | 15 ++-- - 5 files changed, 132 insertions(+), 65 deletions(-) + 5 files changed, 132 insertions(+), 73 deletions(-) diff --git a/anubis.go b/anubis.go -index b184a45..7ba4e0c 100644 +index d626ebc..6c23e00 100644 --- a/anubis.go +++ b/anubis.go -@@ -17,3 +17,5 @@ const StaticPath = "/.within.website/x/cmd/anubis/" +@@ -23,3 +23,5 @@ const APIPrefix = "/.within.website/x/cmd/anubis/api/" // DefaultDifficulty is the default "difficulty" (number of leading zeroes) // that must be met by the client in order to pass the challenge. const DefaultDifficulty = 4 + +var EnableMascot = false diff --git a/cmd/anubis/main.go b/cmd/anubis/main.go -index 724f88a..544c639 100644 +index ff2d14f..c82540d 100644 --- a/cmd/anubis/main.go +++ b/cmd/anubis/main.go -@@ -169,6 +169,7 @@ func startDecayMapCleanup(ctx context.Context, s *libanubis.Server) { +@@ -174,6 +174,7 @@ func startDecayMapCleanup(ctx context.Context, s *libanubis.Server) { } func main() { @@ -34,39 +34,42 @@ index 724f88a..544c639 100644 flag.Parse() diff --git a/web/index.templ b/web/index.templ -index 989d717..3d9a54a 100644 +index 872c8b1..969b339 100644 --- a/web/index.templ +++ b/web/index.templ -@@ -57,6 +57,7 @@ templ base(title string, body templ.Component, challenge any, ogTags map[string] - if challenge != nil { - @templ.JSONScript("anubis_challenge", challenge) - } -+ @templ.JSONScript("enable_mascot", anubis.EnableMascot) - - - -@@ -72,7 +73,9 @@ templ base(title string, body templ.Component, challenge any, ogTags map[string] - href="https://techaro.lol" - >Techaro. Made with ❤️ in 🇨🇦. -

-+ if anubis.EnableMascot { -

Mascot design by CELPHASE.

-+ } - - - -@@ -82,18 +85,22 @@ templ base(title string, body templ.Component, challenge any, ogTags map[string] +@@ -60,6 +60,7 @@ templ base(title string, body templ.Component, challenge any, ogTags map[string] + @templ.JSONScript("anubis_challenge", challenge) + } + @templ.JSONScript("anubis_base_prefix", anubis.BasePrefix) ++ @templ.JSONScript("enable_mascot", anubis.EnableMascot) + + +
+@@ -84,8 +85,10 @@ templ base(title string, body templ.Component, challenge any, ogTags map[string] templ index() { +
++ if anubis.EnableMascot { + Loading...

+ -@@ -132,12 +139,14 @@ templ index() { - - templ errorPage(message string, mail string) { -
-+ if anubis.EnableMascot { - Sad AnubisTry again - if mail != "" { -@@ -169,12 +178,14 @@ 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"> - -
-+ if anubis.EnableMascot { - Loading...

- +
diff --git a/web/index_templ.go b/web/index_templ.go -index 0bc3cf2..bfc705b 100644 +index 35638b3..4a1756e 100644 --- a/web/index_templ.go +++ b/web/index_templ.go -@@ -110,6 +110,10 @@ func base(title string, body templ.Component, challenge any, ogTags map[string]s - return templ_7745c5c3_Err - } +@@ -114,6 +114,10 @@ func base(title string, body templ.Component, challenge any, ogTags map[string]s + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } + templ_7745c5c3_Err = templ.JSONScript("enable_mascot", anubis.EnableMascot).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { @@ -123,296 +106,307 @@ index 0bc3cf2..bfc705b 100644 templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err -@@ -117,7 +121,7 @@ func base(title string, body templ.Component, challenge any, ogTags map[string]s +@@ -121,7 +125,7 @@ func base(title string, body templ.Component, challenge any, ogTags map[string]s var templ_7745c5c3_Var6 string templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(title) if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 65, Col: 52} -+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 66, Col: 52} +- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 67, Col: 49} ++ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 68, Col: 49} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) if templ_7745c5c3_Err != nil { -@@ -131,7 +135,17 @@ func base(title string, body templ.Component, challenge any, ogTags map[string]s - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } -- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "

") -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "

Protected by Anubis from Techaro. Made with ❤️ in 🇨🇦.

") -+ if templ_7745c5c3_Err != nil { -+ return templ_7745c5c3_Err -+ } -+ if anubis.EnableMascot { -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "

Mascot design by CELPHASE.

") -+ if templ_7745c5c3_Err != nil { -+ return templ_7745c5c3_Err -+ } -+ } -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "
") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } -@@ -160,35 +174,51 @@ func index() templ.Component { +@@ -164,46 +168,56 @@ func index() templ.Component { templ_7745c5c3_Var7 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "
") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } -- var templ_7745c5c3_Var8 string -- templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs("/.within.website/x/cmd/anubis/static/img/pensive.webp?cacheBuster=" + -- anubis.Version) - if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 89, Col: 18} +- return templ_7745c5c3_Err +- } +- var templ_7745c5c3_Var8 string +- templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/img/pensive.webp?cacheBuster=" + anubis.Version) +- if templ_7745c5c3_Err != nil { +- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 87, Col: 165} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "\"> ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } +- var templ_7745c5c3_Var9 string +- templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/img/happy.webp?cacheBuster=" + anubis.Version) +- if templ_7745c5c3_Err != nil { +- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 88, Col: 174} +- } +- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err -- } -- var templ_7745c5c3_Var9 string -- templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs("/.within.website/x/cmd/anubis/static/img/happy.webp?cacheBuster=" + -- anubis.Version) -- if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 95, Col: 18} + if anubis.EnableMascot { -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, " ") -+ if templ_7745c5c3_Err != nil { -+ return templ_7745c5c3_Err -+ } - } -- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) -- if templ_7745c5c3_Err != nil { -- return templ_7745c5c3_Err -+ if anubis.EnableMascot { -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, " ") ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "\">") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "\">

Loading...

Why am I seeing this?

You are seeing this because the administrator of this website has set up Anubis to protect the server against the scourge of AI companies aggressively scraping websites. This can and does cause downtime for the websites, which makes their resources inaccessible for everyone.

Anubis is a compromise. Anubis uses a Proof-of-Work scheme in the vein of Hashcash, a proposed proof-of-work scheme for reducing email spam. The idea is that at individual scales the additional load is ignorable, but at mass scraper levels it adds up and makes scraping much more expensive.

Ultimately, this is a hack whose real purpose is to give a \"good enough\" placeholder solution so that more time can be spent on fingerprinting and identifying headless browsers (EG: via how they do font rendering) so that the challenge proof of work page doesn't need to be presented to users that are much more likely to be legitimate.

Please note that Anubis requires the use of modern JavaScript features that plugins like JShelter will disable. Please disable JShelter or other such plugins for this domain.

") -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\">
Why am I seeing this?

You are seeing this because the administrator of this website has set up Anubis to protect the server against the scourge of AI companies aggressively scraping websites. This can and does cause downtime for the websites, which makes their resources inaccessible for everyone.

Anubis is a compromise. Anubis uses a Proof-of-Work scheme in the vein of Hashcash, a proposed proof-of-work scheme for reducing email spam. The idea is that at individual scales the additional load is ignorable, but at mass scraper levels it adds up and makes scraping much more expensive.

Ultimately, this is a hack whose real purpose is to give a \"good enough\" placeholder solution so that more time can be spent on fingerprinting and identifying headless browsers (EG: via how they do font rendering) so that the challenge proof of work page doesn't need to be presented to users that are much more likely to be legitimate.

Please note that Anubis requires the use of modern JavaScript features that plugins like JShelter will disable. Please disable JShelter or other such plugins for this domain.

") ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\">
Why am I seeing this?

You are seeing this because the administrator of this website has set up Anubis to protect the server against the scourge of AI companies aggressively scraping websites. This can and does cause downtime for the websites, which makes their resources inaccessible for everyone.

Anubis is a compromise. Anubis uses a Proof-of-Work scheme in the vein of Hashcash, a proposed proof-of-work scheme for reducing email spam. The idea is that at individual scales the additional load is ignorable, but at mass scraper levels it adds up and makes scraping much more expensive.

Ultimately, this is a hack whose real purpose is to give a \"good enough\" placeholder solution so that more time can be spent on fingerprinting and identifying headless browsers (EG: via how they do font rendering) so that the challenge proof of work page doesn't need to be presented to users that are much more likely to be legitimate.

Please note that Anubis requires the use of modern JavaScript features that plugins like JShelter will disable. Please disable JShelter or other such plugins for this domain.

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } -@@ -231,38 +261,48 @@ func errorPage(message string, mail string) templ.Component { +@@ -232,38 +246,48 @@ func errorPage(message string, mail string) templ.Component { templ_7745c5c3_Var11 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "
\"Sad") ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var12 string -- templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs("/.within.website/x/cmd/anubis/static/img/reject.webp?cacheBuster=" + anubis.Version) +- templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/img/reject.webp?cacheBuster=" + anubis.Version) - if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 139, Col: 102} +- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 140, Col: 181} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err + if anubis.EnableMascot { -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "\"Sad") ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\">") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\">

") -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "

") ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var13 string templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(message) if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 141, Col: 16} -+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 150, Col: 16} +- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 141, Col: 14} ++ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 146, Col: 14} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, ".

") -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, ".

") ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, ".

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if mail != "" { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "

Go home or if you believe you should not be blocked, please contact the webmaster at Go home or if you believe you should not be blocked, please contact the webmaster at Go home or if you believe you should not be blocked, please contact the webmaster at ") -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "\">") ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var15 string templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(mail) if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 145, Col: 9} -+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 154, Col: 9} +- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 147, Col: 11} ++ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 152, Col: 11} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "

") -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "

") ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "

Go home

") -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "

Go home

") ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "

Go home

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "
") -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "
") ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } -@@ -323,21 +363,31 @@ func bench() templ.Component { +@@ -324,21 +348,31 @@ func StaticHappy() templ.Component { templ_7745c5c3_Var16 = templ.NopComponent } ctx = templ.ClearChildren(ctx) -- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "
TimeIters
Time AIters ATime BIters B
TimeIters
Time AIters ATime BIters B
") +- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var17 string -- templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs("/.within.website/x/cmd/anubis/static/img/pensive.webp?cacheBuster=" + +- templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs("/.within.website/x/cmd/anubis/static/img/happy.webp?cacheBuster=" + - anubis.Version) - if templ_7745c5c3_Err != nil { -- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 176, Col: 22} +- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 162, Col: 18} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err + if anubis.EnableMascot { -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "") ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "\">") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } } -- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "\">

Loading...

") -+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "\">
") +- var templ_7745c5c3_Var19 string +- templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/img/pensive.webp?cacheBuster=" + anubis.Version) +- if templ_7745c5c3_Err != nil { +- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 191, Col: 166} +- } +- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19)) +- if templ_7745c5c3_Err != nil { +- return templ_7745c5c3_Err ++ if anubis.EnableMascot { ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "") ++ if templ_7745c5c3_Err != nil { ++ return templ_7745c5c3_Err ++ } + } +- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "\">

Loading...

") ++ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "\">
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/web/js/main.mjs b/web/js/main.mjs -index 9bb6031..7203bfd 100644 +index c50ed2b..b0474c8 100644 --- a/web/js/main.mjs +++ b/web/js/main.mjs -@@ -81,6 +81,7 @@ function showContinueBar(hash, nonce, t0, t1) { - const title = document.getElementById('title'); +@@ -82,6 +82,7 @@ function showContinueBar(hash, nonce, t0, t1) { const progress = document.getElementById('progress'); const anubisVersion = JSON.parse(document.getElementById('anubis_version').textContent); + const basePrefix = JSON.parse(document.getElementById('anubis_base_prefix').textContent); + const enableMascot = JSON.parse(document.getElementById('enable_mascot').textContent); const details = document.querySelector('details'); let userReadDetails = false; -@@ -95,7 +96,7 @@ function showContinueBar(hash, nonce, t0, t1) { +@@ -96,7 +97,7 @@ function showContinueBar(hash, nonce, t0, t1) { const ohNoes = ({ titleMsg, statusMsg, imageSrc }) => { title.innerHTML = titleMsg; status.innerHTML = statusMsg; @@ -421,50 +415,50 @@ index 9bb6031..7203bfd 100644 progress.style.display = "none"; }; -@@ -103,7 +104,7 @@ function showContinueBar(hash, nonce, t0, t1) { +@@ -104,7 +105,7 @@ 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 MDN.`, -- imageSrc: imageURL("reject", anubisVersion), -+ ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion) }), +- imageSrc: imageURL("reject", anubisVersion, basePrefix), ++ ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion, basePrefix) }), }); return; } -@@ -128,7 +129,7 @@ function showContinueBar(hash, nonce, t0, t1) { +@@ -129,7 +130,7 @@ function showContinueBar(hash, nonce, t0, t1) { ohNoes({ titleMsg: `Missing feature ${name}`, statusMsg: msg, -- imageSrc: imageURL("reject", anubisVersion), -+ ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion) }), +- imageSrc: imageURL("reject", anubisVersion, basePrefix), ++ ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion, basePrefix) }), }); } } -@@ -140,7 +141,7 @@ function showContinueBar(hash, nonce, t0, t1) { +@@ -141,7 +142,7 @@ 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), -+ ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion) }), +- imageSrc: imageURL("reject", anubisVersion, basePrefix), ++ ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion, basePrefix) }), }); return; } -@@ -198,7 +199,9 @@ function showContinueBar(hash, nonce, t0, t1) { +@@ -199,7 +200,9 @@ function showContinueBar(hash, nonce, t0, t1) { title.innerHTML = "Success!"; status.innerHTML = `Done! Took ${t1 - t0}ms, ${nonce} iterations`; -- image.src = imageURL("happy", anubisVersion); +- image.src = imageURL("happy", anubisVersion, basePrefix); + if (enableMascot) { -+ image.src = imageURL("happy", anubisVersion); ++ image.src = imageURL("happy", anubisVersion, basePrefix); + } progress.style.display = "none"; if (userReadDetails) { -@@ -253,7 +256,7 @@ function showContinueBar(hash, nonce, t0, t1) { +@@ -254,7 +257,7 @@ function showContinueBar(hash, nonce, t0, t1) { ohNoes({ titleMsg: "Calculation error!", statusMsg: `Failed to calculate challenge: ${err.message}`, -- imageSrc: imageURL("reject", anubisVersion), -+ ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion) }) +- imageSrc: imageURL("reject", anubisVersion, basePrefix), ++ ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion, basePrefix) }) }); } })(); diff --git a/patches/0003-disable-secure-context.patch b/patches/0003-disable-secure-context.patch deleted file mode 100644 index e0c8353..0000000 --- a/patches/0003-disable-secure-context.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1555f2c81ee223d1e923050841bd8ba4bfe6e11c Mon Sep 17 00:00:00 2001 -From: Fijxu -Date: Sun, 20 Apr 2025 17:23:17 -0400 -Subject: [PATCH 3/3] disable secure context - ---- - web/js/main.mjs | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/web/js/main.mjs b/web/js/main.mjs -index 7203bfd..d250aa8 100644 ---- a/web/js/main.mjs -+++ b/web/js/main.mjs -@@ -100,14 +100,14 @@ function showContinueBar(hash, nonce, t0, t1) { - progress.style.display = "none"; - }; - -- if (!window.isSecureContext) { -- 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 MDN.`, -- ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion) }), -- }); -- return; -- } -+ // if (!window.isSecureContext) { -+ // 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 MDN.`, -+ // ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion) }), -+ // }); -+ // return; -+ // } - - // const testarea = document.getElementById('testarea'); - --- -2.49.0 -