Add rule implementation with Add, Insert, Replace, and Delete methods

batch.go

@@ -0,0 +1,72 @@
+package nft
+
+import (
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract"
+	contractBatch "git.kor-elf.net/kor-elf-shield/go-nftables-client/contract/batch"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/batch"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/batch/chain"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/batch/rule"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/batch/table"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/pkg"
+	nftCommand "git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/pkg/nft"
+)
+
+type batchBuilder struct {
+	command contract.CommandRun
+	file    *pkg.File
+
+	table contractBatch.Table
+	chain contractBatch.Chain
+	rule  contractBatch.Rule
+
+	isBuildBatch bool
+}
+
+func NewBatchBuilder(dir string) (contract.BatchBuilder, error) {
+	file, err := pkg.CreateRandomTmpFile(dir)
+	if err != nil {
+		return nil, err
+	}
+
+	command := batch.NewCommand(file)
+
+	return &batchBuilder{
+		command: command,
+		file:    file,
+
+		table: table.New(command),
+		chain: chain.New(command),
+		rule:  rule.New(command),
+
+		isBuildBatch: false,
+	}, nil
+}
+
+func (b *batchBuilder) Clear() error {
+	args := nftCommand.Clear()
+	return b.command.Run(args...)
+}
+
+func (b *batchBuilder) Table() contractBatch.Table {
+	return b.table
+}
+
+func (b *batchBuilder) Chain() contractBatch.Chain {
+	return b.chain
+}
+
+func (b *batchBuilder) Rule() contractBatch.Rule {
+	return b.rule
+}
+
+func (b *batchBuilder) Build() contract.Batch {
+	b.isBuildBatch = true
+	return batch.NewBatch(b.file)
+}
+
+func (b *batchBuilder) Close() error {
+	if b.isBuildBatch {
+		return nil
+	}
+	return b.file.Remove()
+}

contract/batch.go

@@ -23,9 +23,21 @@ type BatchBuilder interface {
 
 	// Build returns a batch of commands.
 	Build() Batch
+
+	// Close closes the batch.
+	Close() error
 }
 
 type Batch interface {
 	// Args returns the arguments of the batch.
 	Args() []string
+
+	// Check checks the validity of the batch.
+	Check(command Command) error
+
+	// Close closes the batch.
+	Close() error
+
+	// MoveFile moves the batch file to the specified path.
+	MoveFile(path string) error
 }

contract/command.go

@@ -1,11 +1,12 @@
 package contract
 
-// Run is a function that executes nft command.
+type CommandRun interface {
-type Run func(arg ...string) error
+	// Run executes nft command.
+	Run(arg ...string) error
+}
 
 type Command interface {
-	// Run nft command.
+	CommandRun
-	Run(arg ...string) error
 
 	// RunWithOutput Run nft command with output.
 	RunWithOutput(arg ...string) (string, error)

contract/nft.go

@@ -8,6 +8,9 @@ type NFT interface {
 	// You can execute your raw request.
 	Command() Command
 
+	// ExecuteBatchAfterCheck executes a batch of commands after checking the validity of the batch.
+	ExecuteBatchAfterCheck(batch Batch) error
+
 	// ExecuteBatch executes a batch of commands.
 	ExecuteBatch(batch Batch) error
 

internal/batch/batch.go

@@ -0,0 +1,32 @@
+package batch
+
+import (
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/pkg"
+)
+
+type batch struct {
+	file *pkg.File
+}
+
+func NewBatch(file *pkg.File) contract.Batch {
+	return &batch{
+		file: file,
+	}
+}
+
+func (b *batch) Args() []string {
+	return []string{"-f", b.file.Path()}
+}
+
+func (b *batch) Check(command contract.Command) error {
+	return command.Run("-c", "-f", b.file.Path())
+}
+
+func (b *batch) Close() error {
+	return b.file.Remove()
+}
+
+func (b *batch) MoveFile(path string) error {
+	return b.file.Move(path)
+}

internal/batch/chain/chain.go

@@ -0,0 +1,44 @@
+package chain
+
+import (
+	chain2 "git.kor-elf.net/kor-elf-shield/go-nftables-client/chain"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract/nft"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/family"
+	nftCommand "git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/pkg/nft"
+)
+
+type chain struct {
+	command contract.CommandRun
+}
+
+func New(command contract.CommandRun) nft.Chain {
+	return &chain{
+		command: command,
+	}
+}
+
+func (c *chain) Add(family family.Type, tableName string, chainName string, baseChain chain2.ChainOptions) error {
+	args := nftCommand.ChainAdd(family, tableName, chainName, baseChain)
+	return c.command.Run(args...)
+}
+
+func (c *chain) Create(family family.Type, tableName string, chainName string, baseChain chain2.ChainOptions) error {
+	args := nftCommand.ChainCreate(family, tableName, chainName, baseChain)
+	return c.command.Run(args...)
+}
+
+func (c *chain) Delete(family family.Type, tableName string, chainName string) error {
+	args := nftCommand.ChainDelete(family, tableName, chainName)
+	return c.command.Run(args...)
+}
+
+func (c *chain) Clear(family family.Type, tableName string, chainName string) error {
+	args := nftCommand.ChainClear(family, tableName, chainName)
+	return c.command.Run(args...)
+}
+
+func (c *chain) Rename(family family.Type, tableName string, oldChainName string, newChainName string) error {
+	args := nftCommand.ChainRename(family, tableName, oldChainName, newChainName)
+	return c.command.Run(args...)
+}

internal/batch/command.go

@@ -0,0 +1,24 @@
+package batch
+
+import (
+	"fmt"
+	"strings"
+
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/pkg"
+)
+
+type commandRun struct {
+	file *pkg.File
+}
+
+func NewCommand(file *pkg.File) contract.CommandRun {
+	return &commandRun{
+		file: file,
+	}
+}
+
+func (c *commandRun) Run(args ...string) error {
+	_, err := c.file.Write([]byte(fmt.Sprintf("%s\n", strings.Join(args, " "))))
+	return err
+}

internal/batch/rule/rule.go

@@ -0,0 +1,38 @@
+package rule
+
+import (
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract/nft"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/family"
+	nftCommand "git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/pkg/nft"
+)
+
+type rule struct {
+	command contract.CommandRun
+}
+
+func New(command contract.CommandRun) nft.Rule {
+	return &rule{
+		command: command,
+	}
+}
+
+func (r *rule) Add(family family.Type, tableName string, chainName string, expr ...string) error {
+	args := nftCommand.RuleAdd(family, tableName, chainName, expr...)
+	return r.command.Run(args...)
+}
+
+func (r *rule) Insert(family family.Type, tableName string, chainName string, expr ...string) error {
+	args := nftCommand.RuleInsert(family, tableName, chainName, expr...)
+	return r.command.Run(args...)
+}
+
+func (r *rule) Replace(family family.Type, tableName string, chainName string, handle uint64, expr ...string) error {
+	args := nftCommand.RuleReplace(family, tableName, chainName, handle, expr...)
+	return r.command.Run(args...)
+}
+
+func (r *rule) Delete(family family.Type, tableName string, chainName string, handle uint64) error {
+	args := nftCommand.RuleDelete(family, tableName, chainName, handle)
+	return r.command.Run(args...)
+}

internal/batch/table/table.go

@@ -0,0 +1,33 @@
+package table
+
+import (
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract/nft"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/family"
+	nftCommand "git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/pkg/nft"
+)
+
+type table struct {
+	command contract.CommandRun
+}
+
+func New(command contract.CommandRun) nft.Table {
+	return &table{
+		command: command,
+	}
+}
+
+func (t *table) Add(family family.Type, tableName string) error {
+	args := nftCommand.TableAdd(family, tableName)
+	return t.command.Run(args...)
+}
+
+func (t *table) Delete(family family.Type, tableName string) error {
+	args := nftCommand.TableDelete(family, tableName)
+	return t.command.Run(args...)
+}
+
+func (t *table) Clear(family family.Type, tableName string) error {
+	args := nftCommand.TableClear(family, tableName)
+	return t.command.Run(args...)
+}

internal/chain/chain.go

@@ -5,6 +5,7 @@ import (
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract"
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract/nft"
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/family"
+	nftCommand "git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/pkg/nft"
 )
 
 type chain struct {
@@ -18,26 +19,26 @@ func New(command contract.Command) nft.Chain {
 }
 
 func (c *chain) Add(family family.Type, tableName string, chainName string, baseChain chain2.ChainOptions) error {
-	args := []string{"add", "chain", family.String(), tableName, chainName, baseChain.String()}
+	args := nftCommand.ChainAdd(family, tableName, chainName, baseChain)
 	return c.command.Run(args...)
 }
 
 func (c *chain) Create(family family.Type, tableName string, chainName string, baseChain chain2.ChainOptions) error {
-	args := []string{"create", "chain", family.String(), tableName, chainName, baseChain.String()}
+	args := nftCommand.ChainCreate(family, tableName, chainName, baseChain)
 	return c.command.Run(args...)
 }
 
 func (c *chain) Delete(family family.Type, tableName string, chainName string) error {
-	args := []string{"delete", "chain", family.String(), tableName, chainName}
+	args := nftCommand.ChainDelete(family, tableName, chainName)
 	return c.command.Run(args...)
 }
 
 func (c *chain) Clear(family family.Type, tableName string, chainName string) error {
-	args := []string{"flush", "chain", family.String(), tableName, chainName}
+	args := nftCommand.ChainClear(family, tableName, chainName)
 	return c.command.Run(args...)
 }
 
 func (c *chain) Rename(family family.Type, tableName string, oldChainName string, newChainName string) error {
-	args := []string{"rename", "chain", family.String(), tableName, oldChainName, newChainName}
+	args := nftCommand.ChainRename(family, tableName, oldChainName, newChainName)
 	return c.command.Run(args...)
 }

internal/pkg/file.go

@@ -0,0 +1,51 @@
+package pkg
+
+import (
+	"crypto/rand"
+	"os"
+	"path/filepath"
+	"time"
+)
+
+type File struct {
+	filepath string
+	file     *os.File
+
+	isMoved bool
+}
+
+func CreateRandomTmpFile(dir string) (*File, error) {
+	if err := os.MkdirAll(dir, 0750); err != nil {
+		return nil, err
+	}
+	tmpFile := filepath.Join(dir, time.Now().Format(time.RFC3339)+"_"+rand.Text()+".tmp")
+	file, err := os.Create(tmpFile)
+	if err != nil {
+		return nil, err
+	}
+
+	return &File{
+		filepath: tmpFile,
+		file:     file,
+	}, nil
+}
+
+func (f *File) Write(p []byte) (n int, err error) {
+	return f.file.Write(p)
+}
+
+func (f *File) Path() string {
+	return f.filepath
+}
+
+func (f *File) Remove() error {
+	if f.isMoved {
+		return nil
+	}
+
+	return os.Remove(f.filepath)
+}
+
+func (f *File) Move(path string) error {
+	return os.Rename(f.filepath, path)
+}

internal/pkg/nft/chain.go

@@ -0,0 +1,26 @@
+package nft
+
+import (
+	chain2 "git.kor-elf.net/kor-elf-shield/go-nftables-client/chain"
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/family"
+)
+
+func ChainAdd(family family.Type, tableName string, chainName string, baseChain chain2.ChainOptions) []string {
+	return []string{"add", "chain", family.String(), tableName, chainName, baseChain.String()}
+}
+
+func ChainCreate(family family.Type, tableName string, chainName string, baseChain chain2.ChainOptions) []string {
+	return []string{"create", "chain", family.String(), tableName, chainName, baseChain.String()}
+}
+
+func ChainDelete(family family.Type, tableName string, chainName string) []string {
+	return []string{"delete", "chain", family.String(), tableName, chainName}
+}
+
+func ChainClear(family family.Type, tableName string, chainName string) []string {
+	return []string{"flush", "chain", family.String(), tableName, chainName}
+}
+
+func ChainRename(family family.Type, tableName string, oldChainName string, newChainName string) []string {
+	return []string{"rename", "chain", family.String(), tableName, oldChainName, newChainName}
+}

internal/pkg/nft/command.go

@@ -0,0 +1,5 @@
+package nft
+
+func Clear() []string {
+	return []string{"flush", "ruleset"}
+}

internal/pkg/nft/rule.go

@@ -0,0 +1,30 @@
+package nft
+
+import (
+	"strconv"
+
+	"git.kor-elf.net/kor-elf-shield/go-nftables-client/family"
+)
+
+func RuleAdd(family family.Type, tableName string, chainName string, expr ...string) []string {
+	args := []string{"add", "rule", family.String(), tableName, chainName}
+	args = append(args, expr...)
+	return args
+}
+
+func RuleInsert(family family.Type, tableName string, chainName string, expr ...string) []string {
+	args := []string{"insert", "rule", family.String(), tableName, chainName}
+	args = append(args, expr...)
+	return args
+}
+
+func RuleReplace(family family.Type, tableName string, chainName string, handle uint64, expr ...string) []string {
+	args := []string{"replace", "rule", family.String(), tableName, chainName, "handle", strconv.Itoa(int(handle))}
+	args = append(args, expr...)
+	return args
+}
+
+func RuleDelete(family family.Type, tableName string, chainName string, handle uint64) []string {
+	args := []string{"delete", "rule", family.String(), tableName, chainName, "handle", strconv.Itoa(int(handle))}
+	return args
+}

internal/pkg/nft/table.go

@@ -0,0 +1,15 @@
+package nft
+
+import "git.kor-elf.net/kor-elf-shield/go-nftables-client/family"
+
+func TableAdd(family family.Type, tableName string) []string {
+	return []string{"add", "table", family.String(), tableName}
+}
+
+func TableDelete(family family.Type, tableName string) []string {
+	return []string{"delete", "table", family.String(), tableName}
+}
+
+func TableClear(family family.Type, tableName string) []string {
+	return []string{"flush", "table", family.String(), tableName}
+}

internal/rule/rule.go

@@ -1,11 +1,10 @@
 package rule
 
 import (
-	"strconv"
-
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract"
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract/nft"
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/family"
+	nftCommand "git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/pkg/nft"
 )
 
 type rule struct {
@@ -19,24 +18,21 @@ func New(command contract.Command) nft.Rule {
 }
 
 func (r *rule) Add(family family.Type, tableName string, chainName string, expr ...string) error {
-	args := []string{"add", "rule", family.String(), tableName, chainName}
+	args := nftCommand.RuleAdd(family, tableName, chainName, expr...)
-	args = append(args, expr...)
 	return r.command.Run(args...)
 }
 
 func (r *rule) Insert(family family.Type, tableName string, chainName string, expr ...string) error {
-	args := []string{"insert", "rule", family.String(), tableName, chainName}
+	args := nftCommand.RuleInsert(family, tableName, chainName, expr...)
-	args = append(args, expr...)
 	return r.command.Run(args...)
 }
 
 func (r *rule) Replace(family family.Type, tableName string, chainName string, handle uint64, expr ...string) error {
-	args := []string{"replace", "rule", family.String(), tableName, chainName, "handle", strconv.Itoa(int(handle))}
+	args := nftCommand.RuleReplace(family, tableName, chainName, handle, expr...)
-	args = append(args, expr...)
 	return r.command.Run(args...)
 }
 
 func (r *rule) Delete(family family.Type, tableName string, chainName string, handle uint64) error {
-	args := []string{"delete", "rule", family.String(), tableName, chainName, "handle", strconv.Itoa(int(handle))}
+	args := nftCommand.RuleDelete(family, tableName, chainName, handle)
 	return r.command.Run(args...)
 }

internal/table/table.go

@@ -4,6 +4,7 @@ import (
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract"
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract/nft"
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/family"
+	nftCommand "git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/pkg/nft"
 )
 
 type table struct {
@@ -17,16 +18,16 @@ func New(command contract.Command) nft.Table {
 }
 
 func (t *table) Add(family family.Type, tableName string) error {
-	args := []string{"add", "table", family.String(), tableName}
+	args := nftCommand.TableAdd(family, tableName)
 	return t.command.Run(args...)
 }
 
 func (t *table) Delete(family family.Type, tableName string) error {
-	args := []string{"delete", "table", family.String(), tableName}
+	args := nftCommand.TableDelete(family, tableName)
 	return t.command.Run(args...)
 }
 
 func (t *table) Clear(family family.Type, tableName string) error {
-	args := []string{"flush", "table", family.String(), tableName}
+	args := nftCommand.TableClear(family, tableName)
 	return t.command.Run(args...)
 }

nft.go

@@ -9,6 +9,7 @@ import (
 	nftContract "git.kor-elf.net/kor-elf-shield/go-nftables-client/contract/nft"
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/chain"
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/command"
+	nftCommand "git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/pkg/nft"
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/rule"
 	"git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/table"
 )
@@ -50,7 +51,7 @@ func NewWithPath(path string) (contract.NFT, error) {
 }
 
 func (n *nft) Clear() error {
-	args := []string{"flush", "ruleset"}
+	args := nftCommand.Clear()
 	return n.command.Run(args...)
 }
 
@@ -104,6 +105,13 @@ func (n *nft) Command() contract.Command {
 	return n.command
 }
 
+func (n *nft) ExecuteBatchAfterCheck(batch contract.Batch) error {
+	if err := batch.Check(n.command); err != nil {
+		return err
+	}
+	return n.command.Run(batch.Args()...)
+}
+
 func (n *nft) ExecuteBatch(batch contract.Batch) error {
 	return n.command.Run(batch.Args()...)
 }