Skip to content

Commit 6ae0268

Browse files
committed
fix
1 parent 4d9c1c1 commit 6ae0268

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

cli/cli.go

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,6 @@ func Run(config Config, args []string) error {
127127
// Create auditor
128128
auditor := audit.NewLoggingAuditor(logger)
129129

130-
// Get configuration directory
131-
configDir, err := tls.GetConfigDir()
132-
if err != nil {
133-
logger.Error("Failed to get config directory", "error", err)
134-
return fmt.Errorf("failed to get config directory: %v", err)
135-
}
136-
137130
// Create network namespace configuration
138131
nsConfig := namespace.Config{
139132
HTTPPort: 8040,
@@ -152,6 +145,13 @@ func Run(config Config, args []string) error {
152145
var tlsConfig *cryptotls.Config
153146

154147
if !config.NoTLSIntercept {
148+
// Get configuration directory
149+
configDir, err := tls.GetConfigDir()
150+
if err != nil {
151+
logger.Error("Failed to get config directory", "error", err)
152+
return fmt.Errorf("failed to get config directory: %v", err)
153+
}
154+
155155
certManager, err = tls.NewCertificateManager(configDir, logger)
156156
if err != nil {
157157
logger.Error("Failed to create certificate manager", "error", err)
@@ -182,30 +182,24 @@ func Run(config Config, args []string) error {
182182
commander.SetEnv("GIT_SSL_CAINFO", caCertPath) // Git
183183
commander.SetEnv("REQUESTS_CA_BUNDLE", caCertPath) // Python requests
184184
commander.SetEnv("NODE_EXTRA_CA_CERTS", caCertPath) // Node.js
185-
commander.SetEnv("JAIL_CA_CERT", string(caCertPEM)) // Keep for backward compatibility
186185
}
187186

188187
// Create proxy server
189-
proxyConfig := proxy.Config{
188+
proxyServer := proxy.NewProxyServer(proxy.Config{
190189
HTTPPort: 8040,
191190
HTTPSPort: 8043,
192191
RuleEngine: ruleEngine,
193192
Auditor: auditor,
194193
Logger: logger,
195194
TLSConfig: tlsConfig,
196-
}
197-
198-
proxyServer := proxy.NewProxyServer(proxyConfig)
195+
})
199196

200-
// Create jail configuration with constructed dependencies
201-
jailConfig := jail.Config{
197+
// Create jail instance
198+
jailInstance := jail.New(jail.Config{
202199
Commander: commander,
203200
ProxyServer: proxyServer,
204201
Logger: logger,
205-
}
206-
207-
// Create jail instance
208-
jailInstance := jail.New(jailConfig)
202+
})
209203

210204
// Setup signal handling BEFORE any setup
211205
sigChan := make(chan os.Signal, 1)

0 commit comments

Comments
 (0)