woj/woj-server
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

feat: sync with latest woj_sandbox, allow to set write file limit (RLIMIT_FSIZE)

Browse Source
This commit is contained in:
Paul Pan 2024-04-27 21:25:21 +08:00
parent 5a5f4e75be
commit 54e83ec63e
Signed by: Paul
GPG Key ID: D639BDF5BA578AF4
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
internal/service/runner/problem_config.go
View File

@ -22,26 +22,30 @@ var (
) )
type ConfigRuntime struct { type ConfigRuntime struct {
TimeLimit int `json:"TimeLimit"` // in ms TimeLimit int `json:"TimeLimit"` // in ms
MemoryLimit int `json:"MemoryLimit"` // in mb MemoryLimit int `json:"MemoryLimit"` // in mb
NProcLimit int `json:"NProcLimit"` NProcLimit int `json:"NProcLimit"`
WriteFileLimit int `json:"WriteFileLimit"` // in mb
} }
var ( var (
DefaultPrebuildRuntime = ConfigRuntime{ DefaultPrebuildRuntime = ConfigRuntime{
TimeLimit: 300000, TimeLimit: 300000,
MemoryLimit: 256, MemoryLimit: 256,
NProcLimit: 64, NProcLimit: 64,
WriteFileLimit: 1,
} }
DefaultCompileRuntime = ConfigRuntime{ DefaultCompileRuntime = ConfigRuntime{
TimeLimit: 60000, TimeLimit: 60000,
MemoryLimit: 256, MemoryLimit: 256,
NProcLimit: 64, NProcLimit: 64,
WriteFileLimit: 64,
} }
DefaultCheckRuntime = ConfigRuntime{ DefaultCheckRuntime = ConfigRuntime{
TimeLimit: 60000, TimeLimit: 60000,
MemoryLimit: 128, MemoryLimit: 128,
NProcLimit: 64, NProcLimit: 64,
WriteFileLimit: 16,
} }
) )
@ -55,6 +59,9 @@ func (c *ConfigRuntime) Validate() error {
if c.NProcLimit <= 0 { if c.NProcLimit <= 0 {
return errors.New("nproc limit <= 0") return errors.New("nproc limit <= 0")
} }
if c.WriteFileLimit <= 0 {
return errors.New("write file limit <= 0")
}
return nil return nil
} }

1
internal/service/runner/run_judge.go
View File

@ -25,6 +25,7 @@ func (s *service) SandboxArgsBuilder(meta *JudgeMeta, id int) string {
args = append(args, fmt.Sprintf("--memory_limit=%d", meta.Cfg.Lang.Runtime.Run.MemoryLimit)) args = append(args, fmt.Sprintf("--memory_limit=%d", meta.Cfg.Lang.Runtime.Run.MemoryLimit))
args = append(args, fmt.Sprintf("--nproc_limit=%d", meta.Cfg.Lang.Runtime.Run.NProcLimit)) args = append(args, fmt.Sprintf("--nproc_limit=%d", meta.Cfg.Lang.Runtime.Run.NProcLimit))
args = append(args, fmt.Sprintf("--time_limit=%d", meta.Cfg.Lang.Runtime.Run.TimeLimit)) args = append(args, fmt.Sprintf("--time_limit=%d", meta.Cfg.Lang.Runtime.Run.TimeLimit))
args = append(args, fmt.Sprintf("--fsize_limit=%d", meta.Cfg.Lang.Runtime.Run.WriteFileLimit))
args = append(args, fmt.Sprintf("--sandbox_template=%s", meta.Cfg.Lang.Lang)) args = append(args, fmt.Sprintf("--sandbox_template=%s", meta.Cfg.Lang.Lang))
args = append(args, fmt.Sprintf("--sandbox_action=%s", "ret")) args = append(args, fmt.Sprintf("--sandbox_action=%s", "ret"))
args = append(args, fmt.Sprintf("--uid=%d", 1000)) args = append(args, fmt.Sprintf("--uid=%d", 1000))