commit 49a128ecd658ddbebc279c819ac7703509812364
author Ravi Mistry <rmistry@google.com> Fri Jul 23 15:13:27 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Fri Jul 23 20:00:41 2021 +0000
tree 644ea13c0645853a471aa0af8cabf48808047f4a
parent e4491b9688161c16eb136f6879701055a0d4c9a3

Add glob support to infra_auth_allowed

Bug: skia:12264
Change-Id: I6af8413accffda0100f66e01beabb18f587069de
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/432058
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>

go/allowed/infra_auth_allowed.go

diff --git a/go/allowed/infra_auth_allowed.go b/go/allowed/infra_auth_allowed.go
index 8b29ef6..b71fa7b 100644
--- a/go/allowed/infra_auth_allowed.go
+++ b/go/allowed/infra_auth_allowed.go
@@ -25,6 +25,7 @@
 type Group struct {
 	Members []string `json:"members"`
 	Nested  []string `json:"nested"`
+	Globs   []string `json:"globs"`
 }
 
 // Response represents the format returned from GROUP_URL_TEMPLATE.
@@ -114,6 +115,10 @@
 		}
 		members = append(members, indirectMembers...)
 	}
+	// Get all globs.
+	for _, glob := range r.Group.Globs {
+		members = append(members, glob)
+	}
 	return members, nil
 }
 

go/allowed/infra_auth_allowed_test.go

diff --git a/go/allowed/infra_auth_allowed_test.go b/go/allowed/infra_auth_allowed_test.go
index eab80ae..18284f7 100644
--- a/go/allowed/infra_auth_allowed_test.go
+++ b/go/allowed/infra_auth_allowed_test.go
@@ -39,6 +39,9 @@
     ],
     "nested": [
       "nested_group"
+    ],
+    "globs": [
+      "user:*@gotham.org"
     ]
   }
 }`
@@ -61,6 +64,7 @@
 	assert.True(t, i.Member("foo@chromium.org"))
 	assert.True(t, i.Member("test@example.org"))
 	assert.True(t, i.Member("nested-user@example.org"))
+	assert.True(t, i.Member("batman@gotham.org"))
 	assert.False(t, i.Member("example.org"))
 	assert.False(t, i.Member("bar@example.org"))
 }