mirror of
https://github.com/steveiliop56/tinyauth.git
synced 2025-10-28 04:35:40 +00:00
fix: fix docker label matching logic
This commit is contained in:
@@ -293,14 +293,14 @@ func ParseSecretFile(contents string) string {
|
||||
}
|
||||
|
||||
// Check if a string matches a regex or if it is included in a comma separated list
|
||||
func CheckFilter(filter string, str string, regex bool) bool {
|
||||
func CheckFilter(filter string, str string) bool {
|
||||
// Check if the filter is empty
|
||||
if len(strings.TrimSpace(filter)) == 0 {
|
||||
return true
|
||||
}
|
||||
|
||||
// Check if the filter is a regex
|
||||
if strings.HasPrefix(filter, "/") && strings.HasSuffix(filter, "/") && regex {
|
||||
if strings.HasPrefix(filter, "/") && strings.HasSuffix(filter, "/") {
|
||||
// Create regex
|
||||
re, err := regexp.Compile(filter[1 : len(filter)-1])
|
||||
|
||||
|
||||
@@ -387,7 +387,7 @@ func TestCheckFilter(t *testing.T) {
|
||||
expected := true
|
||||
|
||||
// Test the check filter function
|
||||
result := utils.CheckFilter(filter, str, false)
|
||||
result := utils.CheckFilter(filter, str)
|
||||
|
||||
// Check if the result is equal to the expected
|
||||
if result != expected {
|
||||
@@ -402,7 +402,7 @@ func TestCheckFilter(t *testing.T) {
|
||||
expected = true
|
||||
|
||||
// Test the check filter function
|
||||
result = utils.CheckFilter(filter, str, true)
|
||||
result = utils.CheckFilter(filter, str)
|
||||
|
||||
// Check if the result is equal to the expected
|
||||
if result != expected {
|
||||
@@ -417,7 +417,7 @@ func TestCheckFilter(t *testing.T) {
|
||||
expected = true
|
||||
|
||||
// Test the check filter function
|
||||
result = utils.CheckFilter(filter, str, false)
|
||||
result = utils.CheckFilter(filter, str)
|
||||
|
||||
// Check if the result is equal to the expected
|
||||
if result != expected {
|
||||
@@ -432,7 +432,7 @@ func TestCheckFilter(t *testing.T) {
|
||||
expected = false
|
||||
|
||||
// Test the check filter function
|
||||
result = utils.CheckFilter(filter, str, true)
|
||||
result = utils.CheckFilter(filter, str)
|
||||
|
||||
// Check if the result is equal to the expected
|
||||
if result != expected {
|
||||
@@ -447,7 +447,7 @@ func TestCheckFilter(t *testing.T) {
|
||||
expected = false
|
||||
|
||||
// Test the check filter function
|
||||
result = utils.CheckFilter(filter, str, false)
|
||||
result = utils.CheckFilter(filter, str)
|
||||
|
||||
// Check if the result is equal to the expected
|
||||
if result != expected {
|
||||
|
||||
Reference in New Issue
Block a user