Merge pull request #71 from sudosammy/dev

dependancy bump & tests

VERSION

@@ -1 +1 @@
-3.4.8
+3.4.9

go.mod

@@ -1,27 +1,28 @@
 module github.com/sudosammy/knary/v3
 
-go 1.21
+go 1.22
 
-toolchain go1.22.1
+toolchain go1.23.0
 
 require (
 	github.com/blang/semver/v4 v4.0.0
-	github.com/fatih/color v1.16.0
-	github.com/go-acme/lego/v4 v4.16.1
+	github.com/fatih/color v1.17.0
+	github.com/go-acme/lego/v4 v4.17.4
 	github.com/joho/godotenv v1.5.1
-	github.com/miekg/dns v1.1.58
+	github.com/miekg/dns v1.1.62
 	github.com/radovskyb/watcher v1.0.7
-	golang.org/x/net v0.22.0
+	golang.org/x/net v0.28.0
 )
 
 require (
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
-	github.com/go-jose/go-jose/v4 v4.0.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.4 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/mod v0.16.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.19.0 // indirect
+	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/mod v0.20.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/tools v0.24.0 // indirect
 )

go.sum

@@ -1,47 +1,47 @@
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
-github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
-github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
+github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
-github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
-github.com/go-acme/lego/v4 v4.16.1 h1:JxZ93s4KG0jL27rZ30UsIgxap6VGzKuREsSkkyzeoCQ=
-github.com/go-acme/lego/v4 v4.16.1/go.mod h1:AVvwdPned/IWpD/ihHhMsKnveF7HHYAz/CmtXi7OZoE=
-github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U=
-github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
+github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
+github.com/go-acme/lego/v4 v4.17.4 h1:h0nePd3ObP6o7kAkndtpTzCw8shOZuWckNYeUQwo36Q=
+github.com/go-acme/lego/v4 v4.17.4/go.mod h1:dU94SvPNqimEeb7EVilGGSnS0nU1O5Exir0pQ4QFL4U=
+github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
+github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
-github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY=
+github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
+github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/radovskyb/watcher v1.0.7 h1:AYePLih6dpmS32vlHfhCeli8127LzkIgwJGcwwe8tUE=
 github.com/radovskyb/watcher v1.0.7/go.mod h1:78okwvY5wPdzcb1UYnip1pvrZNIVEIh/Cm+ZuvsUYIg=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
-golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
-golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
+golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
+golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
+golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
-golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
+golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
+golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

libknary/dns_test.go

@@ -1,56 +1,14 @@
 package libknary
 
 import (
-	"github.com/miekg/dns"
-	"net"
-	"sync"
-	"time"
+	"testing"
 )
 
-// code for 3 functions below here is taken and modified from
-// here: https://github.com/miekg/dns/blob/67373879ce327b5fd112d9301d0a4d62bad6b904/server_test.go
-func GokuServer(w dns.ResponseWriter, req *dns.Msg) {
-	m := new(dns.Msg)
-	m.SetReply(req)
+func TestInfoLog(t *testing.T) {
+	ipaddr := "127.0.0.1"
+	reverse := "example.com"
+	name := "example"
+	infoLog(ipaddr, reverse, name)
 
-	//no idea why m.Extra doesnt work but m.Answer does
-	//m.Extra = make([]dns.RR, 1)
-	m.Answer = make([]dns.RR, 1)
-	m.Answer[0] = &dns.A{Hdr: dns.RR_Header{Name: m.Question[0].Name, Rrtype: dns.TypeA, Class: dns.ClassANY}, A: net.IPv4(127, 0, 0, 1)}
-	w.WriteMsg(m)
-}
-
-func RunLocalUDPServer(laddr string) (*dns.Server, string, error) {
-	server, l, _, err := RunLocalUDPServerWithFinChan(laddr)
-
-	return server, l, err
-}
-
-func RunLocalUDPServerWithFinChan(laddr string, opts ...func(*dns.Server)) (*dns.Server, string, chan error, error) {
-	pc, err := net.ListenPacket("udp", laddr)
-	if err != nil {
-		return nil, "", nil, err
-	}
-	server := &dns.Server{PacketConn: pc, ReadTimeout: time.Hour, WriteTimeout: time.Hour}
-
-	waitLock := sync.Mutex{}
-	waitLock.Lock()
-	server.NotifyStartedFunc = waitLock.Unlock
-
-	// fin must be buffered so the goroutine below won't block
-	// forever if fin is never read from. This always happens
-	// in RunLocalUDPServer and can happen in TestShutdownUDP.
-	fin := make(chan error, 1)
-
-	for _, opt := range opts {
-		opt(server)
-	}
-
-	go func() {
-		fin <- server.ActivateAndServe()
-		pc.Close()
-	}()
-
-	waitLock.Lock()
-	return server, pc.LocalAddr().String(), fin, nil
+	// There are no assertions in this test at the moment
 }

libknary/webhooks_test.go

@@ -0,0 +1,31 @@
+package libknary
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"testing"
+)
+
+func TestSendMsg(t *testing.T) {
+	// Create a test server to capture HTTP requests
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// Verify the request URL and method
+		switch r.URL.String() {
+		case "/":
+			if r.Method != http.MethodPost {
+				t.Errorf("Expected POST request for Slack webhook, got %s", r.Method)
+			}
+		default:
+			t.Errorf("Unexpected request to URL: %s", r.URL.String())
+		}
+	}))
+
+	defer server.Close()
+
+	// Override the Slack webhook URL with the test server URL
+	os.Setenv("SLACK_WEBHOOK", server.URL)
+
+	// SLACK_WEBHOOK is set
+	sendMsg("Test message for Slack")
+}

libknary/zones.go

@@ -3,7 +3,6 @@ package libknary
 import (
 	"bufio"
 	"fmt"
-	"log"
 	"os"
 	"strconv"
 	"strings"
@@ -44,11 +43,8 @@ func LoadZone() (bool, error) {
 	}
 
 	if err := zp.Err(); err != nil {
-		if err != nil {
-			logger("ERROR", err.Error())
-			GiveHead(2)
-			log.Fatal(err)
-		}
+		logger("ERROR", err.Error())
+		return false, err
 	}
 
 	Printy("Monitoring "+strconv.Itoa(zoneCounter)+" items in zone", 1)
@@ -57,6 +53,11 @@ func LoadZone() (bool, error) {
 }
 
 func inZone(needle string, qType uint16) (map[int]dns.RR, bool) {
+	// if last character of needle isn't a period, add it
+	if needle[len(needle)-1] != '.' {
+		needle += "."
+	}
+
 	if val, ok := zoneMap[strings.ToLower(needle)]; ok {
 		// this (sub)domain is present in the zone file
 		// confirm whether one or many match the qType
@@ -102,6 +103,11 @@ func addZone(fqdn string, ttl int, qType string, value string) error {
 }
 
 func remZone(fqdn string) {
+	// if last character of fqdn isn't a period, add it
+	if fqdn[len(fqdn)-1] != '.' {
+		fqdn += "."
+	}
+
 	// this is pretty dodgy.
 	// we're hoping that the last zone added to the map is the one we want to delete
 	lastVal := len(zoneMap[fqdn]) - 1

libknary/zones_test.go

@@ -3,6 +3,8 @@ package libknary
 import (
 	"os"
 	"testing"
+
+	"github.com/miekg/dns"
 )
 
 func TestLoadZone_WhenZoneFileExists_ReturnsTrueAndNoError(t *testing.T) {
@@ -22,6 +24,24 @@ func TestLoadZone_WhenZoneFileExists_ReturnsTrueAndNoError(t *testing.T) {
 	}
 }
 
+func TestLoadZone_WhenZoneFileInvalid_ReturnsError(t *testing.T) {
+	os.Setenv("ZONE_FILE", ".zone_test.txt")
+	// No trailing period
+	if err := os.WriteFile(".zone_test.txt", []byte("example.com IN A 192.0.2.1"), 0644); err != nil {
+		t.Fatal(err)
+	}
+	defer os.Remove(".zone_test.txt")
+
+	result, err := LoadZone()
+
+	if err == nil {
+		t.Errorf("Expected an error")
+	}
+	if result == true {
+		t.Error("Expected result to be false")
+	}
+}
+
 func TestLoadZone_WhenZoneFileDoesNotExist_ReturnsFalseAndError(t *testing.T) {
 	os.Setenv("ZONE_FILE", "nonexistent.txt")
 
@@ -50,3 +70,64 @@ func TestAddZone_WhenInvalidInput_ReturnsError(t *testing.T) {
 		t.Error("Expected an error")
 	}
 }
+
+func TestInZone_WhenZoneExists_ReturnsNoError(t *testing.T) {
+	fqdn := "example.com"
+	addZone(fqdn, 3600, "A", "192.0.2.1")
+
+	rr, foundInZone := inZone(fqdn, dns.TypeA)
+
+	if rr == nil {
+		t.Error("Expected RR not found")
+	}
+
+	if foundInZone != true {
+		t.Error("Expected zone not found")
+	}
+}
+
+func TestInZone_WhenZoneDoesNotExist_ReturnsNoError(t *testing.T) {
+	rr, foundInZone := inZone("not-exists.com", dns.TypeA)
+
+	if rr != nil {
+		t.Error("Unexpected RR found")
+	}
+
+	if foundInZone != false {
+		t.Error("Unexpected zone found")
+	}
+}
+
+func TestRemZone_WhenZoneExists_DeletesZoneAndReturnsNoError(t *testing.T) {
+	fqdn := "another-example.com"
+	err := addZone(fqdn, 3600, "A", "192.0.2.1")
+
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+
+	remZone(fqdn)
+
+	// Check if zone is deleted
+	_, foundInZone := inZone(fqdn, dns.TypeA)
+	if foundInZone == true {
+		t.Error("Expected zone not deleted")
+	}
+}
+
+func TestRemZone_WhenZoneDoesNotExist_DoesNotDeleteZoneAndReturnsNoError(t *testing.T) {
+	fqdn := "another-example.com"
+	err := addZone(fqdn, 3600, "A", "192.0.2.2")
+
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+
+	remZone("not-exists.com")
+
+	// Check if zone is not deleted
+	_, foundInZone := inZone(fqdn, dns.TypeA)
+	if foundInZone != true {
+		t.Error("Unexpected zone deleted")
+	}
+}

main.go

@@ -15,7 +15,7 @@ import (
 )
 
 const (
-	VERSION       = "3.4.8"
+	VERSION       = "3.4.9"
 	GITHUB        = "https://github.com/sudosammy/knary"
 	GITHUBVERSION = "https://raw.githubusercontent.com/sudosammy/knary/master/VERSION"
 )
@@ -100,7 +100,14 @@ func main() {
 	// load lists, zone file & submit usage
 	libknary.LoadAllowlist()
 	libknary.LoadBlacklist()
-	libknary.LoadZone()
+
+	_, err = libknary.LoadZone()
+	if err != nil {
+		libknary.Printy("Error in zone file entries", 2)
+		libknary.GiveHead(2)
+		log.Fatal(err)
+	}
+
 	go libknary.UsageStats(VERSION)
 
 	if os.Getenv("HTTP") == "true" && os.Getenv("LETS_ENCRYPT") == "" && (os.Getenv("TLS_CRT") == "" || os.Getenv("TLS_KEY") == "") {