Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
| c30be4c6bb |
3 changed files with 43 additions and 482 deletions
2
anubis
2
anubis
|
|
@ -1 +1 @@
|
|||
Subproject commit 6daf08216e0856b0c16c7e1c9a045a4d89cbca4d
|
||||
Subproject commit 16145049223cfb68c7a98bfc2cf0ef56f7e28ff5
|
||||
|
|
@ -1,25 +1,54 @@
|
|||
From 11d4f6fd20a6f0d016f8016a7d487cfe48c93e2f Mon Sep 17 00:00:00 2001
|
||||
From 41e56a7922608b27ec50c35591223ea71afedad8 Mon Sep 17 00:00:00 2001
|
||||
From: Fijxu <fijxu@nadeko.net>
|
||||
Date: Sun, 30 Mar 2025 01:06:20 -0300
|
||||
Subject: [PATCH 1/2] xess: change default background color
|
||||
Subject: [PATCH] xess: change default background color
|
||||
|
||||
---
|
||||
xess/xess.css | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
web/index_templ.go | 4 ++--
|
||||
xess/xess.css | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/web/index_templ.go b/web/index_templ.go
|
||||
index 2e3ac49..eb99b3a 100644
|
||||
--- a/web/index_templ.go
|
||||
+++ b/web/index_templ.go
|
||||
@@ -251,7 +251,7 @@ func bench() templ.Component {
|
||||
templ_7745c5c3_Var13, 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: 247, Col: 19}
|
||||
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 148, Col: 19}
|
||||
}
|
||||
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
|
||||
if templ_7745c5c3_Err != nil {
|
||||
@@ -264,7 +264,7 @@ func bench() templ.Component {
|
||||
var templ_7745c5c3_Var14 string
|
||||
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: 250, Col: 118}
|
||||
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 151, Col: 118}
|
||||
}
|
||||
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
|
||||
if templ_7745c5c3_Err != nil {
|
||||
diff --git a/xess/xess.css b/xess/xess.css
|
||||
index c07143f..497317c 100644
|
||||
index 86cbd42..94c7deb 100644
|
||||
--- a/xess/xess.css
|
||||
+++ b/xess/xess.css
|
||||
@@ -3,7 +3,7 @@
|
||||
--body-preformatted-font: Iosevka Curly Iaso, monospace;
|
||||
--body-title-font: Podkova, serif;
|
||||
@@ -33,12 +33,12 @@ main {
|
||||
}
|
||||
|
||||
- --dark-background: #1d2021;
|
||||
+ --dark-background: #181818;
|
||||
--dark-text: #f9f5d7;
|
||||
--dark-text-selection: #d3869b;
|
||||
--dark-preformatted-background: #3c3836;
|
||||
body {
|
||||
- background: #1d2021;
|
||||
+ background: #181818;
|
||||
color: #f9f5d7;
|
||||
}
|
||||
|
||||
pre {
|
||||
- background-color: #3c3836;
|
||||
+ background-color: #181818;
|
||||
padding: 1em;
|
||||
border: 0;
|
||||
font-family: Iosevka Curly Iaso, monospace;
|
||||
--
|
||||
2.49.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,468 +0,0 @@
|
|||
From e2dd5f9982304f41aeb7002f5ccbaf9e60d96a18 Mon Sep 17 00:00:00 2001
|
||||
From: Fijxu <fijxu@nadeko.net>
|
||||
Date: Mon, 14 Apr 2025 15:37:58 -0400
|
||||
Subject: [PATCH 2/2] add option to enable or disable the anubis mascot
|
||||
|
||||
---
|
||||
anubis.go | 2 +
|
||||
cmd/anubis/main.go | 1 +
|
||||
web/index.templ | 9 +++
|
||||
web/index_templ.go | 178 ++++++++++++++++++++++++++++-----------------
|
||||
web/js/main.mjs | 15 ++--
|
||||
5 files changed, 132 insertions(+), 73 deletions(-)
|
||||
|
||||
diff --git a/anubis.go b/anubis.go
|
||||
index d626ebc..6c23e00 100644
|
||||
--- a/anubis.go
|
||||
+++ b/anubis.go
|
||||
@@ -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 ff2d14f..c82540d 100644
|
||||
--- a/cmd/anubis/main.go
|
||||
+++ b/cmd/anubis/main.go
|
||||
@@ -174,6 +174,7 @@ func startDecayMapCleanup(ctx context.Context, s *libanubis.Server) {
|
||||
}
|
||||
|
||||
func main() {
|
||||
+ flag.BoolVar(&anubis.EnableMascot, "enable-mascot", false, "enables the anubis mascot, it's recommended to disable it to allow clients with slow internet, load the captcha webpage faster")
|
||||
flagenv.Parse()
|
||||
flag.Parse()
|
||||
|
||||
diff --git a/web/index.templ b/web/index.templ
|
||||
index 872c8b1..969b339 100644
|
||||
--- a/web/index.templ
|
||||
+++ b/web/index.templ
|
||||
@@ -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)
|
||||
</head>
|
||||
<body id="top">
|
||||
<main>
|
||||
@@ -84,8 +85,10 @@ templ base(title string, body templ.Component, challenge any, ogTags map[string]
|
||||
|
||||
templ index() {
|
||||
<div class="centered-div">
|
||||
+ if anubis.EnableMascot {
|
||||
<img id="image" style="width:100%;max-width:256px;" src={ anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/img/pensive.webp?cacheBuster=" + anubis.Version }/>
|
||||
<img style="display:none;" style="width:100%;max-width:256px;" src={ anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/img/happy.webp?cacheBuster=" + anubis.Version }/>
|
||||
+ }
|
||||
<p id="status">Loading...</p>
|
||||
<script async type="module" src={ anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/js/main.mjs?cacheBuster=" + anubis.Version }></script>
|
||||
<div id="progress" role="progressbar" aria-labelledby="status">
|
||||
@@ -137,7 +140,9 @@ templ index() {
|
||||
|
||||
templ errorPage(message string, mail string) {
|
||||
<div class="centered-div">
|
||||
+ if anubis.EnableMascot {
|
||||
<img id="image" alt="Sad Anubis" style="width:100%;max-width:256px;" src={ anubis.BasePrefix + "/.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 != "" {
|
||||
@@ -155,12 +160,14 @@ templ errorPage(message string, mail string) {
|
||||
|
||||
templ StaticHappy() {
|
||||
<div class="centered-div">
|
||||
+ if anubis.EnableMascot {
|
||||
<img
|
||||
style="display:none;"
|
||||
style="width:100%;max-width:256px;"
|
||||
src={ "/.within.website/x/cmd/anubis/static/img/happy.webp?cacheBuster=" +
|
||||
anubis.Version }
|
||||
/>
|
||||
+ }
|
||||
<p>This is just a check endpoint for your reverse proxy to use.</p>
|
||||
</div>
|
||||
}
|
||||
@@ -188,7 +195,9 @@ templ bench() {
|
||||
></tbody>
|
||||
</table>
|
||||
<div class="centered-div">
|
||||
+ if anubis.EnableMascot {
|
||||
<img id="image" style="width:100%;max-width:256px;" src={ anubis.BasePrefix + "/.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={ anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/js/bench.mjs?cacheBuster=" + anubis.Version }></script>
|
||||
<div id="sparkline"></div>
|
||||
diff --git a/web/index_templ.go b/web/index_templ.go
|
||||
index 35638b3..4a1756e 100644
|
||||
--- a/web/index_templ.go
|
||||
+++ b/web/index_templ.go
|
||||
@@ -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 {
|
||||
+ return templ_7745c5c3_Err
|
||||
+ }
|
||||
templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "</head><body id=\"top\"><main><center><h1 id=\"title\" class=\".centered-div\">")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
@@ -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: 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 {
|
||||
@@ -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, "<div class=\"centered-div\"><img id=\"image\" style=\"width:100%;max-width:256px;\" src=\"")
|
||||
- if templ_7745c5c3_Err != nil {
|
||||
- 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, "\"> <img style=\"display:none;\" style=\"width:100%;max-width:256px;\" src=\"")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<div class=\"centered-div\">")
|
||||
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
|
||||
+ if anubis.EnableMascot {
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<img id=\"image\" style=\"width:100%;max-width:256px;\" src=\"")
|
||||
+ if templ_7745c5c3_Err != nil {
|
||||
+ 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: 89, 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, 13, "\"> <img style=\"display:none;\" style=\"width:100%;max-width:256px;\" src=\"")
|
||||
+ 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: 90, Col: 174}
|
||||
+ }
|
||||
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
|
||||
+ if templ_7745c5c3_Err != nil {
|
||||
+ return templ_7745c5c3_Err
|
||||
+ }
|
||||
+ 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, "\"><p id=\"status\">Loading...</p><script async type=\"module\" src=\"")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<p id=\"status\">Loading...</p><script async type=\"module\" src=\"")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
var templ_7745c5c3_Var10 string
|
||||
templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(anubis.BasePrefix + "/.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: 90, Col: 136}
|
||||
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 93, Col: 136}
|
||||
}
|
||||
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "\"></script><div id=\"progress\" role=\"progressbar\" aria-labelledby=\"status\"><div class=\"bar-inner\"></div></div><details><summary>Why am I seeing this?</summary><p>You are seeing this because the administrator of this website has set up <a href=\"https://github.com/TecharoHQ/anubis\">Anubis</a> to protect the server against the scourge of <a href=\"https://thelibre.news/foss-infrastructure-is-under-attack-by-ai-companies/\">AI companies aggressively scraping websites</a>. This can and does cause downtime for the websites, which makes their resources inaccessible for everyone.</p><p>Anubis is a compromise. Anubis uses a <a href=\"https://anubis.techaro.lol/docs/design/why-proof-of-work\">Proof-of-Work</a> scheme in the vein of <a href=\"https://en.wikipedia.org/wiki/Hashcash\">Hashcash</a>, 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.</p><p>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.</p><p>Please note that Anubis requires the use of modern JavaScript features that plugins like <a href=\"https://jshelter.org/\">JShelter</a> will disable. Please disable JShelter or other such plugins for this domain.</p></details><noscript><p>Sadly, you must enable JavaScript to get past this challenge. This is required because AI companies have changed the social contract around how website hosting works. A no-JS solution is a work-in-progress.</p></noscript><div id=\"testarea\"></div></div>")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\"></script><div id=\"progress\" role=\"progressbar\" aria-labelledby=\"status\"><div class=\"bar-inner\"></div></div><details><summary>Why am I seeing this?</summary><p>You are seeing this because the administrator of this website has set up <a href=\"https://github.com/TecharoHQ/anubis\">Anubis</a> to protect the server against the scourge of <a href=\"https://thelibre.news/foss-infrastructure-is-under-attack-by-ai-companies/\">AI companies aggressively scraping websites</a>. This can and does cause downtime for the websites, which makes their resources inaccessible for everyone.</p><p>Anubis is a compromise. Anubis uses a <a href=\"https://anubis.techaro.lol/docs/design/why-proof-of-work\">Proof-of-Work</a> scheme in the vein of <a href=\"https://en.wikipedia.org/wiki/Hashcash\">Hashcash</a>, 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.</p><p>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.</p><p>Please note that Anubis requires the use of modern JavaScript features that plugins like <a href=\"https://jshelter.org/\">JShelter</a> will disable. Please disable JShelter or other such plugins for this domain.</p></details><noscript><p>Sadly, you must enable JavaScript to get past this challenge. This is required because AI companies have changed the social contract around how website hosting works. A no-JS solution is a work-in-progress.</p></noscript><div id=\"testarea\"></div></div>")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
@@ -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, "<div class=\"centered-div\"><img id=\"image\" alt=\"Sad Anubis\" style=\"width:100%;max-width:256px;\" src=\"")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<div class=\"centered-div\">")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
- var templ_7745c5c3_Var12 string
|
||||
- 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: 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, 18, "<img id=\"image\" alt=\"Sad Anubis\" style=\"width:100%;max-width:256px;\" src=\"")
|
||||
+ if templ_7745c5c3_Err != nil {
|
||||
+ return templ_7745c5c3_Err
|
||||
+ }
|
||||
+ var templ_7745c5c3_Var12 string
|
||||
+ 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: 144, Col: 181}
|
||||
+ }
|
||||
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
|
||||
+ if templ_7745c5c3_Err != nil {
|
||||
+ return templ_7745c5c3_Err
|
||||
+ }
|
||||
+ 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, "\"><p>")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p>")
|
||||
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: 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, ".</p><button onClick=\"window.location.reload();\">Try again</button> ")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, ".</p><button onClick=\"window.location.reload();\">Try again</button> ")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
if mail != "" {
|
||||
- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "<p><a href=\"/\">Go home</a> or if you believe you should not be blocked, please contact the webmaster at <a href=\"")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<p><a href=\"/\">Go home</a> or if you believe you should not be blocked, please contact the webmaster at <a href=\"")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
@@ -272,30 +296,30 @@ func errorPage(message string, mail string) templ.Component {
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\">")
|
||||
+ 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: 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, "</a></p>")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "</a></p>")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
} else {
|
||||
- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<p><a href=\"/\">Go home</a></p>")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<p><a href=\"/\">Go home</a></p>")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
}
|
||||
- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</div>")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "</div>")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
@@ -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, "<div class=\"centered-div\"><img style=\"display:none;\" style=\"width:100%;max-width:256px;\" src=\"")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "<div class=\"centered-div\">")
|
||||
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/happy.webp?cacheBuster=" +
|
||||
- anubis.Version)
|
||||
- if templ_7745c5c3_Err != nil {
|
||||
- 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, 28, "<img style=\"display:none;\" style=\"width:100%;max-width:256px;\" src=\"")
|
||||
+ 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/happy.webp?cacheBuster=" +
|
||||
+ anubis.Version)
|
||||
+ if templ_7745c5c3_Err != nil {
|
||||
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 168, Col: 18}
|
||||
+ }
|
||||
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
|
||||
+ if templ_7745c5c3_Err != nil {
|
||||
+ return templ_7745c5c3_Err
|
||||
+ }
|
||||
+ 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, "\"><p>This is just a check endpoint for your reverse proxy to use.</p></div>")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<p>This is just a check endpoint for your reverse proxy to use.</p></div>")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
@@ -367,33 +401,43 @@ func bench() templ.Component {
|
||||
templ_7745c5c3_Var18 = templ.NopComponent
|
||||
}
|
||||
ctx = templ.ClearChildren(ctx)
|
||||
- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<div style=\"height:20rem;display:flex\"><table style=\"margin-top:1rem;display:grid;grid-template:auto 1fr/auto auto;gap:0 0.5rem\"><thead style=\"border-bottom:1px solid black;padding:0.25rem 0;display:grid;grid-template:1fr/subgrid;grid-column:1/-1\"><tr id=\"table-header\" style=\"display:contents\"><th style=\"width:4.5rem\">Time</th><th style=\"width:4rem\">Iters</th></tr><tr id=\"table-header-compare\" style=\"display:none\"><th style=\"width:4.5rem\">Time A</th><th style=\"width:4rem\">Iters A</th><th style=\"width:4.5rem\">Time B</th><th style=\"width:4rem\">Iters B</th></tr></thead> <tbody id=\"results\" 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=\"")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "<div style=\"height:20rem;display:flex\"><table style=\"margin-top:1rem;display:grid;grid-template:auto 1fr/auto auto;gap:0 0.5rem\"><thead style=\"border-bottom:1px solid black;padding:0.25rem 0;display:grid;grid-template:1fr/subgrid;grid-column:1/-1\"><tr id=\"table-header\" style=\"display:contents\"><th style=\"width:4.5rem\">Time</th><th style=\"width:4rem\">Iters</th></tr><tr id=\"table-header-compare\" style=\"display:none\"><th style=\"width:4.5rem\">Time A</th><th style=\"width:4rem\">Iters A</th><th style=\"width:4.5rem\">Time B</th><th style=\"width:4rem\">Iters B</th></tr></thead> <tbody id=\"results\" 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\">")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
- 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, "<img id=\"image\" style=\"width:100%;max-width:256px;\" src=\"")
|
||||
+ if templ_7745c5c3_Err != nil {
|
||||
+ return templ_7745c5c3_Err
|
||||
+ }
|
||||
+ 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: 199, Col: 166}
|
||||
+ }
|
||||
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
|
||||
+ if templ_7745c5c3_Err != nil {
|
||||
+ return templ_7745c5c3_Err
|
||||
+ }
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "\">")
|
||||
+ if templ_7745c5c3_Err != nil {
|
||||
+ return templ_7745c5c3_Err
|
||||
+ }
|
||||
}
|
||||
- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "\"><p id=\"status\" style=\"max-width:256px\">Loading...</p><script async type=\"module\" src=\"")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<p id=\"status\" style=\"max-width:256px\">Loading...</p><script async type=\"module\" src=\"")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
var templ_7745c5c3_Var20 string
|
||||
templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(anubis.BasePrefix + "/.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: 193, Col: 138}
|
||||
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 202, Col: 138}
|
||||
}
|
||||
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "\"></script><div id=\"sparkline\"></div><noscript><p>Running the benchmark tool requires JavaScript to be enabled.</p></noscript></div></div><form id=\"controls\" style=\"position:fixed;top:0.5rem;right:0.5rem\"><div style=\"display:flex;justify-content:end\"><label for=\"difficulty-input\" style=\"margin-right:0.5rem\">Difficulty:</label> <input id=\"difficulty-input\" type=\"number\" name=\"difficulty\" style=\"width:3rem\"></div><div style=\"margin-top:0.25rem;display:flex;justify-content:end\"><label for=\"algorithm-select\" style=\"margin-right:0.5rem\">Algorithm:</label> <select id=\"algorithm-select\" name=\"algorithm\"></select></div><div style=\"margin-top:0.25rem;display:flex;justify-content:end\"><label for=\"compare-select\" style=\"margin-right:0.5rem\">Compare:</label> <select id=\"compare-select\" name=\"compare\"><option value=\"NONE\">-</option></select></div></form>")
|
||||
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "\"></script><div id=\"sparkline\"></div><noscript><p>Running the benchmark tool requires JavaScript to be enabled.</p></noscript></div></div><form id=\"controls\" style=\"position:fixed;top:0.5rem;right:0.5rem\"><div style=\"display:flex;justify-content:end\"><label for=\"difficulty-input\" style=\"margin-right:0.5rem\">Difficulty:</label> <input id=\"difficulty-input\" type=\"number\" name=\"difficulty\" style=\"width:3rem\"></div><div style=\"margin-top:0.25rem;display:flex;justify-content:end\"><label for=\"algorithm-select\" style=\"margin-right:0.5rem\">Algorithm:</label> <select id=\"algorithm-select\" name=\"algorithm\"></select></div><div style=\"margin-top:0.25rem;display:flex;justify-content:end\"><label for=\"compare-select\" style=\"margin-right:0.5rem\">Compare:</label> <select id=\"compare-select\" name=\"compare\"><option value=\"NONE\">-</option></select></div></form>")
|
||||
if templ_7745c5c3_Err != nil {
|
||||
return templ_7745c5c3_Err
|
||||
}
|
||||
diff --git a/web/js/main.mjs b/web/js/main.mjs
|
||||
index c50ed2b..b0474c8 100644
|
||||
--- a/web/js/main.mjs
|
||||
+++ b/web/js/main.mjs
|
||||
@@ -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;
|
||||
|
||||
@@ -96,7 +97,7 @@ function showContinueBar(hash, nonce, t0, t1) {
|
||||
const ohNoes = ({ titleMsg, statusMsg, imageSrc }) => {
|
||||
title.innerHTML = titleMsg;
|
||||
status.innerHTML = statusMsg;
|
||||
- image.src = imageSrc;
|
||||
+ image.src = imageSrc || undefined;
|
||||
progress.style.display = "none";
|
||||
};
|
||||
|
||||
@@ -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 <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, basePrefix),
|
||||
+ ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion, basePrefix) }),
|
||||
});
|
||||
return;
|
||||
}
|
||||
@@ -129,7 +130,7 @@ function showContinueBar(hash, nonce, t0, t1) {
|
||||
ohNoes({
|
||||
titleMsg: `Missing feature ${name}`,
|
||||
statusMsg: msg,
|
||||
- imageSrc: imageURL("reject", anubisVersion, basePrefix),
|
||||
+ ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion, basePrefix) }),
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -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, basePrefix),
|
||||
+ ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion, basePrefix) }),
|
||||
});
|
||||
return;
|
||||
}
|
||||
@@ -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, basePrefix);
|
||||
+ if (enableMascot) {
|
||||
+ image.src = imageURL("happy", anubisVersion, basePrefix);
|
||||
+ }
|
||||
progress.style.display = "none";
|
||||
|
||||
if (userReadDetails) {
|
||||
@@ -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, basePrefix),
|
||||
+ ...(enableMascot && { imageSrc: imageURL("reject", anubisVersion, basePrefix) })
|
||||
});
|
||||
}
|
||||
})();
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.49.0
|
||||
|
||||
Loading…
Add table
Reference in a new issue