Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix] add black key for switch task #15680

Merged
merged 4 commits into from
Mar 18, 2024
Merged

[Fix] add black key for switch task #15680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3fddea
fix switch js, add black key
caishunfeng Mar 7, 2024
a835160
Merge branch 'dev' into fix/switch_js
fuchanghai Mar 12, 2024
22c6a7e
Merge branch 'dev' into fix/switch_js
EricGao888 Mar 18, 2024
cd39586
Merge branch 'dev' into fix/switch_js
caishunfeng Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...master/src/main/java/org/apache/dolphinscheduler/server/master/utils/SwitchTaskUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ public class SwitchTaskUtils {
"eval",
"function",
"import",
".",
"()",
"[",
"]",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we get the final exec command in user input? such as we can convert below code

var a = Java.type("ja" + "va.lang.Runtime");
var b = a.getRuntime();
b.exec(${cmd})

to

var a = Java.type("ja" + "va.lang.Runtime");
var b = a.getRuntime();
Java.type("ja" + "va.lang.Runtime").getRuntime().exec(${cmd})

If we can do it, I think that would be easier to check

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's hard to convert because the code are executed in js engine.

"\\\\");

static {
Expand Down
10 changes: 10 additions & 0 deletions ...er/src/test/java/org/apache/dolphinscheduler/server/master/utils/SwitchTaskUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,15 @@ public void testIllegalCondition() {
SwitchTaskUtils.generateContentWithTaskParams(contentWithUnicode, globalParams, varParams);
});

String contentWithSpecify1 = "cmd.abc";
Assertions.assertThrowsExactly(IllegalArgumentException.class, () -> {
SwitchTaskUtils.generateContentWithTaskParams(contentWithSpecify1, globalParams, varParams);
});

String contentWithSpecify2 = "cmd()";
Assertions.assertThrowsExactly(IllegalArgumentException.class, () -> {
SwitchTaskUtils.generateContentWithTaskParams(contentWithSpecify2, globalParams, varParams);
});

}
}
Loading