aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Strapp <matt@mattstrapp.net>2022-02-14 16:01:45 -0600
committerMatt Strapp <matt@mattstrapp.net>2022-02-14 16:01:45 -0600
commit49cabd92d5a90627be71e05361118c396f860d9c (patch)
treeeda66811088b9bc90e8e754233c91f8eac088607
parentadd the TODO (diff)
downloadee4511w-web-49cabd92d5a90627be71e05361118c396f860d9c.tar
ee4511w-web-49cabd92d5a90627be71e05361118c396f860d9c.tar.gz
ee4511w-web-49cabd92d5a90627be71e05361118c396f860d9c.tar.bz2
ee4511w-web-49cabd92d5a90627be71e05361118c396f860d9c.tar.lz
ee4511w-web-49cabd92d5a90627be71e05361118c396f860d9c.tar.xz
ee4511w-web-49cabd92d5a90627be71e05361118c396f860d9c.tar.zst
ee4511w-web-49cabd92d5a90627be71e05361118c396f860d9c.zip
replace exec with spawn
Signed-off-by: Matt Strapp <matt@mattstrapp.net>
Diffstat (limited to '')
-rw-r--r--src/routes/api.ts25
1 files changed, 16 insertions, 9 deletions
diff --git a/src/routes/api.ts b/src/routes/api.ts
index c538751..eb20963 100644
--- a/src/routes/api.ts
+++ b/src/routes/api.ts
@@ -5,7 +5,7 @@ import fileUpload, { UploadedFile } from 'express-fileupload';
import rateLimit from 'express-rate-limit';
import { access, stat } from 'fs/promises';
import { quote } from 'shell-quote';
-import { exec } from 'child_process';
+import { spawn } from 'child_process';
const api = express.Router();
@@ -85,18 +85,25 @@ api.route('/actuate')
if (stats.isDirectory())
return res.status(403).json({ error: 'File is a directory.' });
- const escaped = quote([ 'python', req.body.path]);
+ const escaped = quote( [ req.body.path ] );
// Run the code
/*
TODO: MAKE THIS MORE SECURE
- Execing random things is probably a bad idea, and snyk is complaining that it isn't escaped properly.
*/
- exec(escaped, (err, stdout, stderr) => {
- if (err)
- return res.status(500).json({ error: 'An unknown error occurred while executing the file.', error_msg: stderr });
-
- // Return the output
- res.status(200).json({ output: stdout });
+ let output = '';
+ // NOT PORTABLE: ASSUMES PYTHON 3 IS THERE AS WELL AS ON UNIX
+ // TODO: MAKE PORTABLE
+ const actuation = spawn('/usr/bin/python', escaped.split(' '));
+ actuation.stdout.on('data', (data: Buffer) => {
+ output += data.toString();
+ });
+ actuation.stderr.on('data', (data: Buffer) => {
+ output += `STDERR: ${data.toString()}`;
+ });
+ actuation.on('close', (code: number) => {
+ if (code !== 0)
+ res.status(500).json({ error: 'An unknown error occurred while running the file.', error_msg: output });
+ res.status(200).json({ stdout: output });
});
})
// Fallback