kalugin66/windmill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix behavior of disable nsjail and disable nuser

Browse Source
This commit is contained in:
Ruben Fiszel
2022-08-18 17:16:53 +02:00
parent ae44a1ecc1
commit 451bddf015
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/worker.rs
View File

@@ -698,7 +698,7 @@ print(res_json)
tx.commit().await?;
let mut reserved_variables = get_reserved_variables(job, token, db).await?;
if !disable_nuser {
if !disable_nsjail {
let _ = write_file(
job_dir,
"run.config.proto",
@@ -718,7 +718,7 @@ print(res_json)
workspace_id = %job.workspace_id,
"started python code execution"
);
let child = if !disable_nuser {
let child = if !disable_nsjail {
Command::new(nsjail_path)
.current_dir(job_dir)
.env_clear()
@@ -822,7 +822,7 @@ run();
let mut reserved_variables = get_reserved_variables(job, token, db).await?;
reserved_variables.insert("RUST_LOG".to_string(), "info".to_string());
if !disable_nuser {
if !disable_nsjail {
let _ = write_file(
job_dir,
"run.config.proto",

8
frontend/src/lib/components/FlowPreviewContent.svelte
View File

@@ -41,9 +41,11 @@
x.forEach((y, j) => {
if (`result` in y) {
innerResults.push(y.result)
$flowStateStore[i].childFlowModules![j].previewResults = JSON.parse(
JSON.stringify(innerResults)
)
if ($flowStateStore[i].childFlowModules![j] != undefined) {
$flowStateStore[i].childFlowModules![j].previewResults = JSON.parse(
JSON.stringify(innerResults)
)
}
}
})
resultsSoFar.push(innerResults)