Skip to content

Commit

Permalink
Merge pull request containers#12364 from flouthoc/fix-filter-pattern
Browse files Browse the repository at this point in the history
filter: use `filepath.Match` to maintain consistency with other pattern matching in podman
  • Loading branch information
openshift-merge-robot authored Nov 19, 2021
2 parents 671e5ee + 6011149 commit 2755d02
Showing 1 changed file with 6 additions and 17 deletions.
23 changes: 6 additions & 17 deletions pkg/util/filters.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"
"net/http"
"regexp"
"path/filepath"
"strings"
"time"

Expand Down Expand Up @@ -95,24 +95,13 @@ func PrepareFilters(r *http.Request) (*map[string][]string, error) {
return &filterMap, nil
}

func wildCardToRegexp(pattern string) string {
var result strings.Builder
for i, literal := range strings.Split(pattern, "*") {
// Replace * with .*
if i > 0 {
result.WriteString(".*")
}
// Quote any regular expression meta characters in the
// literal text.
result.WriteString(regexp.QuoteMeta(literal))
}
return result.String()
}

func matchPattern(pattern string, value string) bool {
if strings.Contains(pattern, "*") {
result, _ := regexp.MatchString(wildCardToRegexp(pattern), value)
return result
filter := fmt.Sprintf("*%s*", pattern)
filter = strings.ReplaceAll(filter, string(filepath.Separator), "|")
newName := strings.ReplaceAll(value, string(filepath.Separator), "|")
match, _ := filepath.Match(filter, newName)
return match
}
return false
}
Expand Down

0 comments on commit 2755d02

Please sign in to comment.