Skip to content
This repository has been archived by the owner on May 14, 2020. It is now read-only.

fix filter listing #13

Merged
merged 1 commit into from May 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions filter.go
Expand Up @@ -147,6 +147,7 @@ func (fs *Filters) AddrBlocked(a ma.Multiaddr) (deny bool) {
func (fs *Filters) Filters() (result []*net.IPNet) {
ffa := fs.FiltersForAction(ActionDeny)
for _, res := range ffa {
res := res // allocate a new copy
result = append(result, &res)
}
return result
Expand Down
26 changes: 26 additions & 0 deletions filter_test.go
Expand Up @@ -7,6 +7,32 @@ import (
ma "github.com/multiformats/go-multiaddr"
)

func TestFilterListing(t *testing.T) {
f := NewFilters()
expected := map[string]bool{
"1.2.3.0/24": true,
"4.3.2.1/32": true,
"fd00::/8": true,
"fc00::1/128": true,
}
for cidr := range expected {
_, ipnet, _ := net.ParseCIDR(cidr)
f.AddDialFilter(ipnet)
}

for _, filter := range f.Filters() {
cidr := filter.String()
if expected[cidr] {
delete(expected, cidr)
} else {
t.Errorf("unexected filter %s", cidr)
}
}
for cidr := range expected {
t.Errorf("expected filter %s", cidr)
}
}

func TestFilterBlocking(t *testing.T) {
f := NewFilters()

Expand Down