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

Timecap on execution of PAC script #8036

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Timecap on execution of PAC script #8036

wants to merge 1 commit into from

Conversation

subhash-arabhi
Copy link
Contributor

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

@subhash-arabhi subhash-arabhi mentioned this pull request Dec 12, 2024
Merged
@matthiasblaesing matthiasblaesing added the Platform [ci] enable platform tests (platform/*) label Dec 22, 2024
matthiasblaesing
matthiasblaesing reviewed Dec 22, 2024
View reviewed changes
Copy link
Contributor

@matthiasblaesing matthiasblaesing left a comment

Choose a reason for hiding this comment

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

In general looks sane to me, but I left two inline comments. Please squash the commits into a single one.

platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java Outdated Show resolved Hide resolved
platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java Outdated Show resolved Hide resolved
@subhash-arabhi subhash-arabhi mentioned this pull request Dec 26, 2024
Merged
@subhash-arabhi
Adding time limit to PAC script execution
35f11fb 
naming changes

few sanitations

Changed default timeout and improved code

Changes in initialisation of Request Processor
@subhash-arabhi subhash-arabhi mentioned this pull request Dec 27, 2024
Merged
lahodaj
lahodaj approved these changes Jan 10, 2025
View reviewed changes
Copy link
Contributor

@lahodaj lahodaj left a comment

Choose a reason for hiding this comment

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

Looks reasonable to me.

@matthiasblaesing
Copy link
Contributor

@lahodaj I don't see a blocker for merging, so feel free to do so
@subhash-arabhi (or maybe @lahodaj?) I still would like to know why this construct was used:

private static final RequestProcessor RP = new RequestProcessor(NbPacScriptEvaluator.class.getName(), Runtime.getRuntime().availableProcessors(), true, false);

The common case is a thoughput of 1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthiasblaesing matthiasblaesing matthiasblaesing left review comments

@mbien mbien mbien left review comments

@lahodaj lahodaj lahodaj approved these changes

Assignees
No one assigned
Labels
Platform [ci] enable platform tests (platform/*)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@subhash-arabhi @matthiasblaesing @mbien @lahodaj