Update ufw

internal/blocker/ufw.go

@@ -16,13 +16,25 @@ func NewUfw(logger *logger.Logger) *Ufw {
 }
 
 func (ufw *Ufw) Ban(ip string) error {
+	validateIP(ip)
 	cmd := exec.Command("sudo", "ufw", "--force", "deny", "from", ip)
-	ufw.logger.Info("Banning " + ip)
+	output, err := cmd.CombinedOutput()
-	return cmd.Run()
+	if err != nil {
+		ufw.logger.Error(err.Error())
+		return err
+	}
+	ufw.logger.Info("Banning " + ip + " " + string(output))
+	return nil
 }
 
 func (ufw *Ufw) Unban(ip string) error {
+	validateIP(ip)
 	cmd := exec.Command("sudo", "ufw", "--force", "delete", "deny", "from", ip)
-	ufw.logger.Info("Unbanning " + ip)
+	output, err := cmd.CombinedOutput()
-	return cmd.Run()
+	if err != nil {
+		ufw.logger.Error(err.Error())
+		return err
+	}
+	ufw.logger.Info("Unbanning " + ip + " " + string(output))
+	return nil
 }

internal/blocker/validators.go

@@ -0,0 +1,18 @@
+package blocker
+
+import (
+	"fmt"
+	"net"
+)
+
+func validateIP(ip string) error {
+	if ip == "" {
+		return fmt.Errorf("empty IP")
+	}
+
+	if net.ParseIP(ip) == nil {
+		return fmt.Errorf("invalid IP: %s", ip)
+	}
+
+	return nil
+}