mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #571 from grafana/fix-possible-set-matches-manipulation

Browse source 
Ensure manipulating the returned FastRegexMatcher.SetMatches() doesn't pollute the matcher's internal state
This commit is contained in:
Marco Pracucci 2023-12-07 12:05:51 +01:00 committed by GitHub
parent e239c5eda5 0a92839843
commit 060dc59065
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
model/labels/regexp.go
View file

@ -21,6 +21,7 @@ import (
"github.com/dgraph-io/ristretto"
"github.com/grafana/regexp"
"github.com/grafana/regexp/syntax"
"golang.org/x/exp/slices"
)
const (
@ -339,7 +340,9 @@ func (m *FastRegexMatcher) MatchString(s string) bool {
}
func (m *FastRegexMatcher) SetMatches() []string {
return m.setMatches
// IMPORTANT: always return a copy, otherwise if the caller manipulate this slice it will
// also get manipulated in the cached FastRegexMatcher instance.
return slices.Clone(m.setMatches)
}
func (m *FastRegexMatcher) GetRegexString() string {

14
model/labels/regexp_test.go
View file

@ -344,6 +344,20 @@ func TestFindSetMatches(t *testing.T) {
}
}
func TestFastRegexMatcher_SetMatches_ShouldReturnACopy(t *testing.T) {
m, err := newFastRegexMatcherWithoutCache("a|b")
require.NoError(t, err)
require.Equal(t, []string{"a", "b"}, m.SetMatches())
// Manipulate the returned slice.
matches := m.SetMatches()
matches[0] = "xxx"
matches[1] = "yyy"
// Ensure that if we call SetMatches() again we get the original one.
require.Equal(t, []string{"a", "b"}, m.SetMatches())
}
func BenchmarkFastRegexMatcher(b *testing.B) {
texts := generateRandomValues()