diff --git a/.changelog/2621.txt b/.changelog/2621.txt new file mode 100644 index 00000000000..315bfff3f71 --- /dev/null +++ b/.changelog/2621.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +teams_rules: Added ZT rule settings `ignore_cname_category_matches` +```` + +```release-note:enhancement +teams_list: Added description to ZT list item +``` diff --git a/teams_list.go b/teams_list.go index 066d7afffe4..61f160c875c 100644 --- a/teams_list.go +++ b/teams_list.go @@ -26,8 +26,9 @@ type TeamsList struct { // TeamsListItem represents a single list item. type TeamsListItem struct { - Value string `json:"value"` - CreatedAt *time.Time `json:"created_at,omitempty"` + Value string `json:"value"` + Description string `json:"description,omitempty"` + CreatedAt *time.Time `json:"created_at,omitempty"` } // PatchTeamsList represents a patch request for appending/removing list items. diff --git a/teams_rules.go b/teams_rules.go index b03c0121579..38bfbcec029 100644 --- a/teams_rules.go +++ b/teams_rules.go @@ -49,6 +49,9 @@ type TeamsRuleSettings struct { // Turns on ip category based filter on dns if the rule contains dns category checks IPCategories bool `json:"ip_categories"` + // Turns on for explicitly ignoring cname domain category matches + IgnoreCNAMECategoryMatches *bool `json:"ignore_cname_category_matches"` + // Allow parent MSP accounts to enable bypass their children's rules. Do not set them for non MSP accounts. AllowChildBypass *bool `json:"allow_child_bypass,omitempty"` diff --git a/teams_rules_test.go b/teams_rules_test.go index 226ce50bb28..4b9f4a34d47 100644 --- a/teams_rules_test.go +++ b/teams_rules_test.go @@ -54,6 +54,7 @@ func TestTeamsRules(t *testing.T) { "untrusted_cert": { "action": "error" }, + "ignore_cname_category_matches": true, "dns_resolvers": { "ipv4": [ {"ip": "10.0.0.2", "port": 5053}, @@ -142,6 +143,7 @@ func TestTeamsRules(t *testing.T) { UntrustedCertSettings: &UntrustedCertSettings{ Action: UntrustedCertError, }, + IgnoreCNAMECategoryMatches: BoolPtr(true), DnsResolverSettings: &TeamsDnsResolverSettings{ V4Resolvers: []TeamsDnsResolverAddressV4{ {