Skip to content

Use slices.Contains #36

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
Mar 26, 2025
Merged

Use slices.Contains #36

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
16 changes: 4 additions & 12 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"net/url"
"os"
"path/filepath"
"slices"
"strings"
"text/template"
"time"
Expand Down Expand Up @@ -149,7 +150,7 @@ func NewCaptchaProtect(ctx context.Context, next http.Handler, config *Config, n
}
}

if !strInSlice("html", config.ProtectFileExtensions) {
if !slices.Contains(config.ProtectFileExtensions, "html") {
config.ProtectFileExtensions = append(config.ProtectFileExtensions, "html")
}

Expand Down Expand Up @@ -237,7 +238,7 @@ func (bc *CaptchaProtect) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
if challengeOnPage && req.Method == http.MethodPost {
response := req.FormValue(bc.captchaConfig.key + "-response")
if response == "" {
if !strInSlice(req.Method, bc.config.ProtectHttpMethods) {
if !slices.Contains(bc.config.ProtectHttpMethods, req.Method) {
bc.next.ServeHTTP(rw, req)
return
}
Expand Down Expand Up @@ -380,7 +381,7 @@ func (bc *CaptchaProtect) serveStatsPage(rw http.ResponseWriter, ip string) {
}

func (bc *CaptchaProtect) shouldApply(req *http.Request, clientIP string) bool {
if !strInSlice(req.Method, bc.config.ProtectHttpMethods) {
if !slices.Contains(bc.config.ProtectHttpMethods, req.Method) {
return false
}

Expand Down Expand Up @@ -731,15 +732,6 @@ func getDefaultTmpl() string {
</html>`
}

func strInSlice(s string, sl []string) bool {
for _, a := range sl {
if a == s {
return true
}
}
return false
}

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