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

Define different client names for the same group (#251) #337

Merged
merged 4 commits into from
Nov 14, 2021
Merged

Define different client names for the same group (#251) #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89e1567
comama seperated client names
kwitsch Nov 12, 2021
bc5a040
blocking_resolver unittest
kwitsch Nov 12, 2021
1e984c6
linter errors reduced
kwitsch Nov 13, 2021
6afc9f6
unit test for group merge
kwitsch Nov 13, 2021
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
23 changes: 19 additions & 4 deletions resolver/blocking_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ type BlockingResolver struct {
blockHandler blockHandler
whitelistOnlyGroups map[string]bool
status *status
clientGroupsBlock map[string][]string
}

// NewBlockingResolver returns a new configured instance of the resolver
Expand All @@ -103,6 +104,19 @@ func NewBlockingResolver(cfg config.BlockingConfig) (ChainedResolver, error) {
return nil, multierror.Prefix(err, "blocking resolver: ")
}

cgb := make(map[string][]string)

for identifier, cfgGroups := range cfg.ClientGroupsBlock {
for _, ipart := range strings.Split(identifier, ",") {
existingGroups, found := cgb[ipart]
if found {
cgb[ipart] = append(existingGroups, cfgGroups...)
} else {
cgb[ipart] = cfgGroups
}
}
}

res := &BlockingResolver{
blockHandler: blockHandler,
cfg: cfg,
Expand All @@ -113,6 +127,7 @@ func NewBlockingResolver(cfg config.BlockingConfig) (ChainedResolver, error) {
enabled: true,
enableTimer: time.NewTimer(0),
},
clientGroupsBlock: cgb,
}

return res, nil
Expand Down Expand Up @@ -365,30 +380,30 @@ func (r *BlockingResolver) groupsToCheckForClient(request *model.Request) []stri
var groups []string
// try client names
for _, cName := range request.ClientNames {
for blockGroup, groupsByName := range r.cfg.ClientGroupsBlock {
for blockGroup, groupsByName := range r.clientGroupsBlock {
if util.ClientNameMatchesGroupName(blockGroup, cName) {
groups = append(groups, groupsByName...)
}
}
}

// try IP
groupsByIP, found := r.cfg.ClientGroupsBlock[request.ClientIP.String()]
groupsByIP, found := r.clientGroupsBlock[request.ClientIP.String()]

if found {
groups = append(groups, groupsByIP...)
}

// try CIDR
for cidr, groupsByCidr := range r.cfg.ClientGroupsBlock {
for cidr, groupsByCidr := range r.clientGroupsBlock {
if util.CidrContainsIP(cidr, request.ClientIP) {
groups = append(groups, groupsByCidr...)
}
}

if len(groups) == 0 {
// return default
groups = r.cfg.ClientGroupsBlock["default"]
groups = r.clientGroupsBlock["default"]
}

var result []string
Expand Down
31 changes: 24 additions & 7 deletions resolver/blocking_resolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,14 @@ badcnamedomain.com`)
"defaultGroup": {defaultGroupFile.Name()},
},
ClientGroupsBlock: map[string][]string{
"client1": {"gr1"},
"192.168.178.55": {"gr1"},
"altName": {"gr2"},
"10.43.8.67/28": {"gr1"},
"wildcard[0-9]*": {"gr1"},
"default": {"defaultGroup"},
"client1": {"gr1"},
"client2,client3": {"gr1"},
"client3": {"gr2"},
"192.168.178.55": {"gr1"},
"altName": {"gr2"},
"10.43.8.67/28": {"gr1"},
"wildcard[0-9]*": {"gr1"},
"default": {"defaultGroup"},
},
BlockType: "ZeroIP",
}
Expand All @@ -134,11 +136,26 @@ badcnamedomain.com`)
})

When("client name is defined in client groups block", func() {
It("should block the A query if domain is on the black list", func() {
It("should block the A query if domain is on the black list (single)", func() {
resp, err = sut.Resolve(newRequestWithClient("domain1.com.", dns.TypeA, "1.2.1.2", "client1"))

Expect(resp.Res.Answer).Should(BeDNSRecord("domain1.com.", dns.TypeA, 21600, "0.0.0.0"))
})
It("should block the A query if domain is on the black list (multipart 1)", func() {
resp, err = sut.Resolve(newRequestWithClient("domain1.com.", dns.TypeA, "1.2.1.2", "client2"))

Expect(resp.Res.Answer).Should(BeDNSRecord("domain1.com.", dns.TypeA, 21600, "0.0.0.0"))
})
It("should block the A query if domain is on the black list (multipart 2)", func() {
resp, err = sut.Resolve(newRequestWithClient("domain1.com.", dns.TypeA, "1.2.1.2", "client3"))

Expect(resp.Res.Answer).Should(BeDNSRecord("domain1.com.", dns.TypeA, 21600, "0.0.0.0"))
})
It("should block the A query if domain is on the black list (merged)", func() {
resp, err = sut.Resolve(newRequestWithClient("blocked2.com.", dns.TypeA, "1.2.1.2", "client3"))

Expect(resp.Res.Answer).Should(BeDNSRecord("blocked2.com.", dns.TypeA, 21600, "0.0.0.0"))
})
It("should block the AAAA query if domain is on the black list", func() {
resp, err = sut.Resolve(newRequestWithClient("domain1.com.", dns.TypeAAAA, "1.2.1.2", "client1"))

Expand Down