Update deps and CI actions

Author: jedisct1

.github/workflows/codeql-analysis.yml

@@ -28,10 +28,10 @@ jobs:
           go-version-file: 'go.mod'
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        uses: github/codeql-action/init@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        uses: github/codeql-action/autobuild@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        uses: github/codeql-action/analyze@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1

.github/workflows/releases.yml

@@ -130,7 +130,7 @@ jobs:
 
       - name: Create release and upload assets
         id: create_release
-        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
+        uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3.0.3
         if: startsWith(github.ref, 'refs/tags/') && env.release_exists == 'false'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -148,7 +148,7 @@ jobs:
 
       - name: Upload assets to existing release
         id: upload_to_existing_release
-        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
+        uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3.0.3
         if: startsWith(github.ref, 'refs/tags/') && env.release_exists == 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/zizmor.yml

@@ -27,4 +27,4 @@ jobs:
           persist-credentials: false
 
       - name: Run zizmor
-        uses: zizmorcore/zizmor-action@3dc1ecc9bcb9e94e9b2c709687979e1298497054 # v0.6.2
+        uses: zizmorcore/zizmor-action@cc914d7f3750a2d13d75c7f184a1060aa0e9d482 # v0.6.4

dnscrypt-proxy/common.go

@@ -14,7 +14,7 @@ import (
 	"time"
 	"unicode"
 
-	iradix "github.com/hashicorp/go-immutable-radix"
+	iradix "github.com/hashicorp/go-immutable-radix/v2"
 	"github.com/jedisct1/dlog"
 	"github.com/k-sone/critbitgo"
 )
@@ -319,7 +319,7 @@ func ProcessConfigLines(lines string, processor func(line string, lineNo int) er
 //   - ips (map): exact IP addresses
 //   - prefixes (radix tree): wildcard prefix rules (e.g. "192.168.*")
 //   - networks (critbit net): CIDR network masks (e.g. "10.0.0.0/8")
-func LoadIPRules(lines string, prefixes *iradix.Tree, ips map[string]any, networks *critbitgo.Net) (*iradix.Tree, error) {
+func LoadIPRules(lines string, prefixes *iradix.Tree[struct{}], ips map[string]any, networks *critbitgo.Net) (*iradix.Tree[struct{}], error) {
 	err := ProcessConfigLines(lines, func(line string, lineNo int) error {
 		if strings.Contains(line, "/") {
 			if networks == nil {
@@ -338,7 +338,7 @@ func LoadIPRules(lines string, prefixes *iradix.Tree, ips map[string]any, networ
 		}
 
 		if trailingStar {
-			prefixes, _, _ = prefixes.Insert([]byte(cleanLine), 0)
+			prefixes, _, _ = prefixes.Insert([]byte(cleanLine), struct{}{})
 		} else {
 			ips[cleanLine] = true
 		}

dnscrypt-proxy/common_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	iradix "github.com/hashicorp/go-immutable-radix"
+	iradix "github.com/hashicorp/go-immutable-radix/v2"
 	"github.com/jedisct1/dlog"
 	"github.com/k-sone/critbitgo"
 )
@@ -46,7 +46,7 @@ func TestLoadIPRulesErrorLineNumbers(t *testing.T) {
 				t.Fatal(err)
 			}
 			ips := make(map[string]any)
-			if _, err := LoadIPRules("# Rules\n\n"+tt.rule+"\n192.0.2.1\n", iradix.New(), ips, tt.networks); err != nil {
+			if _, err := LoadIPRules("# Rules\n\n"+tt.rule+"\n192.0.2.1\n", iradix.New[struct{}](), ips, tt.networks); err != nil {
 				t.Fatal(err)
 			}
 			if ips["192.0.2.1"] != true {

dnscrypt-proxy/plugin_allow_ip.go

@@ -7,13 +7,13 @@ import (
 	"sync"
 
 	"codeberg.org/miekg/dns"
-	iradix "github.com/hashicorp/go-immutable-radix"
+	iradix "github.com/hashicorp/go-immutable-radix/v2"
 	"github.com/jedisct1/dlog"
 	"github.com/k-sone/critbitgo"
 )
 
 type PluginAllowedIP struct {
-	allowedPrefixes *iradix.Tree
+	allowedPrefixes *iradix.Tree[struct{}]
 	allowedIPs      map[string]any
 	allowedNetworks *critbitgo.Net
 	logger          io.Writer
@@ -24,7 +24,7 @@ type PluginAllowedIP struct {
 	rwLock          sync.RWMutex
 	configFile      string
 	configWatcher   *ConfigWatcher
-	stagingPrefixes *iradix.Tree
+	stagingPrefixes *iradix.Tree[struct{}]
 	stagingIPs      map[string]any
 	stagingNetworks *critbitgo.Net
 }
@@ -46,7 +46,7 @@ func (plugin *PluginAllowedIP) Init(proxy *Proxy) error {
 		return err
 	}
 
-	plugin.allowedPrefixes = iradix.New()
+	plugin.allowedPrefixes = iradix.New[struct{}]()
 	plugin.allowedIPs = make(map[string]any)
 	plugin.allowedNetworks = critbitgo.NewNet()
 
@@ -72,7 +72,7 @@ func (plugin *PluginAllowedIP) Drop() error {
 func (plugin *PluginAllowedIP) PrepareReload() error {
 	return StandardPrepareReloadPattern(plugin.Name(), plugin.configFile, func(lines string) error {
 		// Create staging structures
-		plugin.stagingPrefixes = iradix.New()
+		plugin.stagingPrefixes = iradix.New[struct{}]()
 		plugin.stagingIPs = make(map[string]any)
 		plugin.stagingNetworks = critbitgo.NewNet()
 

dnscrypt-proxy/plugin_block_ip.go

@@ -7,13 +7,13 @@ import (
 	"sync"
 
 	"codeberg.org/miekg/dns"
-	iradix "github.com/hashicorp/go-immutable-radix"
+	iradix "github.com/hashicorp/go-immutable-radix/v2"
 	"github.com/jedisct1/dlog"
 	"github.com/k-sone/critbitgo"
 )
 
 type PluginBlockIP struct {
-	blockedPrefixes *iradix.Tree
+	blockedPrefixes *iradix.Tree[struct{}]
 	blockedIPs      map[string]any
 	blockedNetworks *critbitgo.Net
 	logger          io.Writer
@@ -24,7 +24,7 @@ type PluginBlockIP struct {
 	rwLock          sync.RWMutex
 	configFile      string
 	configWatcher   *ConfigWatcher
-	stagingPrefixes *iradix.Tree
+	stagingPrefixes *iradix.Tree[struct{}]
 	stagingIPs      map[string]any
 	stagingNetworks *critbitgo.Net
 }
@@ -46,7 +46,7 @@ func (plugin *PluginBlockIP) Init(proxy *Proxy) error {
 		return err
 	}
 
-	plugin.blockedPrefixes = iradix.New()
+	plugin.blockedPrefixes = iradix.New[struct{}]()
 	plugin.blockedIPs = make(map[string]any)
 	plugin.blockedNetworks = critbitgo.NewNet()
 
@@ -72,7 +72,7 @@ func (plugin *PluginBlockIP) Drop() error {
 func (plugin *PluginBlockIP) PrepareReload() error {
 	return StandardPrepareReloadPattern(plugin.Name(), plugin.configFile, func(lines string) error {
 		// Create staging structures
-		plugin.stagingPrefixes = iradix.New()
+		plugin.stagingPrefixes = iradix.New[struct{}]()
 		plugin.stagingIPs = make(map[string]any)
 		plugin.stagingNetworks = critbitgo.NewNet()
 

dnscrypt-proxy/service_linux.go

@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/coreos/go-systemd/daemon"
+	"github.com/coreos/go-systemd/v22/daemon"
 	clocksmith "github.com/jedisct1/go-clocksmith"
 )
 

dnscrypt-proxy/systemd_linux.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"slices"
 
-	"github.com/coreos/go-systemd/activation"
+	"github.com/coreos/go-systemd/v22/activation"
 	"github.com/jedisct1/dlog"
 )
 

go.mod

@@ -1,42 +1,45 @@
 module github.com/dnscrypt/dnscrypt-proxy
 
-go 1.27
+go 1.27.0
 
 require (
 	codeberg.org/miekg/dns v0.6.109
 	github.com/BurntSushi/toml v1.6.0
 	github.com/VividCortex/ewma v1.2.0
 	github.com/cloudflare/circl v1.6.5
-	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
+	github.com/coreos/go-systemd/v22 v22.7.0
 	github.com/dchest/safefile v0.0.0-20151022103144-855e8d98f185
 	github.com/fsnotify/fsnotify v1.10.1
 	github.com/gorilla/websocket v1.5.3
-	github.com/hashicorp/go-immutable-radix v1.3.1
+	github.com/hashicorp/go-immutable-radix/v2 v2.1.0
 	github.com/hectane/go-acl v1.0.0
 	github.com/jedisct1/dlog v0.0.0-20241212093805-3c5fd791b405
 	github.com/jedisct1/go-clocksmith v0.0.0-20260103230147-eff3e038eebd
 	github.com/jedisct1/go-dnsstamps v0.0.0-20260518121737-6579dc73e4a2
-	github.com/jedisct1/go-hpke-compact v0.0.0-20241212093903-5caa4621366f
+	github.com/jedisct1/go-hpke-compact v0.0.0-20260917221930-f479271ae452
 	github.com/jedisct1/go-ipcrypt v0.1.2
 	github.com/jedisct1/go-minisign v0.0.0-20260527172527-a09352b57a22
 	github.com/jedisct1/go-sieve-cache v0.1.9
 	github.com/jedisct1/xsecretbox v0.0.0-20241212092125-3afc4917ac41
 	github.com/k-sone/critbitgo v1.4.0
 	github.com/kardianos/service v1.3.0
 	github.com/lifenjoiner/dhcpdns v0.0.7
+	github.com/miekg/dns v1.1.72
 	github.com/powerman/check v1.13.0
 	github.com/quic-go/quic-go v0.62.0
-	golang.org/x/crypto v0.56.0
-	golang.org/x/net v0.58.0
-	golang.org/x/sys v0.47.0
+	golang.org/x/crypto v0.57.0
+	golang.org/x/net v0.59.0
+	golang.org/x/sys v0.48.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 )
 
 require (
 	github.com/hashicorp/go-syslog v1.0.0 // indirect
-	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/golang-lru v1.0.2 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/quic-go/qpack v0.6.0 // indirect
 	go.uber.org/mock v0.6.0 // indirect
-	golang.org/x/text v0.41.0 // indirect
+	golang.org/x/mod v0.41.0 // indirect
+	golang.org/x/sync v0.23.0 // indirect
+	golang.org/x/text v0.42.0 // indirect
+	golang.org/x/tools v0.49.0 // indirect
 )