Skip to content

When challenging on page, add a challenge URI parameter when POST'ing challenge response #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joecorall merged 1 commit into from
Jun 4, 2025
Merged

When challenging on page, add a challenge URI parameter when POST'ing challenge response #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ func NewCaptchaProtect(ctx context.Context, next http.Handler, config *Config, n
return nil, fmt.Errorf("your challenge URL can not be the entire site. Default is `/challenge`. A blank value will have challenges presented on the visit that trips the rate limit")
}

// when challenging on the same page that tripped the rate limiter
// add a url parameter to detect on
if config.ChallengeURL == "" {
config.ChallengeURL = "?challenge=true"
}

if len(config.ProtectHttpMethods) == 0 {
config.ProtectHttpMethods = []string{
"GET",
Expand Down Expand Up @@ -318,12 +324,12 @@ func (bc *CaptchaProtect) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
return
}

encodedURI := url.QueryEscape(req.RequestURI)
if bc.ChallengeOnPage() {
log.Info("Captcha challenge", "clientIP", clientIP, "method", req.Method, "path", req.URL.Path, "useragent", req.UserAgent())
bc.serveChallengePage(rw, req.URL.Path)
bc.serveChallengePage(rw, encodedURI)
return
}
encodedURI := url.QueryEscape(req.RequestURI)
url := fmt.Sprintf("%s?destination=%s", bc.config.ChallengeURL, encodedURI)
http.Redirect(rw, req, url, http.StatusFound)
}
Expand Down Expand Up @@ -756,5 +762,5 @@ func (bc *CaptchaProtect) loadState() {
}

func (bc *CaptchaProtect) ChallengeOnPage() bool {
return bc.config.ChallengeURL == ""
return bc.config.ChallengeURL == "?challenge=true"
}