Skip to content

Make setup commands easier to read #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2025
Merged

Make setup commands easier to read #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,4 +286,4 @@ func Run(config Config, args []string) error {
}

return nil
}
}
66 changes: 17 additions & 49 deletions network/linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,56 +221,24 @@ func (l *LinuxJail) setupNetworking() error {
vethHost := fmt.Sprintf("veth_h_%s", uniqueID) // veth_h_1234567 = 14 chars
vethNetJail := fmt.Sprintf("veth_n_%s", uniqueID) // veth_n_1234567 = 14 chars

cmd := exec.Command("ip", "link", "add", vethHost, "type", "veth", "peer", "name", vethNetJail)
err := cmd.Run()
if err != nil {
return fmt.Errorf("failed to create veth pair: %v", err)
}

// Move netjail end to namespace
cmd = exec.Command("ip", "link", "set", vethNetJail, "netns", l.namespace)
err = cmd.Run()
if err != nil {
return fmt.Errorf("failed to move veth to namespace: %v", err)
}

// Configure host side of veth pair
cmd = exec.Command("ip", "addr", "add", "192.168.100.1/24", "dev", vethHost)
err = cmd.Run()
if err != nil {
return fmt.Errorf("failed to configure host veth: %v", err)
}

cmd = exec.Command("ip", "link", "set", vethHost, "up")
err = cmd.Run()
if err != nil {
return fmt.Errorf("failed to bring up host veth: %v", err)
}

// Configure namespace side of veth pair
cmd = exec.Command("ip", "netns", "exec", l.namespace, "ip", "addr", "add", "192.168.100.2/24", "dev", vethNetJail)
err = cmd.Run()
if err != nil {
return fmt.Errorf("failed to configure namespace veth: %v", err)
}

cmd = exec.Command("ip", "netns", "exec", l.namespace, "ip", "link", "set", vethNetJail, "up")
err = cmd.Run()
if err != nil {
return fmt.Errorf("failed to bring up namespace veth: %v", err)
setupCmds := []struct {
description string
command *exec.Cmd
}{
{"create veth pair", exec.Command("ip", "link", "add", vethHost, "type", "veth", "peer", "name", vethNetJail)},
{"move veth to namespace", exec.Command("ip", "link", "set", vethNetJail, "netns", l.namespace)},
{"configure host veth", exec.Command("ip", "addr", "add", "192.168.100.1/24", "dev", vethHost)},
{"bring up host veth", exec.Command("ip", "link", "set", vethHost, "up")},
{"configure namespace veth", exec.Command("ip", "netns", "exec", l.namespace, "ip", "addr", "add", "192.168.100.2/24", "dev", vethNetJail)},
{"bring up namespace veth", exec.Command("ip", "netns", "exec", l.namespace, "ip", "link", "set", vethNetJail, "up")},
{"bring up loopback", exec.Command("ip", "netns", "exec", l.namespace, "ip", "link", "set", "lo", "up")},
{"set default route in namespace", exec.Command("ip", "netns", "exec", l.namespace, "ip", "route", "add", "default", "via", "192.168.100.1")},
}

cmd = exec.Command("ip", "netns", "exec", l.namespace, "ip", "link", "set", "lo", "up")
err = cmd.Run()
if err != nil {
return fmt.Errorf("failed to bring up loopback: %v", err)
}

// Set default route in namespace
cmd = exec.Command("ip", "netns", "exec", l.namespace, "ip", "route", "add", "default", "via", "192.168.100.1")
err = cmd.Run()
if err != nil {
return fmt.Errorf("failed to set default route: %v", err)
for _, command := range setupCmds {
if err := command.command.Run(); err != nil {
return fmt.Errorf("failed to %s: %v", command.description, err)
}
}

return nil
Expand Down Expand Up @@ -355,4 +323,4 @@ func (l *LinuxJail) removeNamespace() error {
return fmt.Errorf("failed to remove namespace: %v", err)
}
return nil
}
}
2 changes: 1 addition & 1 deletion network/macos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,4 +376,4 @@ func (m *MacOSNetJail) cleanupTempFiles() {
if m.mainRulesPath != "" {
os.Remove(m.mainRulesPath)
}
}
}
12 changes: 6 additions & 6 deletions tls/tls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,11 +285,11 @@ func (cm *CertificateManager) generateServerCertificate(hostname string) (*tls.C
PostalCode: []string{""},
CommonName: hostname,
},
NotBefore: time.Now(),
NotAfter: time.Now().Add(24 * time.Hour), // 1 day
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
DNSNames: []string{hostname},
NotBefore: time.Now(),
NotAfter: time.Now().Add(24 * time.Hour), // 1 day
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
DNSNames: []string{hostname},
}

// Add IP address if hostname is an IP
Expand Down Expand Up @@ -350,4 +350,4 @@ func GetConfigDir() (string, error) {
}

return configDir, nil
}
}
Loading