Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Java: Fix NashornScriptEngine detection in ScriptEngine query#5349

Merged
aschackmull merged 1 commit into
github:mainfrom
p0wn4j:fix-nashorn-engine-1
Mar 8, 2021
Merged

Java: Fix NashornScriptEngine detection in ScriptEngine query#5349
aschackmull merged 1 commit into
github:mainfrom
p0wn4j:fix-nashorn-engine-1

Conversation

@p0wn4j

@p0wn4j p0wn4j commented Mar 6, 2021

Copy link
Copy Markdown
Contributor

In case of creating ScriptEngine by this way:
NashornScriptEngine engine = (NashornScriptEngine) factory.getScriptEngine(...);
engine.eval(input);
ScriptEngine.ql cannot detect this sink.

Java: Add NashornScriptEngine detection in ScriptEngine query

Java: Add NashornScriptEngine detection in ScriptEngine query

Java: Add NashornScriptEngine detection in ScriptEngine query
@smowton

smowton commented Mar 8, 2021

Copy link
Copy Markdown
Contributor

For future reference, there is no need to delete a PR and make a new one -- you can push to the same branch, or if replacing it completely, force-push over it.

@p0wn4j

p0wn4j commented Mar 8, 2021

Copy link
Copy Markdown
Contributor Author

My branch was too old, there was a merge conflict that's why I created a new branch.

@smowton

smowton commented Mar 8, 2021

Copy link
Copy Markdown
Contributor

@p0wn4j for this purpose you should do something like

git checkout mybranch
git fetch origin main
git rebase FETCH_HEAD
git push myfork HEAD --force

This will replay your commits on top of the current main and then update your remote branch. You will get prompts to resolve conflicts as you go when the individual commits conflict with changes to main. See also https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase

@aschackmull aschackmull merged commit e63f811 into github:main Mar 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants