Skip to content

Customizable pac script parser implementation #63

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

Open
ermescs wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Customizable pac script parser implementation #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc26ed6
Added IntelliJ IDEA related entries to .gitignore
lmoretto Dec 18, 2018
dc673fb
Made PacScriptParser implementation customizable
lmoretto Dec 18, 2018
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,9 @@
.classpath
bin/

# IntelliJ IDEA
.idea/
*.iml

# Maven
target/
9 changes: 5 additions & 4 deletions src/main/java/com/github/markusbernhardt/proxy/selector/pac/PacProxySelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class PacProxySelector extends ProxySelector {
private static final String PAC_SOCKS = "SOCKS";
private static final String PAC_DIRECT = "DIRECT";

private PacScriptParser pacScriptParser;
private final PacScriptParser pacScriptParser;

private static volatile boolean enabled = true;

Expand All @@ -38,7 +38,7 @@ public class PacProxySelector extends ProxySelector {

public PacProxySelector(PacScriptSource pacSource) {
super();
selectEngine(pacSource);
pacScriptParser = selectEngine(pacSource);
}

/*************************************************************************
Expand Down Expand Up @@ -70,12 +70,13 @@ public static boolean isEnabled() {
* to use as input.
************************************************************************/

private void selectEngine(PacScriptSource pacSource) {
protected PacScriptParser selectEngine(PacScriptSource pacSource) {
try {
Logger.log(getClass(), LogLevel.INFO, "Using javax.script JavaScript engine.");
pacScriptParser = new JavaxPacScriptParser(pacSource);
return new JavaxPacScriptParser(pacSource);
} catch (Exception e) {
Logger.log(getClass(), LogLevel.ERROR, "PAC parser error.", e);
return null;
}
}

Expand Down