From 91bd30f59e22f16dec124715c4968a7f16d6e3c5 Mon Sep 17 00:00:00 2001 From: Hydrazer Date: Sun, 12 Jun 2022 08:32:06 -0600 Subject: [PATCH 1/8] smalltalk fix argv --- packages/smalltalk/3.2.3/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/smalltalk/3.2.3/run b/packages/smalltalk/3.2.3/run index 7553905..a1ac6fa 100644 --- a/packages/smalltalk/3.2.3/run +++ b/packages/smalltalk/3.2.3/run @@ -4,5 +4,5 @@ code_file=`pwd`/"$1" shift cd $SMALLTALK_PATH -$SMALLTALK_PATH/gst "$code_file" "$@" +$SMALLTALK_PATH/gst "$code_file" -a "$@" From 0ea073f6d26cff8a16cd7cb8e25e132661e23c63 Mon Sep 17 00:00:00 2001 From: Omar Brikaa Date: Thu, 30 Jun 2022 13:11:17 +0200 Subject: [PATCH 2/8] Add tmpfs parameters in docker-compose dev --- docker-compose.dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml index 25d8fe6..75cbd2d 100644 --- a/docker-compose.dev.yaml +++ b/docker-compose.dev.yaml @@ -14,7 +14,7 @@ services: environment: - PISTON_REPO_URL=http://repo:8000/index tmpfs: - - /piston/jobs:exec + - /piston/jobs:exec,uid=1000,gid=1000,mode=700 repo: # Local testing of packages build: repo From 0e5d3b56a11a8a830488d8af8520e30446fd2cb5 Mon Sep 17 00:00:00 2001 From: Omar Brikaa Date: Thu, 30 Jun 2022 13:18:50 +0200 Subject: [PATCH 3/8] Get rid of pre-commit since it does not account for hunks --- piston | 9 --------- 1 file changed, 9 deletions(-) diff --git a/piston b/piston index fbd256d..fd83727 100755 --- a/piston +++ b/piston @@ -14,13 +14,6 @@ docker_compose(){ fi } -init_precommit() { - if [ $PISTON_ENV == "dev" ]; then - rm -f .git/hooks/pre-commit - ln -s "$PISTON_PATH/pre-commit" "$PISTON_PATH/.git/hooks/pre-commit" - fi -} - case $1 in help) echo "=== Piston Management ===" @@ -66,14 +59,12 @@ case $1 in restart) docker_compose restart ;; start) - init_precommit docker_compose up -d ;; stop) docker_compose down ;; bash) docker_compose exec api /bin/bash ;; rebuild) - init_precommit docker_compose build && docker_compose up -d ;; From 5526071f00fcaacf78dbd7db5bd93d6c92f45e16 Mon Sep 17 00:00:00 2001 From: Omar Brikaa Date: Thu, 30 Jun 2022 13:19:44 +0200 Subject: [PATCH 4/8] Set jobs permissions on startup --- api/src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/api/src/index.js b/api/src/index.js index 79bca00..2870902 100644 --- a/api/src/index.js +++ b/api/src/index.js @@ -35,6 +35,7 @@ expressWs(app); } } }); + fss.chmodSync(path.join(config.data_directory, globals.data_directories.jobs), 0o711) logger.info('Loading packages'); const pkgdir = path.join( From 07ec6b3f78d72430fbfcd224e01bbb28a8ed2eb8 Mon Sep 17 00:00:00 2001 From: Omar Brikaa Date: Thu, 30 Jun 2022 13:31:17 +0200 Subject: [PATCH 5/8] Don't include the tmpfs in the docker volume --- docker-compose.dev.yaml | 2 +- docker-compose.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml index 75cbd2d..579b632 100644 --- a/docker-compose.dev.yaml +++ b/docker-compose.dev.yaml @@ -10,7 +10,7 @@ services: ports: - 2000:2000 volumes: - - ./data/piston:/piston + - ./data/piston/packages:/piston/packages environment: - PISTON_REPO_URL=http://repo:8000/index tmpfs: diff --git a/docker-compose.yaml b/docker-compose.yaml index 83a1383..74d5f87 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,7 +8,7 @@ services: ports: - 2000:2000 volumes: - - ./data/piston:/piston + - ./data/piston/packages:/piston/packages tmpfs: - /piston/jobs:exec,uid=1000,gid=1000,mode=700 - /tmp:exec From e1a1be7e4cf1ad48444b6c87eb214dc6fdc76eb9 Mon Sep 17 00:00:00 2001 From: Omar Brikaa Date: Thu, 30 Jun 2022 13:35:35 +0200 Subject: [PATCH 6/8] Permission mode 711 --- docker-compose.dev.yaml | 2 +- docker-compose.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml index 579b632..8a0d385 100644 --- a/docker-compose.dev.yaml +++ b/docker-compose.dev.yaml @@ -14,7 +14,7 @@ services: environment: - PISTON_REPO_URL=http://repo:8000/index tmpfs: - - /piston/jobs:exec,uid=1000,gid=1000,mode=700 + - /piston/jobs:exec,uid=1000,gid=1000,mode=711 repo: # Local testing of packages build: repo diff --git a/docker-compose.yaml b/docker-compose.yaml index 74d5f87..839b340 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -10,5 +10,5 @@ services: volumes: - ./data/piston/packages:/piston/packages tmpfs: - - /piston/jobs:exec,uid=1000,gid=1000,mode=700 + - /piston/jobs:exec,uid=1000,gid=1000,mode=711 - /tmp:exec From 43a1242bbfbdee72d27ae81edea073a1f138a869 Mon Sep 17 00:00:00 2001 From: Jonxslays <51417989+Jonxslays@users.noreply.github.com> Date: Fri, 1 Jul 2022 06:11:29 -0700 Subject: [PATCH 7/8] Add piston_rspy to the readme --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index a65ec87..6dc36f7 100644 --- a/readme.md +++ b/readme.md @@ -71,6 +71,7 @@ The following are approved and endorsed extensions/utilities to the core Piston - [Pyston](https://github.com/ffaanngg/pyston), a Python wrapper for accessing the Piston API. - [Go-Piston](https://github.com/milindmadhukar/go-piston), a Golang wrapper for accessing the Piston API. - [piston_rs](https://github.com/Jonxslays/piston_rs), a Rust wrapper for accessing the Piston API. +- [piston_rspy](https://github.com/Jonxslays/piston_rspy), Python bindings for accessing the Piston API via `piston_rs`.
From 0c0be54505f5acd67eb854d82ef314df76488405 Mon Sep 17 00:00:00 2001 From: Thomas Hobson Date: Sat, 2 Jul 2022 01:46:44 +1200 Subject: [PATCH 8/8] Fix #495 --- api/src/job.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/src/job.js b/api/src/job.js index d561036..2150279 100644 --- a/api/src/job.js +++ b/api/src/job.js @@ -343,6 +343,9 @@ class Job { const [_1, state, user_friendly] = state_line.split(/\s+/); const proc_id_int = parse_int(proc_id); + + // Skip over any processes that aren't ours. + if(ruid != this.uid && euid != this.uid) return -1; if (state == 'Z'){ // Zombie process, just needs to be waited, regardless of the user id @@ -353,8 +356,7 @@ class Job { } // We should kill in all other state (Sleep, Stopped & Running) - if (ruid == this.uid || euid == this.uid) - return proc_id_int; + return proc_id_int; } catch { return -1; }