Add tests for revised dnsagent

This commit is contained in:
arberkatellari
2023-06-23 09:46:07 -04:00
committed by Dan Christian Bogos
parent 5f04bcfe66
commit 620856f731
4 changed files with 404 additions and 19 deletions

View File

@@ -22,6 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package agents
import (
"crypto/tls"
"net/rpc"
"path"
"testing"
@@ -33,12 +34,18 @@ import (
"github.com/miekg/dns"
)
type dnsConns struct {
UDP *dns.Conn
TCP *dns.Conn
TCPTLS *dns.Conn
}
var (
dnsCfgPath string
dnsCfgDIR string
dnsCfg *config.CGRConfig
dnsRPC *rpc.Client
dnsClnt *dns.Conn // so we can cache the connection
dnsClnt *dnsConns // so we can cache the connection
sTestsDNS = []func(t *testing.T){
testDNSitInitCfg,
@@ -124,10 +131,28 @@ func testDNSitTPFromFolder(t *testing.T) {
// Connect DNS client to server
func testDNSitClntConn(t *testing.T) {
c := new(dns.Client)
c.TLSConfig = &tls.Config{}
var err error
if dnsClnt, err = c.Dial(dnsCfg.DNSAgentCfg().Listeners[0].Address); err != nil { // just testing the connection, not not saving it
dnsClnt = &dnsConns{}
if dnsClnt.UDP, err = c.Dial(dnsCfg.DNSAgentCfg().Listeners[0].Address); err != nil { // just testing the connection, not saving it
t.Fatal(err)
} else if dnsClnt == nil {
} else if dnsClnt.UDP == nil {
t.Fatalf("conn is nil")
}
c.Net = dnsCfg.DNSAgentCfg().Listeners[0].Network
if dnsClnt.TCP, err = c.Dial(dnsCfg.DNSAgentCfg().Listeners[0].Address); err != nil { // tcp has the same address as udp in this case so we can use the same here
t.Fatal(err)
} else if dnsClnt.TCP == nil {
t.Fatalf("conn is nil")
}
c.Net = dnsCfg.DNSAgentCfg().Listeners[1].Network
c.TLSConfig.InsecureSkipVerify = true
if dnsClnt.TCPTLS, err = c.Dial(dnsCfg.DNSAgentCfg().Listeners[1].Address); err != nil { // tcp and tcp-tls cannot be on the same address, otherwise tcp-tls and udp is allowed
t.Fatal(err)
} else if dnsClnt.TCPTLS == nil {
t.Fatalf("conn is nil")
}
}
@@ -135,10 +160,10 @@ func testDNSitClntConn(t *testing.T) {
func testDNSitClntNAPTRDryRun(t *testing.T) {
m := new(dns.Msg)
m.SetQuestion("3.6.9.4.7.1.7.1.5.6.8.9.4.e164.arpa.", dns.TypeNAPTR)
if err := dnsClnt.WriteMsg(m); err != nil {
if err := dnsClnt.UDP.WriteMsg(m); err != nil {
t.Error(err)
}
if rply, err := dnsClnt.ReadMsg(); err != nil {
if rply, err := dnsClnt.UDP.ReadMsg(); err != nil {
t.Error(err)
} else {
if rply.Rcode != dns.RcodeSuccess {
@@ -164,15 +189,112 @@ func testDNSitClntNAPTRDryRun(t *testing.T) {
t.Errorf("received: <%q>", answr.Replacement)
}
}
m.SetQuestion("3.6.9.4.7.1.7.1.5.6.8.9.4.e164.arpa.", dns.TypeNAPTR)
if err := dnsClnt.TCP.WriteMsg(m); err != nil {
t.Error(err)
}
if rply, err := dnsClnt.TCP.ReadMsg(); err != nil {
t.Error(err)
} else {
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
answr := rply.Answer[0].(*dns.NAPTR)
if answr.Order != 100 {
t.Errorf("received: <%q>", answr.Order)
}
if answr.Preference != 10 {
t.Errorf("received: <%q>", answr.Preference)
}
if answr.Flags != "U" {
t.Errorf("received: <%q>", answr.Flags)
}
if answr.Service != "E2U+SIP" {
t.Errorf("received: <%q>", answr.Service)
}
if answr.Regexp != "!^(.*)$!sip:1@172.16.1.10.!" {
t.Errorf("received: <%q>", answr.Regexp)
}
if answr.Replacement != "." {
t.Errorf("received: <%q>", answr.Replacement)
}
}
m.SetQuestion("3.6.9.4.7.1.7.1.5.6.8.9.4.e164.arpa.", dns.TypeNAPTR)
if err := dnsClnt.TCPTLS.WriteMsg(m); err != nil {
t.Error(err)
}
if rply, err := dnsClnt.TCPTLS.ReadMsg(); err != nil {
t.Error(err)
} else {
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
answr := rply.Answer[0].(*dns.NAPTR)
if answr.Order != 100 {
t.Errorf("received: <%q>", answr.Order)
}
if answr.Preference != 10 {
t.Errorf("received: <%q>", answr.Preference)
}
if answr.Flags != "U" {
t.Errorf("received: <%q>", answr.Flags)
}
if answr.Service != "E2U+SIP" {
t.Errorf("received: <%q>", answr.Service)
}
if answr.Regexp != "!^(.*)$!sip:1@172.16.1.10.!" {
t.Errorf("received: <%q>", answr.Regexp)
}
if answr.Replacement != "." {
t.Errorf("received: <%q>", answr.Replacement)
}
}
}
func testDNSitClntNAPTRAttributes(t *testing.T) {
m := new(dns.Msg)
m.SetQuestion("4.6.9.4.7.1.7.1.5.6.8.9.4.e164.arpa.", dns.TypeNAPTR)
if err := dnsClnt.WriteMsg(m); err != nil {
if err := dnsClnt.UDP.WriteMsg(m); err != nil {
t.Error(err)
}
if rply, err := dnsClnt.ReadMsg(); err != nil {
if rply, err := dnsClnt.UDP.ReadMsg(); err != nil {
t.Error(err)
} else {
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
answr := rply.Answer[0].(*dns.NAPTR)
if answr.Order != 100 {
t.Errorf("received: <%q>", answr.Order)
}
if answr.Regexp != "sip:1@172.16.1.1." {
t.Errorf("Expected :<%q> , received: <%q>", "sip:1\\@172.16.1.1.", answr.Regexp)
}
}
if err := dnsClnt.TCP.WriteMsg(m); err != nil {
t.Error(err)
}
if rply, err := dnsClnt.TCP.ReadMsg(); err != nil {
t.Error(err)
} else {
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
answr := rply.Answer[0].(*dns.NAPTR)
if answr.Order != 100 {
t.Errorf("received: <%q>", answr.Order)
}
if answr.Regexp != "sip:1@172.16.1.1." {
t.Errorf("Expected :<%q> , received: <%q>", "sip:1\\@172.16.1.1.", answr.Regexp)
}
}
if err := dnsClnt.TCPTLS.WriteMsg(m); err != nil {
t.Error(err)
}
if rply, err := dnsClnt.TCPTLS.ReadMsg(); err != nil {
t.Error(err)
} else {
if rply.Rcode != dns.RcodeSuccess {
@@ -191,10 +313,10 @@ func testDNSitClntNAPTRAttributes(t *testing.T) {
func testDNSitClntNAPTRSuppliers(t *testing.T) {
m := new(dns.Msg)
m.SetQuestion("5.6.9.4.7.1.7.1.5.6.8.9.4.e164.arpa.", dns.TypeNAPTR)
if err := dnsClnt.WriteMsg(m); err != nil {
if err := dnsClnt.UDP.WriteMsg(m); err != nil {
t.Error(err)
}
rply, err := dnsClnt.ReadMsg()
rply, err := dnsClnt.UDP.ReadMsg()
if err != nil {
t.Error(err)
} else if len(rply.Answer) != 2 {
@@ -214,6 +336,52 @@ func testDNSitClntNAPTRSuppliers(t *testing.T) {
if answr2.Regexp != "!^(.*)$!sip:1@172.16.1.12!" {
t.Errorf("received: <%q>", answr2.Regexp)
}
if err := dnsClnt.TCP.WriteMsg(m); err != nil {
t.Error(err)
}
rply, err = dnsClnt.TCP.ReadMsg()
if err != nil {
t.Error(err)
} else if len(rply.Answer) != 2 {
t.Fatalf("wrong number of records: %s", utils.ToIJSON(rply.Answer))
}
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
answr = rply.Answer[0].(*dns.NAPTR)
if answr.Order != 100 {
t.Errorf("received: <%v>", answr.Order)
}
if answr.Regexp != "!^(.*)$!sip:1@172.16.1.11!" {
t.Errorf("received: <%q>", answr.Regexp)
}
answr2 = rply.Answer[1].(*dns.NAPTR)
if answr2.Regexp != "!^(.*)$!sip:1@172.16.1.12!" {
t.Errorf("received: <%q>", answr2.Regexp)
}
if err := dnsClnt.TCPTLS.WriteMsg(m); err != nil {
t.Error(err)
}
rply, err = dnsClnt.TCPTLS.ReadMsg()
if err != nil {
t.Error(err)
} else if len(rply.Answer) != 2 {
t.Fatalf("wrong number of records: %s", utils.ToIJSON(rply.Answer))
}
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
answr = rply.Answer[0].(*dns.NAPTR)
if answr.Order != 100 {
t.Errorf("received: <%v>", answr.Order)
}
if answr.Regexp != "!^(.*)$!sip:1@172.16.1.11!" {
t.Errorf("received: <%q>", answr.Regexp)
}
answr2 = rply.Answer[1].(*dns.NAPTR)
if answr2.Regexp != "!^(.*)$!sip:1@172.16.1.12!" {
t.Errorf("received: <%q>", answr2.Regexp)
}
}
func testDNSitClntNAPTROpts(t *testing.T) {
@@ -221,10 +389,10 @@ func testDNSitClntNAPTROpts(t *testing.T) {
m.SetQuestion("5.6.9.4.7.1.7.1.5.6.8.9.5.e164.arpa.", dns.TypeNAPTR)
m.SetEdns0(4096, false)
m.IsEdns0().Option = append(m.IsEdns0().Option, &dns.EDNS0_ESU{Uri: "sip:cgrates@cgrates.org"})
if err := dnsClnt.WriteMsg(m); err != nil {
if err := dnsClnt.UDP.WriteMsg(m); err != nil {
t.Error(err)
}
rply, err := dnsClnt.ReadMsg()
rply, err := dnsClnt.UDP.ReadMsg()
if err != nil {
t.Error(err)
} else if len(rply.Answer) != 1 {
@@ -265,6 +433,96 @@ func testDNSitClntNAPTROpts(t *testing.T) {
} else if expected := "sip:cgrates@cgrates.net"; ov.Uri != expected {
t.Errorf("Expected :<%q> , received: <%q>", expected, ov.Uri)
}
if err := dnsClnt.TCP.WriteMsg(m); err != nil {
t.Error(err)
}
rply, err = dnsClnt.TCP.ReadMsg()
if err != nil {
t.Error(err)
} else if len(rply.Answer) != 1 {
t.Fatalf("wrong number of records: %s", utils.ToIJSON(rply.Answer))
}
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
answr = rply.Answer[0].(*dns.NAPTR)
if answr.Order != 100 {
t.Errorf("received: <%q>", answr.Order)
}
if answr.Preference != 10 {
t.Errorf("received: <%q>", answr.Preference)
}
if answr.Flags != "U" {
t.Errorf("received: <%q>", answr.Flags)
}
if answr.Service != "E2U+SIP" {
t.Errorf("received: <%q>", answr.Service)
}
if answr.Regexp != "!^(.*)$!sip:1@172.16.1.10.!" {
t.Errorf("received: <%q>", answr.Regexp)
}
if answr.Replacement != "." {
t.Errorf("received: <%q>", answr.Replacement)
}
if opts := rply.IsEdns0(); opts == nil {
t.Error("recieved nil options")
} else if len(opts.Option) != 2 {
t.Errorf("recieved wrong number of options: %v", len(opts.Option))
} else if ov, can := opts.Option[0].(*dns.EDNS0_ESU); !can {
t.Errorf("recieved wrong option type: %T", opts.Option[0])
} else if expected := "sip:cgrates@cgrates.com"; ov.Uri != expected {
t.Errorf("Expected :<%q> , received: <%q>", expected, ov.Uri)
} else if ov, can := opts.Option[1].(*dns.EDNS0_ESU); !can {
t.Errorf("recieved wrong option type: %T", opts.Option[1])
} else if expected := "sip:cgrates@cgrates.net"; ov.Uri != expected {
t.Errorf("Expected :<%q> , received: <%q>", expected, ov.Uri)
}
if err := dnsClnt.TCPTLS.WriteMsg(m); err != nil {
t.Error(err)
}
rply, err = dnsClnt.TCPTLS.ReadMsg()
if err != nil {
t.Error(err)
} else if len(rply.Answer) != 1 {
t.Fatalf("wrong number of records: %s", utils.ToIJSON(rply.Answer))
}
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
answr = rply.Answer[0].(*dns.NAPTR)
if answr.Order != 100 {
t.Errorf("received: <%q>", answr.Order)
}
if answr.Preference != 10 {
t.Errorf("received: <%q>", answr.Preference)
}
if answr.Flags != "U" {
t.Errorf("received: <%q>", answr.Flags)
}
if answr.Service != "E2U+SIP" {
t.Errorf("received: <%q>", answr.Service)
}
if answr.Regexp != "!^(.*)$!sip:1@172.16.1.10.!" {
t.Errorf("received: <%q>", answr.Regexp)
}
if answr.Replacement != "." {
t.Errorf("received: <%q>", answr.Replacement)
}
if opts := rply.IsEdns0(); opts == nil {
t.Error("recieved nil options")
} else if len(opts.Option) != 2 {
t.Errorf("recieved wrong number of options: %v", len(opts.Option))
} else if ov, can := opts.Option[0].(*dns.EDNS0_ESU); !can {
t.Errorf("recieved wrong option type: %T", opts.Option[0])
} else if expected := "sip:cgrates@cgrates.com"; ov.Uri != expected {
t.Errorf("Expected :<%q> , received: <%q>", expected, ov.Uri)
} else if ov, can := opts.Option[1].(*dns.EDNS0_ESU); !can {
t.Errorf("recieved wrong option type: %T", opts.Option[1])
} else if expected := "sip:cgrates@cgrates.net"; ov.Uri != expected {
t.Errorf("Expected :<%q> , received: <%q>", expected, ov.Uri)
}
}
func testDNSitClntNAPTROptsWithAttributes(t *testing.T) {
@@ -272,10 +530,10 @@ func testDNSitClntNAPTROptsWithAttributes(t *testing.T) {
m.SetQuestion("7.6.9.4.7.1.7.1.5.6.8.9.5.e164.arpa.", dns.TypeNAPTR)
m.SetEdns0(4096, false)
m.IsEdns0().Option = append(m.IsEdns0().Option, &dns.EDNS0_ESU{Uri: "sip:cgrates@cgrates.org"})
if err := dnsClnt.WriteMsg(m); err != nil {
if err := dnsClnt.UDP.WriteMsg(m); err != nil {
t.Error(err)
}
rply, err := dnsClnt.ReadMsg()
rply, err := dnsClnt.UDP.ReadMsg()
if err != nil {
t.Error(err)
} else if len(rply.Answer) != 1 {
@@ -312,6 +570,88 @@ func testDNSitClntNAPTROptsWithAttributes(t *testing.T) {
} else if expected := "sip:cgrates@e164.arpa"; ov.Uri != expected {
t.Errorf("Expected :<%q> , received: <%q>", expected, ov.Uri)
}
if err := dnsClnt.TCP.WriteMsg(m); err != nil {
t.Error(err)
}
rply, err = dnsClnt.TCP.ReadMsg()
if err != nil {
t.Error(err)
} else if len(rply.Answer) != 1 {
t.Fatalf("wrong number of records: %s", utils.ToIJSON(rply.Answer))
}
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
answr = rply.Answer[0].(*dns.NAPTR)
if answr.Order != 100 {
t.Errorf("received: <%q>", answr.Order)
}
if answr.Preference != 10 {
t.Errorf("received: <%q>", answr.Preference)
}
if answr.Flags != "U" {
t.Errorf("received: <%q>", answr.Flags)
}
if answr.Service != "E2U+SIP" {
t.Errorf("received: <%q>", answr.Service)
}
if answr.Regexp != "!^(.*)$!sip:1@172.16.1.10.!" {
t.Errorf("received: <%q>", answr.Regexp)
}
if answr.Replacement != "." {
t.Errorf("received: <%q>", answr.Replacement)
}
if opts := rply.IsEdns0(); opts == nil {
t.Error("recieved nil options")
} else if len(opts.Option) != 1 {
t.Errorf("recieved wrong number of options: %v", len(opts.Option))
} else if ov, can := opts.Option[0].(*dns.EDNS0_ESU); !can {
t.Errorf("recieved wrong option type: %T", opts.Option[0])
} else if expected := "sip:cgrates@e164.arpa"; ov.Uri != expected {
t.Errorf("Expected :<%q> , received: <%q>", expected, ov.Uri)
}
if err := dnsClnt.TCPTLS.WriteMsg(m); err != nil {
t.Error(err)
}
rply, err = dnsClnt.TCPTLS.ReadMsg()
if err != nil {
t.Error(err)
} else if len(rply.Answer) != 1 {
t.Fatalf("wrong number of records: %s", utils.ToIJSON(rply.Answer))
}
if rply.Rcode != dns.RcodeSuccess {
t.Errorf("failed to get an valid answer\n%v", rply)
}
answr = rply.Answer[0].(*dns.NAPTR)
if answr.Order != 100 {
t.Errorf("received: <%q>", answr.Order)
}
if answr.Preference != 10 {
t.Errorf("received: <%q>", answr.Preference)
}
if answr.Flags != "U" {
t.Errorf("received: <%q>", answr.Flags)
}
if answr.Service != "E2U+SIP" {
t.Errorf("received: <%q>", answr.Service)
}
if answr.Regexp != "!^(.*)$!sip:1@172.16.1.10.!" {
t.Errorf("received: <%q>", answr.Regexp)
}
if answr.Replacement != "." {
t.Errorf("received: <%q>", answr.Replacement)
}
if opts := rply.IsEdns0(); opts == nil {
t.Error("recieved nil options")
} else if len(opts.Option) != 1 {
t.Errorf("recieved wrong number of options: %v", len(opts.Option))
} else if ov, can := opts.Option[0].(*dns.EDNS0_ESU); !can {
t.Errorf("recieved wrong option type: %T", opts.Option[0])
} else if expected := "sip:cgrates@e164.arpa"; ov.Uri != expected {
t.Errorf("Expected :<%q> , received: <%q>", expected, ov.Uri)
}
}
func testDNSitStopEngine(t *testing.T) {

View File

@@ -62,6 +62,13 @@
"enabled": true,
},
"tls": {
"server_certificate" : "/usr/share/cgrates/tls/server.crt", // path to server certificate(must conatin server.crt + ca.crt)
"server_key":"/usr/share/cgrates/tls/server.key", // path to server key
"client_certificate" : "/usr/share/cgrates/tls/client.crt", // path to client certificate(must conatin client.crt + ca.crt)
"client_key":"/usr/share/cgrates/tls/client.key", // path to client key
"ca_certificate":"/usr/share/cgrates/tls/ca.crt",
},
"dns_agent": {
"enabled": true,
@@ -70,6 +77,14 @@
"address":":2053",
"network":"udp"
},
{
"address":":2053",
"network":"tcp"
},
{
"address":":2054",
"network":"tcp-tls"
},
],
"sessions_conns": ["*localhost"],

View File

@@ -67,14 +67,29 @@
"enabled": true,
},
"tls": {
"server_certificate" : "/usr/share/cgrates/tls/server.crt", // path to server certificate(must conatin server.crt + ca.crt)
"server_key":"/usr/share/cgrates/tls/server.key", // path to server key
"client_certificate" : "/usr/share/cgrates/tls/client.crt", // path to client certificate(must conatin client.crt + ca.crt)
"client_key":"/usr/share/cgrates/tls/client.key", // path to client key
"ca_certificate":"/usr/share/cgrates/tls/ca.crt",
},
"dns_agent": {
"enabled": true,
"listeners":[
{
"address":":2053",
{
"address":":2053",
"network":"udp"
}
},
{
"address":":2053",
"network":"tcp"
},
{
"address":":2054",
"network":"tcp-tls"
},
],
"sessions_conns": ["*localhost"],
},

View File

@@ -58,14 +58,29 @@
"enabled": true,
},
"tls": {
"server_certificate" : "/usr/share/cgrates/tls/server.crt", // path to server certificate(must conatin server.crt + ca.crt)
"server_key":"/usr/share/cgrates/tls/server.key", // path to server key
"client_certificate" : "/usr/share/cgrates/tls/client.crt", // path to client certificate(must conatin client.crt + ca.crt)
"client_key":"/usr/share/cgrates/tls/client.key", // path to client key
"ca_certificate":"/usr/share/cgrates/tls/ca.crt",
},
"dns_agent": {
"enabled": true,
"listeners":[
{
"address":":2053",
{
"address":":2053",
"network":"udp"
}
},
{
"address":":2053",
"network":"tcp"
},
{
"address":":2054",
"network":"tcp-tls"
},
],
"sessions_conns": ["*localhost"],
},