From 5f28361f4775213732dbf73b4cd003ff1559bf61 Mon Sep 17 00:00:00 2001 From: Seednode Date: Thu, 10 Nov 2022 13:57:38 -0600 Subject: [PATCH] Fixed issue where invalid include/exclude values were being accepted --- cmd/version.go | 2 +- cmd/web.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/version.go b/cmd/version.go index 69cf44f..b372107 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" ) -var Version = "0.25.3" +var Version = "0.25.4" func init() { rootCmd.AddCommand(versionCmd) diff --git a/cmd/web.go b/cmd/web.go index fabed0f..6d31ea4 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -111,21 +111,21 @@ func getSortOrder(r *http.Request) string { } func splitQueryParams(query string, regexes *Regexes) []string { + results := []string{} + if query == "" { - return []string{} + return results } params := strings.Split(query, ",") for i := 0; i < len(params); i++ { - isAlphanumeric := regexes.Alphanumeric.MatchString(params[i]) - - if isAlphanumeric { - params[i] = strings.ToLower(params[i]) + if regexes.Alphanumeric.MatchString(params[i]) { + results = append(results, strings.ToLower(params[i])) } } - return params + return results } func generateQueryParams(filters *Filters, sortOrder, refreshInterval string) string { @@ -212,10 +212,10 @@ func serveHtml(w http.ResponseWriter, r *http.Request, filePath string, dimensio w.Header().Add("Content-Type", "text/html") - refreshInterval := getRefreshInterval(r) - sortOrder := getSortOrder(r) + refreshInterval := getRefreshInterval(r) + queryParams := generateQueryParams(filters, sortOrder, refreshInterval) var htmlBody strings.Builder