Extend bot flag to CGI mode

forestnode-io · Aug 20, 2020 · db2aba8 · db2aba8
1 parent 767581d
commit db2aba8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/conf/cgi.go b/cmd/conf/cgi.go
@@ -113,7 +113,7 @@ func (c *Conf) setupCGIRoute(args []string, srvr *server.Server) (*server.Route,
 	} else {
 		route.MaxOK = 1
 	}
-	route.HandlerFunc = handlers.HandleCGI(handler, fn, c.FileMime, srvr.InfoLog)
+	route.HandlerFunc = handlers.HandleCGI(handler, fn, c.FileMime, !c.AllowBots, srvr.InfoLog)
 
 	return route, nil
 }
diff --git a/internal/handlers/cgi.go b/internal/handlers/cgi.go
@@ -9,7 +9,7 @@ import (
 	"time"
 )
 
-func HandleCGI(handler *ezcgi.Handler, name, mime string, infoLog *log.Logger) func(w http.ResponseWriter, r *http.Request) error {
+func HandleCGI(handler *ezcgi.Handler, name, mime string, noBots bool, infoLog *log.Logger) func(w http.ResponseWriter, r *http.Request) error {
 	msg := "transfer complete:\n"
 	msg += "\tname: %s\n"
 	if mime != "" {
@@ -39,7 +39,7 @@ func HandleCGI(handler *ezcgi.Handler, name, mime string, infoLog *log.Logger) f
 	}
 	return func(w http.ResponseWriter, r *http.Request) error {
 		// Filter out requests from bots, iMessage, etc.
-		if headers, exists := r.Header["User-Agent"]; exists {
+		if headers, exists := r.Header["User-Agent"]; exists && noBots {
 			for _, header := range headers {
 				isBot := strings.Contains(header, "bot")
 				if !isBot {