fix(routes): linter

This commit is contained in:
samosvalishe
2026-08-01 15:25:22 +03:00
parent 8524284eb8
commit cdc7ee8d3d
4 changed files with 12 additions and 10 deletions
+3 -3
View File
@@ -11,7 +11,7 @@ import (
)
func discoverGateway() (string, error) {
cmd := exec.Command("route", "-n", "get", "default")
cmd := exec.Command("route", "-n", "get", "default") //nolint:gosec,noctx
out, err := cmd.Output()
if err != nil {
return "", fmt.Errorf("failed to run route get default: %w", err)
@@ -38,7 +38,7 @@ func addRoute(ip, gateway string) error {
// Пытаемся удалить перед добавлением, игнорируем ошибку
_ = delRoute(ip)
cmd := exec.Command("route", "-n", "add", "-host", ip, gateway)
cmd := exec.Command("route", "-n", "add", "-host", ip, gateway) //nolint:gosec,noctx
if err := cmd.Run(); err != nil {
return fmt.Errorf("failed to add route for %s via %s: %w", ip, gateway, err)
}
@@ -46,7 +46,7 @@ func addRoute(ip, gateway string) error {
}
func delRoute(ip string) error {
cmd := exec.Command("route", "-n", "delete", "-host", ip)
cmd := exec.Command("route", "-n", "delete", "-host", ip) //nolint:gosec,noctx
out, err := cmd.CombinedOutput()
if err != nil {
if bytes.Contains(out, []byte("not in table")) {
+3 -3
View File
@@ -17,7 +17,7 @@ func discoverGateway() (string, error) {
return "", nil
}
cmd := exec.Command("ip", "-o", "-4", "route", "show", "to", "default")
cmd := exec.Command("ip", "-o", "-4", "route", "show", "to", "default") //nolint:gosec,noctx
out, err := cmd.Output()
if err != nil {
return "", fmt.Errorf("failed to get default route: %w", err)
@@ -35,7 +35,7 @@ func discoverGateway() (string, error) {
}
func addRoute(ip, gateway string) error {
cmd := exec.Command("ip", "route", "replace", fmt.Sprintf("%s/32", ip), "via", gateway)
cmd := exec.Command("ip", "route", "replace", fmt.Sprintf("%s/32", ip), "via", gateway) //nolint:gosec,noctx
if err := cmd.Run(); err != nil {
return fmt.Errorf("failed to add route for %s via %s: %w", ip, gateway, err)
}
@@ -43,7 +43,7 @@ func addRoute(ip, gateway string) error {
}
func delRoute(ip string) error {
cmd := exec.Command("ip", "route", "del", fmt.Sprintf("%s/32", ip))
cmd := exec.Command("ip", "route", "del", fmt.Sprintf("%s/32", ip)) //nolint:gosec,noctx
out, err := cmd.CombinedOutput()
if err != nil {
if bytes.Contains(out, []byte("No such process")) {
+3 -3
View File
@@ -11,7 +11,7 @@ import (
)
func discoverGateway() (string, error) {
cmd := exec.Command("cmd", "/c", "route", "print", "0.0.0.0")
cmd := exec.Command("cmd", "/c", "route", "print", "0.0.0.0") //nolint:gosec,noctx
out, err := cmd.Output()
if err != nil {
return "", fmt.Errorf("failed to run route print: %w", err)
@@ -38,7 +38,7 @@ func discoverGateway() (string, error) {
}
func addRoute(ip, gateway string) error {
cmd := exec.Command("cmd", "/c", "route", "add", ip, "mask", "255.255.255.255", gateway)
cmd := exec.Command("cmd", "/c", "route", "add", ip, "mask", "255.255.255.255", gateway) //nolint:gosec,noctx
if err := cmd.Run(); err != nil {
return fmt.Errorf("failed to add route for %s via %s: %w", ip, gateway, err)
}
@@ -46,7 +46,7 @@ func addRoute(ip, gateway string) error {
}
func delRoute(ip string) error {
cmd := exec.Command("cmd", "/c", "route", "delete", ip)
cmd := exec.Command("cmd", "/c", "route", "delete", ip) //nolint:gosec,noctx
// Игнорируем ошибки (например, если маршрут уже удалён)
_ = cmd.Run()
return nil
+3 -1
View File
@@ -352,7 +352,9 @@ func (s *Session) relay(ctx context.Context, prov provider.Provider, peer *net.U
if rmErr != nil {
log.Warnf("route manager disabled: %v", rmErr)
} else if rm != nil {
defer rm.Close()
defer func() {
_ = rm.Close()
}()
routeCallback = rm.Callback()
log.Infof("route manager: gateway=%s", rm.Gateway())
}