@@ -127,13 +127,6 @@ func Run(config Config, args []string) error {
127
127
// Create auditor
128
128
auditor := audit .NewLoggingAuditor (logger )
129
129
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
-
137
130
// Create network namespace configuration
138
131
nsConfig := namespace.Config {
139
132
HTTPPort : 8040 ,
@@ -152,6 +145,13 @@ func Run(config Config, args []string) error {
152
145
var tlsConfig * cryptotls.Config
153
146
154
147
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
+
155
155
certManager , err = tls .NewCertificateManager (configDir , logger )
156
156
if err != nil {
157
157
logger .Error ("Failed to create certificate manager" , "error" , err )
@@ -182,30 +182,24 @@ func Run(config Config, args []string) error {
182
182
commander .SetEnv ("GIT_SSL_CAINFO" , caCertPath ) // Git
183
183
commander .SetEnv ("REQUESTS_CA_BUNDLE" , caCertPath ) // Python requests
184
184
commander .SetEnv ("NODE_EXTRA_CA_CERTS" , caCertPath ) // Node.js
185
- commander .SetEnv ("JAIL_CA_CERT" , string (caCertPEM )) // Keep for backward compatibility
186
185
}
187
186
188
187
// Create proxy server
189
- proxyConfig := proxy.Config {
188
+ proxyServer := proxy . NewProxyServer ( proxy.Config {
190
189
HTTPPort : 8040 ,
191
190
HTTPSPort : 8043 ,
192
191
RuleEngine : ruleEngine ,
193
192
Auditor : auditor ,
194
193
Logger : logger ,
195
194
TLSConfig : tlsConfig ,
196
- }
197
-
198
- proxyServer := proxy .NewProxyServer (proxyConfig )
195
+ })
199
196
200
- // Create jail configuration with constructed dependencies
201
- jailConfig := jail.Config {
197
+ // Create jail instance
198
+ jailInstance := jail . New ( jail.Config {
202
199
Commander : commander ,
203
200
ProxyServer : proxyServer ,
204
201
Logger : logger ,
205
- }
206
-
207
- // Create jail instance
208
- jailInstance := jail .New (jailConfig )
202
+ })
209
203
210
204
// Setup signal handling BEFORE any setup
211
205
sigChan := make (chan os.Signal , 1 )
0 commit comments