feat(inputs.win_services): Make service selection case-insensitive (#14684)

This commit is contained in:
Sven Rebhan 2024-02-06 15:53:10 -05:00 committed by GitHub
parent 4c2ba74824
commit 3591546a1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 4 deletions

View File

@ -8,6 +8,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"io/fs" "io/fs"
"strings"
"syscall" "syscall"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
@ -120,11 +121,22 @@ func (*WinServices) SampleConfig() string {
} }
func (m *WinServices) Init() error { func (m *WinServices) Init() error {
var err error // For case insensitive comparision (see issue #8796) we need to transform the services
m.servicesFilter, err = filter.NewIncludeExcludeFilter(m.ServiceNames, m.ServiceNamesExcluded) // to lowercase
servicesInclude := make([]string, 0, len(m.ServiceNames))
for _, s := range m.ServiceNames {
servicesInclude = append(servicesInclude, strings.ToLower(s))
}
servicesExclude := make([]string, 0, len(m.ServiceNamesExcluded))
for _, s := range m.ServiceNamesExcluded {
servicesExclude = append(servicesExclude, strings.ToLower(s))
}
f, err := filter.NewIncludeExcludeFilter(servicesInclude, servicesExclude)
if err != nil { if err != nil {
return err return err
} }
m.servicesFilter = f
return nil return nil
} }
@ -178,9 +190,11 @@ func (m *WinServices) listServices(scmgr WinServiceManager) ([]string, error) {
} }
var services []string var services []string
for _, n := range names { for _, name := range names {
// Compare case-insensitive. Use lowercase as we already converted the filter to use it.
n := strings.ToLower(name)
if m.servicesFilter.Match(n) { if m.servicesFilter.Match(n) {
services = append(services, n) services = append(services, name)
} }
} }