Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: added new rule level settings ignore_cname_category_matches to… #2621

Merged
merged 6 commits into from
Jun 20, 2024
Merged

feat: added new rule level settings ignore_cname_category_matches to… #2621

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d09e5b1
feat: addded new rule level settings ignore_cname_category_matches to…
Jun 19, 2024
e669f75
Update 2621.txt
jacobbednarz Jun 20, 2024
578e82c
Update 2621.txt
jacobbednarz Jun 20, 2024
f8f07e7
update casing for CNAME
jacobbednarz Jun 20, 2024
a866c3b
add type definition for `IgnoreCNAMECategoryMatches`
jacobbednarz Jun 20, 2024
6aecd6a
add tests assertion
jacobbednarz Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changelog/2621.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
```release-note:enhancement
teams: Added ZT rule settings ignore_cname_category_matches
teams: Added description to ZT list item
```
5 changes: 3 additions & 2 deletions teams_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions teams_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 `json:"ignore_cname_category_matches"`
jacobbednarz marked this conversation as resolved.
Show resolved Hide resolved

// 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"`

Expand Down
1 change: 1 addition & 0 deletions teams_rules_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down