-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move sandbox code to seperated module (#104)
We would be adding more sandbox impls in the future :) Co-authored-by: Natsu Kagami <[email protected]>
- Loading branch information
1 parent
aa5d111
commit 47610d8
Showing
10 changed files
with
181 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,20 @@ | ||
| package worker | ||
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "time" | ||
|
|
||
| "github.com/natsukagami/kjudge/worker/sandbox" | ||
| "github.com/natsukagami/kjudge/worker/sandbox/isolate" | ||
| "github.com/natsukagami/kjudge/worker/sandbox/raw" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| // Sandbox provides a way to run an arbitary command | ||
| // within a sandbox, with configured input/outputs and | ||
| // proper time and memory limits. | ||
| // | ||
| // kjudge currently implements two sandboxes, "isolate" (which requires "github.com/ioi/isolate" to be available) | ||
| // and "raw" (NOT RECOMMENDED, RUN AT YOUR OWN RISK). | ||
| // Which sandbox is used can be set at runtime with a command-line switch. | ||
| type Sandbox interface { | ||
| Run(*SandboxInput) (*SandboxOutput, error) | ||
| } | ||
|
|
||
| // SandboxInput is the input to a sandbox. | ||
| type SandboxInput struct { | ||
| Command string `json:"command"` // The passed command | ||
| Args []string `json:"args"` // any additional arguments, if needed | ||
| Files map[string][]byte `json:"files"` // Any additional files needed | ||
| TimeLimit time.Duration `json:"time_limit"` // The given time-limit | ||
| MemoryLimit int `json:"memory_limit"` // in KBs | ||
|
|
||
| CompiledSource []byte `json:"compiled_source"` // Should be written down to the CWD as a file named "code", as the command expects | ||
| Input []byte `json:"input"` | ||
| } | ||
|
|
||
| // SandboxOutput is the output which the sandbox needs to give back. | ||
| type SandboxOutput struct { | ||
| Success bool `json:"success"` // Whether the command exited zero. | ||
| RunningTime time.Duration `json:"running_time"` // The running time of the command. | ||
| MemoryUsed int `json:"memory_used"` // in KBs | ||
|
|
||
| Stdout []byte `json:"stdout"` | ||
| Stderr []byte `json:"stderr"` | ||
| ErrorMessage string `json:"error_message,omitempty"` | ||
| } | ||
|
|
||
| // CopyTo copies all the files it contains into cwd. | ||
| func (input *SandboxInput) CopyTo(cwd string) error { | ||
| // Copy all the files into "cwd" | ||
| for name, file := range input.Files { | ||
| if err := os.WriteFile(filepath.Join(cwd, name), file, 0666); err != nil { | ||
| return errors.Wrapf(err, "writing file %s", name) | ||
| } | ||
| } | ||
| // Copy and set chmod the "code" file | ||
| if input.CompiledSource != nil { | ||
| if err := os.WriteFile(filepath.Join(cwd, "code"), input.CompiledSource, 0777); err != nil { | ||
| return errors.WithStack(err) | ||
| } | ||
| func NewSandbox(name string, options ...sandbox.Option) (sandbox.Runner, error) { | ||
| setting := sandbox.MakeSettings(options...) | ||
| switch name { | ||
| case "raw": | ||
| return raw.New(setting), nil | ||
| case "isolate": | ||
| return isolate.New(setting), nil | ||
| default: | ||
| return nil, errors.Errorf("Sandbox %s doesn't exists or not yet implemented.", name) | ||
| } | ||
| return nil | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.