Compare commits

...

4 Commits

Author SHA1 Message Date
dependabot[bot] cb489889d6
Merge 1f36b3d350 into 1d55a41a2d 2025-03-02 04:25:50 +00:00
Omar Brikaa 1d55a41a2d
Explicitly provide env vars instead of inheriting them from parent (#703) 2025-02-08 20:46:46 +02:00
Omar Brikaa 6ef0cdf7b4
Provide HOME in sandbox (#702) 2025-02-08 15:10:50 +02:00
dependabot[bot] 1f36b3d350
build(deps): bump minimatch from 3.0.4 to 3.0.5 in /cli
Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.0.5)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-12 02:21:51 +00:00
4 changed files with 14 additions and 22 deletions

View File

@ -156,7 +156,11 @@ class Job {
'-s', '-s',
'-c', '-c',
'/box/submission', '/box/submission',
'-e', '-E',
'HOME=/tmp',
...this.runtime.env_vars.flat_map(v => ['-E', v]),
'-E',
`PISTON_LANGUAGE=${this.runtime.language}`,
`--dir=${this.runtime.pkgdir}`, `--dir=${this.runtime.pkgdir}`,
`--dir=/etc:noexec`, `--dir=/etc:noexec`,
`--processes=${this.runtime.max_process_count}`, `--processes=${this.runtime.max_process_count}`,
@ -175,10 +179,6 @@ class Job {
...args, ...args,
], ],
{ {
env: {
...this.runtime.env_vars,
PISTON_LANGUAGE: this.runtime.language,
},
stdio: 'pipe', stdio: 'pipe',
} }
); );

View File

@ -178,15 +178,7 @@ class Runtime {
const env_file = path.join(this.pkgdir, '.env'); const env_file = path.join(this.pkgdir, '.env');
const env_content = fss.read_file_sync(env_file).toString(); const env_content = fss.read_file_sync(env_file).toString();
this._env_vars = {}; this._env_vars = env_content.trim().split('\n');
env_content
.trim()
.split('\n')
.map(line => line.split('=', 2))
.forEach(([key, val]) => {
this._env_vars[key.trim()] = val.trim();
});
} }
return this._env_vars; return this._env_vars;

14
cli/package-lock.json generated
View File

@ -11,7 +11,7 @@
"dependencies": { "dependencies": {
"axios": "^0.21.2", "axios": "^0.21.2",
"chalk": "^4.1.0", "chalk": "^4.1.0",
"minimatch": "^3.0.4", "minimatch": "^3.0.5",
"nocamel": "^1.0.2", "nocamel": "^1.0.2",
"semver": "^7.3.5", "semver": "^7.3.5",
"ws": "^7.5.3", "ws": "^7.5.3",
@ -170,9 +170,9 @@
} }
}, },
"node_modules/minimatch": { "node_modules/minimatch": {
"version": "3.0.4", "version": "3.0.5",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
"dependencies": { "dependencies": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
}, },
@ -426,9 +426,9 @@
} }
}, },
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.5",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }

View File

@ -7,7 +7,7 @@
"dependencies": { "dependencies": {
"axios": "^0.21.2", "axios": "^0.21.2",
"chalk": "^4.1.0", "chalk": "^4.1.0",
"minimatch": "^3.0.4", "minimatch": "^3.0.5",
"nocamel": "^1.0.2", "nocamel": "^1.0.2",
"semver": "^7.3.5", "semver": "^7.3.5",
"ws": "^7.5.3", "ws": "^7.5.3",