From f8f2e6f3d3e13640fed610a2702a3954e7ce3b41 Mon Sep 17 00:00:00 2001 From: e-sp Date: Mon, 27 Feb 2023 23:37:54 +0100 Subject: [PATCH 1/3] pkg(go-1.20.1): Add Go 1.20.1 --- packages/go/1.20.1/build.sh | 5 +++++ packages/go/1.20.1/environment | 2 ++ packages/go/1.20.1/metadata.json | 9 +++++++++ packages/go/1.20.1/run | 7 +++++++ packages/go/1.20.1/test.go | 7 +++++++ 5 files changed, 30 insertions(+) create mode 100755 packages/go/1.20.1/build.sh create mode 100644 packages/go/1.20.1/environment create mode 100644 packages/go/1.20.1/metadata.json create mode 100644 packages/go/1.20.1/run create mode 100644 packages/go/1.20.1/test.go diff --git a/packages/go/1.20.1/build.sh b/packages/go/1.20.1/build.sh new file mode 100755 index 0000000..20144f8 --- /dev/null +++ b/packages/go/1.20.1/build.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +curl -LO https://golang.org/dl/go1.20.1.linux-amd64.tar.gz +tar -xzf go1.20.1.linux-amd64.tar.gz +rm go1.20.1.linux-amd64.tar.gz + diff --git a/packages/go/1.20.1/environment b/packages/go/1.20.1/environment new file mode 100644 index 0000000..88299c1 --- /dev/null +++ b/packages/go/1.20.1/environment @@ -0,0 +1,2 @@ +export PATH=$PWD/go/bin:$PATH +export GOPATH=$PWD/gopath diff --git a/packages/go/1.20.1/metadata.json b/packages/go/1.20.1/metadata.json new file mode 100644 index 0000000..9e2aae1 --- /dev/null +++ b/packages/go/1.20.1/metadata.json @@ -0,0 +1,9 @@ +{ + "language": "go", + "version": "1.20.1", + "aliases": ["go", "golang"], + "limit_overrides": { + "max_process_count": 128, + "run_timeout": 5000 + } +} diff --git a/packages/go/1.20.1/run b/packages/go/1.20.1/run new file mode 100644 index 0000000..65c9a4f --- /dev/null +++ b/packages/go/1.20.1/run @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +mv $1 $1.go +#filename=$1.go +filename=*.go +shift +GOCACHE=$PWD go run $filename "$@" diff --git a/packages/go/1.20.1/test.go b/packages/go/1.20.1/test.go new file mode 100644 index 0000000..c06f485 --- /dev/null +++ b/packages/go/1.20.1/test.go @@ -0,0 +1,7 @@ +package main + +import "fmt" + +func main() { + fmt.Println("OK") +} From 6ef0cdf7b4c96e71d49ae267dc905c177ede1d51 Mon Sep 17 00:00:00 2001 From: Omar Brikaa Date: Sat, 8 Feb 2025 15:10:50 +0200 Subject: [PATCH 2/3] Provide HOME in sandbox (#702) --- api/src/job.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/src/job.js b/api/src/job.js index d46120b..31f688d 100644 --- a/api/src/job.js +++ b/api/src/job.js @@ -156,6 +156,8 @@ class Job { '-s', '-c', '/box/submission', + '-E', + 'HOME=/tmp', '-e', `--dir=${this.runtime.pkgdir}`, `--dir=/etc:noexec`, From 1d55a41a2d563318388596b46d7da772027339ba Mon Sep 17 00:00:00 2001 From: Omar Brikaa Date: Sat, 8 Feb 2025 20:46:46 +0200 Subject: [PATCH 3/3] Explicitly provide env vars instead of inheriting them from parent (#703) --- api/src/job.js | 8 +++----- api/src/runtime.js | 10 +--------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/api/src/job.js b/api/src/job.js index 31f688d..8c3fa79 100644 --- a/api/src/job.js +++ b/api/src/job.js @@ -158,7 +158,9 @@ class Job { '/box/submission', '-E', 'HOME=/tmp', - '-e', + ...this.runtime.env_vars.flat_map(v => ['-E', v]), + '-E', + `PISTON_LANGUAGE=${this.runtime.language}`, `--dir=${this.runtime.pkgdir}`, `--dir=/etc:noexec`, `--processes=${this.runtime.max_process_count}`, @@ -177,10 +179,6 @@ class Job { ...args, ], { - env: { - ...this.runtime.env_vars, - PISTON_LANGUAGE: this.runtime.language, - }, stdio: 'pipe', } ); diff --git a/api/src/runtime.js b/api/src/runtime.js index 9a2adf4..90a2225 100644 --- a/api/src/runtime.js +++ b/api/src/runtime.js @@ -178,15 +178,7 @@ class Runtime { const env_file = path.join(this.pkgdir, '.env'); const env_content = fss.read_file_sync(env_file).toString(); - this._env_vars = {}; - - env_content - .trim() - .split('\n') - .map(line => line.split('=', 2)) - .forEach(([key, val]) => { - this._env_vars[key.trim()] = val.trim(); - }); + this._env_vars = env_content.trim().split('\n'); } return this._env_vars;