Go 1.23.4 & minor linter issues fixed (#42)

* Update to Go 1.23.4

* fix minor linter issues

---------

Signed-off-by: Wolfgang Ellsässer <67168186+wollomatic@users.noreply.github.com>

Author: wollomatic

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM --platform=$BUILDPLATFORM golang:1.23.5-alpine3.21 AS build
+FROM --platform=$BUILDPLATFORM golang:1.23.6-alpine3.21 AS build
 WORKDIR /application
 COPY . ./
 ARG TARGETOS

cmd/socket-proxy/handlehttprequest.go

@@ -57,24 +57,24 @@ func isAllowedClient(remoteAddr string) (bool, error) {
 	if err == nil {
 		// AllowFrom is a valid CIDR, so check if IP address is in allowed network
 		return allowedIPNet.Contains(clientIP), nil
-	} else {
-		// AllowFrom is not a valid CIDR, so try to resolve it via DNS
-		// split over comma to support multiple hostnames
-		allowFroms := strings.Split(cfg.AllowFrom, ",")
-		for _, allowFrom := range allowFroms {
-			ips, err := net.LookupIP(allowFrom)
-			if err != nil {
-				slog.Warn("error looking up allowed client hostname", "hostname", allowFrom, "error", err.Error())
-			}
-			for _, ip := range ips {
-				// Check if IP address is one of the resolved IPs
-				if ip.Equal(clientIP) {
-					return true, nil
-				}
+	}
+
+	// AllowFrom is not a valid CIDR, so try to resolve it via DNS
+	// split over comma to support multiple hostnames
+	allowFromList := strings.Split(cfg.AllowFrom, ",")
+	for _, allowFrom := range allowFromList {
+		ips, err := net.LookupIP(allowFrom)
+		if err != nil {
+			slog.Warn("error looking up allowed client hostname", "hostname", allowFrom, "error", err.Error())
+		}
+		for _, ip := range ips {
+			// Check if IP address is one of the resolved IPs
+			if ip.Equal(clientIP) {
+				return true, nil
 			}
 		}
-		return false, nil
 	}
+	return false, nil
 }
 
 // sendHTTPError sends a HTTP error with the given status code.

cmd/socket-proxy/main.go

@@ -101,7 +101,7 @@ func main() {
 
 	var l net.Listener
 	if cfg.ProxySocketEndpoint != "" {
-		if _, err := os.Stat(cfg.ProxySocketEndpoint); err == nil {
+		if _, err = os.Stat(cfg.ProxySocketEndpoint); err == nil {
 			slog.Warn(fmt.Sprintf("%s already exists, removing existing file", cfg.ProxySocketEndpoint))
 			if err = os.Remove(cfg.ProxySocketEndpoint); err != nil {
 				slog.Error("error removing existing socket file", "error", err)

internal/config/config.go

@@ -126,7 +126,7 @@ func InitConfig() (*Config, error) {
 		}
 	}
 
-	for i := 0; i < len(mr); i++ {
+	for i := range mr {
 		if val, ok := os.LookupEnv("SP_ALLOW_" + mr[i].method); ok && val != "" {
 			mr[i].regexStringFromEnv = val
 		}
@@ -144,7 +144,7 @@ func InitConfig() (*Config, error) {
 	flag.UintVar(&cfg.WatchdogInterval, "watchdoginterval", defaultWatchdogInterval, "watchdog interval in seconds (0 to disable)")
 	flag.StringVar(&cfg.ProxySocketEndpoint, "proxysocketendpoint", defaultProxySocketEndpoint, "unix socket endpoint (if set, used instead of the TCP listener)")
 	flag.UintVar(&endpointFileMode, "proxysocketendpointfilemode", defaultProxySocketEndpointFileMode, "set the file mode of the unix socket endpoint")
-	for i := 0; i < len(mr); i++ {
+	for i := range mr {
 		flag.StringVar(&mr[i].regexStringFromParam, "allow"+mr[i].method, "", "regex for "+mr[i].method+" requests (not set means method is not allowed)")
 	}
 	flag.Parse()