Timecap on execution of PAC script #8036
Open
+103
−29
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
+203
to
+204
| private static class RPSingleton { private static final RequestProcessor instance = new RequestProcessor(NbPacScriptEvaluator.class.getName(), Runtime.getRuntime().availableProcessors(), true, false); } | ||
| private static RequestProcessor getRequestProcessor() { return RPSingleton.instance; } |
There was a problem hiding this comment.
Why this complex construct? Why not just
private static final RequestProcessor RP = new RequestProcessor(NbPacScriptEvaluator.class.getName(), Runtime.getRuntime().availableProcessors(), true, false);
This is done all over the code base. The proposed style looks overly complex without clear benefits.
Why the limit to number available processors? For a real PAC script I would expect it to be throttled by network IO (DNS look ups for example). If high CPU usage is the problem (and thus an attacker is expected), I would go with a throughput of 1.
| @@ -213,7 +219,8 @@ public NbPacScriptEvaluator(String pacSourceCocde) throws PacParsingException { | |||
| @Override | |||
| public List<Proxy> findProxyForURL(URI uri) throws PacValidationException { | |||
|
|
|||
| List<Proxy> jsResultAnalyzed; | |||
| AtomicReference<List<Proxy>> resultHolder = new AtomicReference<>(null); | |||
There was a problem hiding this comment.
This can be moved into the else-block. No need to hold it in the outer context.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue
We need to restrict the PAC scripts with high cpu consumption that could lead to crash
Changes
Added time limit to PAC script execution.
Added a config in ProxySettings - pacScriptTimeout with default value set to 60 sec
Added tests for the same