Skip to content

gitlab!1085: 1912 performance issues with bind9 large config parsing #2

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

gitlab!1085: 1912 performance issues with bind9 large config parsing #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
691686b
[#1912] Improved BIND parsing performance
msiodelski Aug 25, 2025
ef39cbc
[#1912] Issue warning when no-parse used
msiodelski Sep 1, 2025
64e3072
[#1912] Added Changelog for #1912
msiodelski Sep 1, 2025
8d7e618
[#1912] Improve log message for no-parse
msiodelski Sep 1, 2025
c19d58f
[#1912] Improved test comments
msiodelski Sep 2, 2025
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
Next Next commit
[#1912] Improved BIND parsing performance 
Added ability to skip selected parts of the configuration by the BIND9
configuration parser.
  • Loading branch information
@msiodelski
msiodelski committed Sep 1, 2025
commit 691686b0b3a4d79e526be94525db2cd61f8f061a
6 changes: 3 additions & 3 deletions backend/appcfg/bind9/addressmatchlist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package bind9config
// Checks if the address match list excludes the specified IP address.
func (aml *AddressMatchList) ExcludesIPAddress(ipAddress string) bool {
for _, element := range aml.Elements {
if (element.IPAddress == ipAddress && element.Negation) ||
(element.ACLName == "none" && !element.Negation) ||
(element.ACLName == "any" && element.Negation) {
if (element.IPAddressOrACLName == ipAddress && element.Negation) ||
(element.IPAddressOrACLName == "none" && !element.Negation) ||
(element.IPAddressOrACLName == "any" && element.Negation) {
return true
}
}
Expand Down
8 changes: 4 additions & 4 deletions backend/appcfg/bind9/addressmatchlist_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
func TestAddressMatchListExcludesIPAddress(t *testing.T) {
aml := &AddressMatchList{
Elements: []*AddressMatchListElement{
{IPAddress: "127.0.0.1", Negation: true},
{IPAddress: "::1", Negation: false},
{IPAddressOrACLName: "127.0.0.1", Negation: true},
{IPAddressOrACLName: "::1", Negation: false},
},
}
require.True(t, aml.ExcludesIPAddress("127.0.0.1"))
Expand All @@ -24,7 +24,7 @@ func TestAddressMatchListExcludesIPAddress(t *testing.T) {
func TestAddressMatchListExcludesIPAddressWithNone(t *testing.T) {
aml := &AddressMatchList{
Elements: []*AddressMatchListElement{
{ACLName: "none"},
{IPAddressOrACLName: "none"},
},
}
require.True(t, aml.ExcludesIPAddress("127.0.0.1"))
Expand All @@ -37,7 +37,7 @@ func TestAddressMatchListExcludesIPAddressWithNone(t *testing.T) {
func TestAddressMatchListExcludesIPAddressWithAny(t *testing.T) {
aml := &AddressMatchList{
Elements: []*AddressMatchListElement{
{ACLName: "any"},
{IPAddressOrACLName: "any"},
},
}
require.False(t, aml.ExcludesIPAddress("127.0.0.1"))
Expand Down
2 changes: 1 addition & 1 deletion backend/appcfg/bind9/allowtransfer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ func (at *AllowTransfer) IsDisabled() bool {
// By default, the transfer is disabled. It is also disabled when it is none.
// If any of the elements is not none, the transfer is enabled.
return len(at.AddressMatchList.Elements) == 0 || !slices.ContainsFunc(at.AddressMatchList.Elements, func(ame *AddressMatchListElement) bool {
return ame.ACLName != "none"
return ame.IPAddressOrACLName != "none"
})
}
6 changes: 3 additions & 3 deletions backend/appcfg/bind9/allowtransfer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestAllowTransferIsDisabledNone(t *testing.T) {
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{
{
ACLName: "none",
IPAddressOrACLName: "none",
},
},
},
Expand All @@ -37,10 +37,10 @@ func TestAllowTransferIsNotDisabled(t *testing.T) {
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{
{
ACLName: "none",
IPAddressOrACLName: "none",
},
{
IPAddress: "127.0.0.1",
IPAddressOrACLName: "127.0.0.1",
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions backend/appcfg/bind9/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ func (c *Config) getKeyFromAddressMatchList(level int, addressMatchList *Address
case element.ACL != nil:
// Recursively search for a key in the inline ACL.
return c.getKeyFromAddressMatchList(level+1, element.ACL.AddressMatchList)
case element.ACLName != "":
case element.IPAddressOrACLName != "":
// Recursively search for a key in the referenced ACL.
acl := c.GetACL(element.ACLName)
acl := c.GetACL(element.IPAddressOrACLName)
if acl != nil {
return c.getKeyFromAddressMatchList(level+1, acl.AddressMatchList)
}
Expand Down
8 changes: 4 additions & 4 deletions backend/appcfg/bind9/listenon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func GetDefaultListenOnClauses() *ListenOnClauses {
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{
{
IPAddress: "127.0.0.1",
IPAddressOrACLName: "127.0.0.1",
},
},
},
Expand Down Expand Up @@ -67,8 +67,8 @@ func (l *ListenOn) GetPreferredIPAddress(allowTransferMatchList *AddressMatchLis
return "::1"
}
for _, element := range l.AddressMatchList.Elements {
if element.IPAddress != "" && !element.Negation && !allowTransferMatchList.ExcludesIPAddress(element.IPAddress) {
return element.IPAddress
if element.IPAddressOrACLName != "" && !element.Negation && !allowTransferMatchList.ExcludesIPAddress(element.IPAddressOrACLName) {
return element.IPAddressOrACLName
}
}
return ""
Expand All @@ -86,7 +86,7 @@ func (l *ListenOn) GetPort() int64 {
// Checks if the listen-on clause includes the specified IP address.
func (l *ListenOn) IncludesIPAddress(ipAddress string) bool {
for _, element := range l.AddressMatchList.Elements {
if element.IPAddress == ipAddress && !element.Negation {
if element.IPAddressOrACLName == ipAddress && !element.Negation {
return true
}
}
Expand Down
40 changes: 20 additions & 20 deletions backend/appcfg/bind9/listenon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func TestGetDefaultListenOnClauses(t *testing.T) {
listenOnClauses := GetDefaultListenOnClauses()
require.Len(t, *listenOnClauses, 1)
require.Len(t, (*listenOnClauses)[0].AddressMatchList.Elements, 1)
require.Equal(t, "127.0.0.1", (*listenOnClauses)[0].AddressMatchList.Elements[0].IPAddress)
require.Equal(t, "127.0.0.1", (*listenOnClauses)[0].AddressMatchList.Elements[0].IPAddressOrACLName)
require.Equal(t, int64(53), (*listenOnClauses)[0].GetPort())
require.True(t, (*listenOnClauses)[0].IncludesIPAddress("127.0.0.1"))
require.False(t, (*listenOnClauses)[0].IncludesIPAddress("0.0.0.0"))
Expand All @@ -28,7 +28,7 @@ func TestGetMatchingListenOnDefault(t *testing.T) {
require.NotNil(t, listenOn)
require.Len(t, *listenOnClauses, 1)
require.Len(t, (*listenOnClauses)[0].AddressMatchList.Elements, 1)
require.Equal(t, "127.0.0.1", (*listenOnClauses)[0].AddressMatchList.Elements[0].IPAddress)
require.Equal(t, "127.0.0.1", (*listenOnClauses)[0].AddressMatchList.Elements[0].IPAddressOrACLName)
require.Equal(t, int64(53), listenOn.GetPort())
}

Expand All @@ -38,19 +38,19 @@ func TestGetMatchingListenOnMultipleZeroAddress(t *testing.T) {
listenOnClauses := ListenOnClauses{
&ListenOn{
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{{IPAddress: "192.0.2.1"}},
Elements: []*AddressMatchListElement{{IPAddressOrACLName: "192.0.2.1"}},
},
},
&ListenOn{
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{{IPAddress: "0.0.0.0"}},
Elements: []*AddressMatchListElement{{IPAddressOrACLName: "0.0.0.0"}},
},
},
}
listenOn := listenOnClauses.GetMatchingListenOn(53)
require.NotNil(t, listenOn)
require.Len(t, listenOn.AddressMatchList.Elements, 1)
require.Equal(t, "0.0.0.0", listenOn.AddressMatchList.Elements[0].IPAddress)
require.Equal(t, "0.0.0.0", listenOn.AddressMatchList.Elements[0].IPAddressOrACLName)
require.Equal(t, int64(53), listenOn.GetPort())
}

Expand All @@ -60,19 +60,19 @@ func TestGetMatchingListenOnMultipleLoopbackAddress(t *testing.T) {
listenOnClauses := ListenOnClauses{
&ListenOn{
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{{IPAddress: "192.0.2.1"}},
Elements: []*AddressMatchListElement{{IPAddressOrACLName: "192.0.2.1"}},
},
},
&ListenOn{
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{{IPAddress: "127.0.0.1"}},
Elements: []*AddressMatchListElement{{IPAddressOrACLName: "127.0.0.1"}},
},
},
}
listenOn := listenOnClauses.GetMatchingListenOn(53)
require.NotNil(t, listenOn)
require.Len(t, listenOn.AddressMatchList.Elements, 1)
require.Equal(t, "127.0.0.1", listenOn.AddressMatchList.Elements[0].IPAddress)
require.Equal(t, "127.0.0.1", listenOn.AddressMatchList.Elements[0].IPAddressOrACLName)
require.Equal(t, int64(53), listenOn.GetPort())
}

Expand All @@ -82,20 +82,20 @@ func TestGetMatchingListenOnMultipleLoopbackAddressPortNumber(t *testing.T) {
listenOnClauses := ListenOnClauses{
&ListenOn{
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{{IPAddress: "192.0.2.1"}},
Elements: []*AddressMatchListElement{{IPAddressOrACLName: "192.0.2.1"}},
},
Port: storkutil.Ptr(int64(853)),
},
&ListenOn{
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{{IPAddress: "127.0.0.1"}},
Elements: []*AddressMatchListElement{{IPAddressOrACLName: "127.0.0.1"}},
},
},
}
listenOn := listenOnClauses.GetMatchingListenOn(853)
require.NotNil(t, listenOn)
require.Len(t, listenOn.AddressMatchList.Elements, 1)
require.Equal(t, "192.0.2.1", listenOn.AddressMatchList.Elements[0].IPAddress)
require.Equal(t, "192.0.2.1", listenOn.AddressMatchList.Elements[0].IPAddressOrACLName)
require.Equal(t, int64(853), listenOn.GetPort())
}

Expand All @@ -105,19 +105,19 @@ func TestGetMatchingListenOnMultipleZeroAddressIPv6(t *testing.T) {
listenOnClauses := ListenOnClauses{
&ListenOn{
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{{IPAddress: "2001:db8:1::1"}},
Elements: []*AddressMatchListElement{{IPAddressOrACLName: "2001:db8:1::1"}},
},
},
&ListenOn{
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{{IPAddress: "::"}},
Elements: []*AddressMatchListElement{{IPAddressOrACLName: "::"}},
},
},
}
listenOn := listenOnClauses.GetMatchingListenOn(53)
require.NotNil(t, listenOn)
require.Len(t, listenOn.AddressMatchList.Elements, 1)
require.Equal(t, "::", listenOn.AddressMatchList.Elements[0].IPAddress)
require.Equal(t, "::", listenOn.AddressMatchList.Elements[0].IPAddressOrACLName)
require.Equal(t, int64(53), listenOn.GetPort())
}

Expand All @@ -127,19 +127,19 @@ func TestGetMatchingListenOnMultipleLoopbackAddressIPv6(t *testing.T) {
listenOnClauses := ListenOnClauses{
&ListenOn{
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{{IPAddress: "2001:db8:1::1"}},
Elements: []*AddressMatchListElement{{IPAddressOrACLName: "2001:db8:1::1"}},
},
},
&ListenOn{
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{{IPAddress: "::1"}},
Elements: []*AddressMatchListElement{{IPAddressOrACLName: "::1"}},
},
},
}
listenOn := listenOnClauses.GetMatchingListenOn(53)
require.NotNil(t, listenOn)
require.Len(t, listenOn.AddressMatchList.Elements, 1)
require.Equal(t, "::1", listenOn.AddressMatchList.Elements[0].IPAddress)
require.Equal(t, "::1", listenOn.AddressMatchList.Elements[0].IPAddressOrACLName)
require.Equal(t, int64(53), listenOn.GetPort())
}

Expand All @@ -148,19 +148,19 @@ func TestGetMatchingListenOnMultipleLoopbackAddressPortNumberIPv6(t *testing.T)
listenOnClauses := ListenOnClauses{
&ListenOn{
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{{IPAddress: "2001:db8:1::1"}},
Elements: []*AddressMatchListElement{{IPAddressOrACLName: "2001:db8:1::1"}},
},
Port: storkutil.Ptr(int64(853)),
},
&ListenOn{
AddressMatchList: &AddressMatchList{
Elements: []*AddressMatchListElement{{IPAddress: "::1"}},
Elements: []*AddressMatchListElement{{IPAddressOrACLName: "::1"}},
},
},
}
listenOn := listenOnClauses.GetMatchingListenOn(853)
require.NotNil(t, listenOn)
require.Len(t, listenOn.AddressMatchList.Elements, 1)
require.Equal(t, "2001:db8:1::1", listenOn.AddressMatchList.Elements[0].IPAddress)
require.Equal(t, "2001:db8:1::1", listenOn.AddressMatchList.Elements[0].IPAddressOrACLName)
require.Equal(t, int64(853), listenOn.GetPort())
}
Loading