Chore: Merge branch 'ogn-dev' into with-tun

listener/http/proxy.go

@@ -108,7 +108,7 @@ func authenticate(request *http.Request, cache *cache.Cache) *http.Response {
 			return resp
 		}
 
-		var authed interface{}
+		var authed any
 		if authed = cache.Get(credential); authed == nil {
 			user, pass, err := decodeBasicProxyAuthorization(credential)
 			authed = err == nil && authenticator.Verify(user, pass)

listener/http/utils.go

@@ -65,10 +65,10 @@ func decodeBasicProxyAuthorization(credential string) (string, string, error) {
 		return "", "", err
 	}
 
-	login := strings.Split(string(plain), ":")
-	if len(login) != 2 {
+	user, pass, found := strings.Cut(string(plain), ":")
+	if !found {
 		return "", "", errors.New("invalid login")
 	}
 
-	return login[0], login[1], nil
+	return user, pass, nil
 }

listener/redir/tcp_linux_other.go

@@ -1,5 +1,4 @@
 //go:build linux && !386
-// +build linux,!386
 
 package redir
 

listener/redir/tcp_other.go

@@ -1,5 +1,4 @@
 //go:build !darwin && !linux && !freebsd
-// +build !darwin,!linux,!freebsd
 
 package redir
 

listener/tproxy/setsockopt_linux.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package tproxy
 

listener/tproxy/setsockopt_other.go

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package tproxy
 

listener/tproxy/udp_linux.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package tproxy
 

listener/tproxy/udp_other.go

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package tproxy