feat: Rename and set as method NftablesSetup -> Setup, fix template and types config, add create template config in system, update logic finds firewalls on system, add BurntSushi/toml as dependencies

internal/blocker/nftables.go

@@ -96,7 +96,7 @@ func (n *Nftables) Unban(ip string) error {
 	return nil
 }
 
-func SetupNftables(config string) error {
+func (n *Nftables) Setup(config string) error {
 	err := validateConfigPath(config)
 	if err != nil {
 		return fmt.Errorf("path error: %w", err)

internal/config/sysconf.go

@@ -5,6 +5,8 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+
+	"github.com/BurntSushi/toml"
 )
 
 var DetectedFirewall string
@@ -39,31 +41,65 @@ func CreateConf() error {
 	if err := os.Chmod(configPath, 0600); err != nil {
 		return fmt.Errorf("failed to set permissions: %w", err)
 	}
-
+	err = os.WriteFile(configPath, []byte(Base_config), 0600)
+	if err != nil {
+		return fmt.Errorf("failed to write config file: %w", err)
+	}
 	fmt.Printf(" Config file created: %s\n", configPath)
 	return nil
 }
 
 func FindFirewall() error {
-
 	if os.Getegid() != 0 {
 		fmt.Printf("Firewall settings needs sudo privileges\n")
 		os.Exit(1)
 	}
-	firewalls := []string{"iptables", "nft", "firewall-cmd", "ufw"}
+
+	firewalls := []string{"nft", "firewall-cmd", "iptables", "ufw"}
 	for _, firewall := range firewalls {
 		_, err := exec.LookPath(firewall)
 		if err == nil {
-			if firewall == "firewall-cmd" {
+			switch firewall {
+			case "firewall-cmd":
 				DetectedFirewall = "firewalld"
-			}
-			if firewall == "nft" {
+			case "nft":
 				DetectedFirewall = "nftables"
+			default:
+				DetectedFirewall = firewall
 			}
-			DetectedFirewall = firewall
-			fmt.Printf("Detected firewall: %s\n", firewall)
+
+			fmt.Printf("Detected firewall: %s\n", DetectedFirewall)
+
+			cfg := &Config{}
+			_, err := toml.DecodeFile("/etc/banforge/config.toml", cfg)
+			if err != nil {
+				return fmt.Errorf("failed to decode config: %w", err)
+			}
+
+			cfg.Firewall.Name = DetectedFirewall
+
+			file, err := os.Create("/etc/banforge/config.toml")
+			if err != nil {
+				return fmt.Errorf("failed to create config file: %w", err)
+			}
+
+			encoder := toml.NewEncoder(file)
+			if err := encoder.Encode(cfg); err != nil {
+				err = file.Close()
+				if err != nil {
+					return fmt.Errorf("failed to close file: %w", err)
+				}
+				return fmt.Errorf("failed to encode config: %w", err)
+			}
+
+			if err := file.Close(); err != nil {
+				return fmt.Errorf("failed to close file: %w", err)
+			}
+
+			fmt.Printf("Config updated with firewall: %s\n", DetectedFirewall)
 			return nil
 		}
 	}
-	return fmt.Errorf("no firewall found (checked ufw, firewall-cmd, iptables, nft) please install one of them")
+
+	return fmt.Errorf("firewall not found")
 }

internal/config/template.go

@@ -1,14 +1,15 @@
 package config
 
-const Base_config = `# This is a TOML config file for BanForge it's a simple config file
-# https://github.com/d3m0k1d/BanForge
+const Base_config = `
+# This is a TOML config file for BanForge
+# [https://github.com/d3m0k1d/BanForge](https://github.com/d3m0k1d/BanForge)
 
-# Firewall settings block
 [firewall]
-name = "iptables" # Name one of the support firewall(iptables, nftables, firewalld, ufw)
+name = ""
+config = "/etc/nftables.conf"
 ban_time = 1200
 
-[Service]
+[service]
 name = "nginx"
 log_path = "/var/log/nginx/access.log"
 enabled = true

internal/config/types.go

@@ -7,7 +7,12 @@ type Firewall struct {
 }
 
 type Service struct {
-	Name     string `toml:"name"`
-	Log_path string `toml:"log_path"`
-	Enabled  bool   `toml:"enabled"`
+	Name    string `toml:"name"`
+	LogPath string `toml:"log_path"`
+	Enabled bool   `toml:"enabled"`
+}
+
+type Config struct {
+	Firewall Firewall `toml:"firewall"`
+	Service  Service  `toml:"service"`
 }