From 64833a04085b33948256caa4d6a787a9f15d08db Mon Sep 17 00:00:00 2001 From: Brikaa Date: Fri, 15 Oct 2021 14:25:33 +0200 Subject: [PATCH] pkg(file-0.0.1): Run executable --- api/src/api/v2.js | 19 ++++++++++--------- api/src/job.js | 8 ++++++-- packages/file/0.0.1/build.sh | 3 +++ packages/file/0.0.1/environment | 3 +++ packages/file/0.0.1/metadata.json | 5 +++++ packages/file/0.0.1/run | 6 ++++++ packages/file/0.0.1/test.file | Bin 0 -> 16568 bytes readme.md | 1 + 8 files changed, 34 insertions(+), 11 deletions(-) create mode 100755 packages/file/0.0.1/build.sh create mode 100644 packages/file/0.0.1/environment create mode 100644 packages/file/0.0.1/metadata.json create mode 100644 packages/file/0.0.1/run create mode 100755 packages/file/0.0.1/test.file diff --git a/api/src/api/v2.js b/api/src/api/v2.js index c0526f4..d6cd3f2 100644 --- a/api/src/api/v2.js +++ b/api/src/api/v2.js @@ -87,15 +87,6 @@ function get_job(body) { } } - if ( - files.filter(file => !file.encoding || file.encoding === 'utf8') - .length === 0 - ) { - return reject({ - message: 'files must include at least one utf8 encoded file', - }); - } - const rt = runtime.get_latest_runtime_matching_language_version( language, version @@ -106,6 +97,16 @@ function get_job(body) { }); } + if ( + rt.language !== 'file' && + files.filter(file => !file.encoding || file.encoding === 'utf8') + .length === 0 + ) { + return reject({ + message: 'files must include at least one utf8 encoded file', + }); + } + for (const constraint of ['memory_limit', 'timeout']) { for (const type of ['compile', 'run']) { const constraint_name = `${type}_${constraint}`; diff --git a/api/src/job.js b/api/src/job.js index 7acff22..ca95e6f 100644 --- a/api/src/job.js +++ b/api/src/job.js @@ -222,7 +222,9 @@ class Job { } runtime=${this.runtime.toString()}` ); - const code_files = this.files.filter(file => file.encoding == 'utf8'); + const code_files = + (this.runtime.language === 'file' && this.files) || + this.files.filter(file => file.encoding == 'utf8'); logger.debug('Compiling'); @@ -270,7 +272,9 @@ class Job { } gid=${this.gid} runtime=${this.runtime.toString()}` ); - const code_files = this.files.filter(file => file.encoding == 'utf8'); + const code_files = + (this.runtime.language === 'file' && this.files) || + this.files.filter(file => file.encoding == 'utf8'); if (this.runtime.compiled) { eventBus.emit('stage', 'compile'); diff --git a/packages/file/0.0.1/build.sh b/packages/file/0.0.1/build.sh new file mode 100755 index 0000000..d7ab47e --- /dev/null +++ b/packages/file/0.0.1/build.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +# Nothing to do here diff --git a/packages/file/0.0.1/environment b/packages/file/0.0.1/environment new file mode 100644 index 0000000..d5a7803 --- /dev/null +++ b/packages/file/0.0.1/environment @@ -0,0 +1,3 @@ +#!/bin/bash + +export PATH=$PWD:$PATH diff --git a/packages/file/0.0.1/metadata.json b/packages/file/0.0.1/metadata.json new file mode 100644 index 0000000..ae34ae9 --- /dev/null +++ b/packages/file/0.0.1/metadata.json @@ -0,0 +1,5 @@ +{ + "language": "file", + "version": "0.0.1", + "aliases": ["executable", "elf", "binary"] +} diff --git a/packages/file/0.0.1/run b/packages/file/0.0.1/run new file mode 100644 index 0000000..77ed0a6 --- /dev/null +++ b/packages/file/0.0.1/run @@ -0,0 +1,6 @@ +#!/bin/bash + +filename="$1" +chmod +x "$filename" +shift +./"$filename" "$@" diff --git a/packages/file/0.0.1/test.file b/packages/file/0.0.1/test.file new file mode 100755 index 0000000000000000000000000000000000000000..8c7a67d92841fc71dd40ef76305328833c4aab6e GIT binary patch literal 16568 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 LPtooQ z|8l|4Q^rroIIPXe9`Z;0DV?_s+VuQ9{;T0n?YhtRdcx;e&mI9z`4N%XHmNp<_(AyZ zj#lH_rT?nS;_m^j|3p*~4oW;ILfU9)>m=|{m8VjEp#6_%fByUM*gWxnKTn)j=D}%+ z`ds}K{mH!D8qQ%cd}1hV+KK%FK*26zElE<$F7P+)jG3e*{snlZa_0V#+)!e~Oxd}7 z!Aum#L^78d9kFaH6>gc^!^FD#w3*1~69-HyYv&J$efdPjGE>D&<^U)T&4j02}@7WRE9`Ay!s?(`zKyI6;w6L?Mr$07e4n#Y9V~A>{5_ST+CU&B;sdUyX7A&IE z#s%K15OHogzy&De%we1ZZMJZ1aH#frcY7*S487ICG_kRRPag5)o(h)-bzbeEKwpLm z1+LG%HN!=g8!(cEqD`1BVrU(}fWbDKc zq@7oCm}}`QcE5~@a5iUK;r-cScr>3Iwet1>2Q*YnWB*e+rJ-nNyqWGZ={}q&42y8; zKo(6XY3G&YE-PQa(5zBS*z(p$f(W`cI%12k9PeRN!~1hksZy|#B8+V>P-VWt`J5bP zVQX05YQrf+V@<_S_ncyI9Ze-NX#`VrTwxK$&7Q$MJjZkFokH{;jYls2Mylf8$H?!| z+AMv!PVz%I=-rk1^X=CoUn=~*sx%?CpyK4a_wB7=M=km9BE$4v{nk%r*^97a>&F36*|1~ToQK2p~pXVUN4AegJ>zJqI0Bp|UZlC5GPX3)C<;~I{qocU{^D=B$ zrY!G4a^v@V-e>F17xP)Z4ob2x?H!f-78k+Uspj?g~K@|j~%CLyAF6r510?YNOMl^KR