Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions internal/core/runner/nodejs/nodejs.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ func (p *NodeJsRunner) Run(
)
cmd.Env = []string{}

for key, value := range configuration.SandboxEnvs {
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", key, value))
}

if len(configuration.AllowedSyscalls) > 0 {
cmd.Env = append(
cmd.Env,
Expand Down
4 changes: 4 additions & 0 deletions internal/core/runner/python/python.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ func (p *PythonRunner) Run(
cmd.Env = []string{}
cmd.Dir = LIB_PATH

for key, value := range configuration.SandboxEnvs {
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", key, value))
}

if configuration.Proxy.Socks5 != "" {
cmd.Env = append(cmd.Env, fmt.Sprintf("HTTPS_PROXY=%s", configuration.Proxy.Socks5))
cmd.Env = append(cmd.Env, fmt.Sprintf("HTTP_PROXY=%s", configuration.Proxy.Socks5))
Expand Down
11 changes: 11 additions & 0 deletions internal/static/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,17 @@ func InitConfig(path string) error {
slog.Info("using http proxy", "proxy", difySandboxGlobalConfigurations.Proxy.Http)
}
}
if difySandboxGlobalConfigurations.SandboxEnvs == nil {
difySandboxGlobalConfigurations.SandboxEnvs = make(map[string]string)
}
for _, env := range os.Environ() {
kv := strings.SplitN(env, "=", 2)
if len(kv) == 2 && strings.HasPrefix(kv[0], "SANDBOX_ENV_") {
key := strings.TrimPrefix(kv[0], "SANDBOX_ENV_")
value := kv[1]
difySandboxGlobalConfigurations.SandboxEnvs[key] = value
}
}
return nil
}

Expand Down
27 changes: 14 additions & 13 deletions internal/types/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@ type DifySandboxGlobalConfigurations struct {
Debug bool `yaml:"debug"`
Key string `yaml:"key"`
} `yaml:"app"`
MaxWorkers int `yaml:"max_workers"`
MaxRequests int `yaml:"max_requests"`
WorkerTimeout int `yaml:"worker_timeout"`
PythonPath string `yaml:"python_path"`
PythonLibPaths []string `yaml:"python_lib_path"`
PythonPipMirrorURL string `yaml:"python_pip_mirror_url"`
PythonDepsUpdateInterval string `yaml:"python_deps_update_interval"`
NodejsPath string `yaml:"nodejs_path"`
EnableNetwork bool `yaml:"enable_network"`
EnablePreload bool `yaml:"enable_preload"`
AllowedSyscalls []int `yaml:"allowed_syscalls"`
LogPath string `yaml:"log_path"`
MaxWorkers int `yaml:"max_workers"`
MaxRequests int `yaml:"max_requests"`
WorkerTimeout int `yaml:"worker_timeout"`
PythonPath string `yaml:"python_path"`
PythonLibPaths []string `yaml:"python_lib_path"`
PythonPipMirrorURL string `yaml:"python_pip_mirror_url"`
PythonDepsUpdateInterval string `yaml:"python_deps_update_interval"`
NodejsPath string `yaml:"nodejs_path"`
EnableNetwork bool `yaml:"enable_network"`
EnablePreload bool `yaml:"enable_preload"`
AllowedSyscalls []int `yaml:"allowed_syscalls"`
LogPath string `yaml:"log_path"`
SandboxEnvs map[string]string `yaml:"sandbox_envs"`
Proxy struct {
Socks5 string `yaml:"socks5"`
Https string `yaml:"https"`
Http string `yaml:"http"`
} `yaml:"proxy"`
}
}