Use Go 1.24

diff --git a/auth.go b/auth.go
index 02bf16d0a2f8f86fe8c7faa46e37ec7e4898a77b..fdb565b117a86951e11b65e5810b7f43c8ea529f 100644 (file)
--- a/auth.go
+++ b/auth.go
@@ -38,7 +38,7 @@ func performAuth(w http.ResponseWriter, r *http.Request, cfg *AuthCfg) (string,
        if err != nil {
                return username, err
        }
-       for _, line := range strings.Split(string(data), "\n") {
+       for line := range strings.SplitSeq(string(data), "\n") {
                if len(line) == 0 || line[0] == '#' {
                        continue
                }

diff --git a/cmd/godlighty/main.go b/cmd/godlighty/main.go
index 8bbadea98d2f8493de68caadcf06f3f07ccdb52e..5ca038034f3369e278534acbced0d342ca3429eb 100644 (file)
--- a/cmd/godlighty/main.go
+++ b/cmd/godlighty/main.go
@@ -76,7 +76,7 @@ func main() {
                }
        } else {
                gids := []int{}
-               for _, g := range strings.Split(*doSetGIDs, ",") {
+               for g := range strings.SplitSeq(*doSetGIDs, ",") {
                        var gid int
                        gid, err = strconv.Atoi(g)
                        if err != nil {

diff --git a/go.mod b/go.mod
index 5eefacf8af387d69f087692b59f2d3b5e608900b..cacbfd5d28a25dfa76dff833e91fbbd60cb69128 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module go.stargrave.org/godlighty
 
-go 1.21.5
+go 1.24
 
 require (
        github.com/davecgh/go-spew v1.1.1

diff --git a/handler.go b/handler.go
index 19a5c6454c0ee5d1efe8413817c6bad4774f8eaa..4ac2b0480f9be5c2f7386332d923d1d5cbb289fe 100644 (file)
--- a/handler.go
+++ b/handler.go
@@ -46,10 +46,10 @@ const (
 
 var (
        gzPool = sync.Pool{
-               New: func() interface{} { return gzip.NewWriter(io.Discard) },
+               New: func() any { return gzip.NewWriter(io.Discard) },
        }
        zstdPool = sync.Pool{
-               New: func() interface{} {
+               New: func() any {
                        w, err := zstd.NewWriter(
                                io.Discard,
                                zstd.WithEncoderLevel(zstd.SpeedDefault),

diff --git a/orig.go b/orig.go
index 9e4ca70daa2e495e033060e475c7e7894bbb058b..d3e6d7d11a5135913f2eae1c2293febbd534f78a 100644 (file)
--- a/orig.go
+++ b/orig.go
@@ -17,18 +17,16 @@
 
 package godlighty
 
-import "strings"
+import (
+       "slices"
+       "strings"
+)
 
 func containsDotDot(v string) bool {
        if !strings.Contains(v, "..") {
                return false
        }
-       for _, ent := range strings.FieldsFunc(v, isSlashRune) {
-               if ent == ".." {
-                       return true
-               }
-       }
-       return false
+       return slices.Contains(strings.FieldsFunc(v, isSlashRune), "..")
 }
 
 func isSlashRune(r rune) bool { return r == '/' || r == '\\' }

diff --git a/rc/mime.go b/rc/mime.go
index 75f3cf799d154721e6fecae055c800fe964cd3e1..6cb2efd043e10fbc226007e25fb2a5bae5a66b26 100644 (file)
--- a/rc/mime.go
+++ b/rc/mime.go
@@ -25,7 +25,7 @@ func parseMIME(p string) []MIMEEntry {
                panic(err)
        }
        entries := make([]MIMEEntry, 0)
-       for _, line := range strings.Split(string(tsv), "\n") {
+       for line := range strings.SplitSeq(string(tsv), "\n") {
                if len(line) == 0 || line[0] == '#' {
                        continue
                }

diff --git a/tls.go b/tls.go
index 346eaeb94bf5665fc34407bc8c930149421cf544..7ccc8f7664656914ca68e7b414a0345c2115cf1b 100644 (file)
--- a/tls.go
+++ b/tls.go
@@ -23,6 +23,7 @@ import (
        "fmt"
        "log"
        "os"
+       "slices"
 )
 
 var (
@@ -39,24 +40,14 @@ var (
 )
 
 func CHIHasTLS13(chi *tls.ClientHelloInfo) bool {
-       for _, v := range chi.SupportedVersions {
-               if v == tls.VersionTLS13 {
-                       return true
-               }
-       }
-       return false
+       return slices.Contains(chi.SupportedVersions, tls.VersionTLS13)
 }
 
 func CHIHasEdDSA(chi *tls.ClientHelloInfo) bool {
        if !CHIHasTLS13(chi) {
                return false
        }
-       for _, ss := range chi.SignatureSchemes {
-               if ss == tls.Ed25519 {
-                       return true
-               }
-       }
-       return false
+       return slices.Contains(chi.SignatureSchemes, tls.Ed25519)
 }
 
 func GetCertificate(chi *tls.ClientHelloInfo) (*tls.Certificate, error) {