sophie/nuke
1
0
Fork 0
Code Packages 1 Activity Actions

fix(lib/challenge): allow challenges to register HTTP routes (#620)

Browse source 
Signed-off-by: Xe Iaso <me@xeiaso.net>
This commit is contained in:
Xe Iaso 2025-06-05 20:26:23 -04:00 • committed by GitHub
parent 5f3861ab37
commit 5a7499ea3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/docs/CHANGELOG.md
View file

@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
- Refactor challenge presentation logic to use a challenge registry - Refactor challenge presentation logic to use a challenge registry
- Allow challenge implementations to register HTTP routes
## v1.19.1: Jenomis cen Lexentale - Echo 1 ## v1.19.1: Jenomis cen Lexentale - Echo 1

7
lib/challenge/challenge.go
View file

@ -41,7 +41,12 @@ func Methods() []string {
} }
type Impl interface { type Impl interface {
Fail(w http.ResponseWriter, r *http.Request) error // Setup registers any additional routes with the Impl for assets or API routes.
Setup(mux *http.ServeMux)
// Issue a new challenge to the user, called by the Anubis.
Issue(r *http.Request, lg *slog.Logger, rule *policy.Bot, challenge string, ogTags map[string]string) (templ.Component, error) Issue(r *http.Request, lg *slog.Logger, rule *policy.Bot, challenge string, ogTags map[string]string) (templ.Component, error)
// Validate a challenge, making sure that it passes muster.
Validate(r *http.Request, lg *slog.Logger, rule *policy.Bot, challenge string) error Validate(r *http.Request, lg *slog.Logger, rule *policy.Bot, challenge string) error
} }

4
lib/challenge/proofofwork/proofofwork.go
View file

@ -24,8 +24,8 @@ type Impl struct {
Algorithm string Algorithm string
} }
func (i *Impl) Fail(w http.ResponseWriter, r *http.Request) error { func (i *Impl) Setup(mux *http.ServeMux) {
return nil /* no implementation required */
} }
func (i *Impl) Issue(r *http.Request, lg *slog.Logger, rule *policy.Bot, challenge string, ogTags map[string]string) (templ.Component, error) { func (i *Impl) Issue(r *http.Request, lg *slog.Logger, rule *policy.Bot, challenge string, ogTags map[string]string) (templ.Component, error) {

5
lib/config.go
View file

@ -151,6 +151,11 @@ func New(opts Options) (*Server, error) {
registerWithPrefix(anubis.APIPrefix+"test-error", http.HandlerFunc(result.TestError), "GET") registerWithPrefix(anubis.APIPrefix+"test-error", http.HandlerFunc(result.TestError), "GET")
registerWithPrefix("/", http.HandlerFunc(result.maybeReverseProxyOrPage), "") registerWithPrefix("/", http.HandlerFunc(result.maybeReverseProxyOrPage), "")
for _, implKind := range challenge.Methods() {
impl, _ := challenge.Get(implKind)
impl.Setup(mux)
}
result.mux = mux result.mux = mux
return result, nil return result, nil

2
web/index_templ.go generated
View file

@ -1,6 +1,6 @@
// Code generated by templ - DO NOT EDIT. // Code generated by templ - DO NOT EDIT.
// templ: version: v0.3.865 // templ: version: v0.3.887
package web package web
//lint:file-ignore SA4006 This context is only used if a nested component is present. //lint:file-ignore SA4006 This context is only used if a nested component is present.

2
xess/xess_templ.go
View file

@ -1,6 +1,6 @@
// Code generated by templ - DO NOT EDIT. // Code generated by templ - DO NOT EDIT.
// templ: version: v0.3.865 // templ: version: v0.3.887
package xess package xess
//lint:file-ignore SA4006 This context is only used if a nested component is present. //lint:file-ignore SA4006 This context is only used if a nested component is present.