jafea7
/
jafea7-ctbrec-v5.3.0-based
mirror of https://github.com/Jafea7/0xb00bface-ctbrec.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement PAC (Proxy Auto Config)

This commit is contained in:
Jafea7 2025-09-26 17:30:57 +10:00
parent af7c556283
commit 8f5ee9d57a
10 changed files with 80 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/assembly/linux-jre.xml
View File

@ -26,6 +26,12 @@
<filtered>true</filtered>
<destName>ctbrec-no-splash.sh</destName>
</file>
<file>
<source>${project.basedir}/src/assembly/pac.js</source>
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
<destName>pac.js</destName>
</file>
<file>
<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
<outputDirectory>ctbrec</outputDirectory>

6
client/src/assembly/macos-jre.xml
View File

@ -26,6 +26,12 @@
<filtered>true</filtered>
<destName>ctbrec-no-splash.sh</destName>
</file>
<file>
<source>${project.basedir}/src/assembly/pac.js</source>
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
<destName>pac.js</destName>
</file>
<file>
<source>${project.build.directory}/${project.artifactId}-${project.version}.jar
</source>

9
client/src/assembly/pac.js Normal file
View File

@ -0,0 +1,9 @@
function FindProxyForURL(url, host) {
if (shExpMatch(host, "*stripchat.com")) {
return "SOCKS 127.0.0.1:1080";
} else if (shExpMatch(host, "*chaturbate.com")) {
return "PROXY 127.0.0.1:8080";
} else {
return "DIRECT";
}
}

6
client/src/assembly/win64-jre.xml
View File

@ -22,6 +22,12 @@
<source>${project.build.directory}/ctbrec-no-splash.exe</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.basedir}/src/assembly/pac.js</source>
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
<destName>pac.js</destName>
</file>
<file>
<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
<outputDirectory>ctbrec</outputDirectory>

7
client/src/main/java/ctbrec/ui/settings/SettingsTab.java
View File

@ -83,6 +83,7 @@ public class SettingsTab extends Tab implements TabSelectionListener {
private SimpleStringProperty proxyPort;
private SimpleStringProperty proxyUser;
private SimpleStringProperty proxyPassword;
private SimpleStringProperty pacUrl;
private SimpleDirectoryProperty recordingsDir;
private SimpleListProperty<DirectoryStructure> directoryStructure;
private SimpleListProperty<SplitAfterOption> splitAfter;
@ -160,11 +161,12 @@ public class SettingsTab extends Tab implements TabSelectionListener {
maximumResolutionPlayer = new SimpleIntegerProperty(null, "maximumResolutionPlayer", settings.maximumResolutionPlayer);
showPlayerStarting = new SimpleBooleanProperty(null, "showPlayerStarting", settings.showPlayerStarting);
singlePlayer = new SimpleBooleanProperty(null, "singlePlayer", settings.singlePlayer);
proxyType = new SimpleListProperty<>(null, "proxyType", FXCollections.observableList(List.of(DIRECT, HTTP, SOCKS4, SOCKS5)));
proxyType = new SimpleListProperty<>(null, "proxyType", FXCollections.observableList(List.of(DIRECT, HTTP, SOCKS4, SOCKS5, PAC)));
proxyHost = new SimpleStringProperty(null, "proxyHost", settings.proxyHost);
proxyPort = new SimpleStringProperty(null, "proxyPort", settings.proxyPort);
proxyUser = new SimpleStringProperty(null, "proxyUser", settings.proxyUser);
proxyPassword = new SimpleStringProperty(null, "proxyPassword", settings.proxyPassword);
pacUrl = new SimpleStringProperty(null, "pacUrl", settings.pacUrl);
recordingsDir = new SimpleDirectoryProperty(null, "recordingsDir", settings.recordingsDir);
directoryStructure = new SimpleListProperty<>(null, "recordingsDirStructure",
FXCollections.observableList(List.of(FLAT, ONE_PER_MODEL, ONE_PER_GROUP, ONE_PER_RECORDING)));
@ -320,7 +322,8 @@ public class SettingsTab extends Tab implements TabSelectionListener {
Setting.of("Host", proxyHost).needsRestart(),
Setting.of("Port", proxyPort).needsRestart(),
Setting.of("Username", proxyUser).needsRestart(),
Setting.of("Password", proxyPassword).needsRestart())),
Setting.of("Password", proxyPassword).needsRestart(),
Setting.of("PAC URL", pacUrl, "URL to your Proxy Auto-Config (PAC) file (e.g. http://example.com/pac.js or file:///G:/path/to/pac.js)").needsRestart())),
Category.of("Advanced / Devtools",
Group.of("Networking",
Setting.of("Playlist request timeout (ms)", playlistRequestTimeout, "Timeout in ms for playlist requests")),

5
common/pom.xml
View File

@ -41,6 +41,11 @@
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>
<groupId>org.bidib.com.github.markusbernhardt</groupId>
<artifactId>proxy-vole</artifactId>
<version>1.1.6</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>

4
common/src/main/java/ctbrec/Settings.java
View File

@ -32,7 +32,8 @@ public class Settings {
DIRECT,
HTTP,
SOCKS4,
SOCKS5
SOCKS5,
PAC
}
public enum SplitStrategy {
@ -139,6 +140,7 @@ public class Settings {
public String proxyPort;
public ProxyType proxyType = ProxyType.DIRECT;
public String proxyUser;
public String pacUrl;
public boolean recentlyWatched = true;
public List<String> recordLaterTableColumnOrder = new ArrayList<>();
public Map<String, Boolean> recordLaterTableColumnVisibility = new HashMap<>();

30
common/src/main/java/ctbrec/io/HttpClient.java
View File

@ -1,5 +1,8 @@
package ctbrec.io;
import com.github.markusbernhardt.proxy.selector.pac.PacProxySelector;
import com.github.markusbernhardt.proxy.selector.pac.UrlPacScriptSource;
import com.fasterxml.jackson.core.type.TypeReference;
import ctbrec.Config;
import ctbrec.LoggingInterceptor;
@ -20,6 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.net.Authenticator;
import java.net.PasswordAuthentication;
import java.net.ProxySelector;
import java.nio.file.Files;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
@ -90,6 +94,18 @@ public abstract class HttpClient {
Authenticator.setDefault(new SocksProxyAuth(username, password));
}
break;
case PAC:
String pacUrl = config.getSettings().pacUrl;
if (pacUrl != null && !pacUrl.isEmpty()) {
try {
UrlPacScriptSource pacSource = new UrlPacScriptSource(pacUrl);
ProxySelector pacSelector = new PacProxySelector(pacSource);
ProxySelector.setDefault(pacSelector);
} catch (Exception e) {
log.warn("Failed to load PAC file: {}", e.getMessage());
}
}
break;
case DIRECT:
default:
System.clearProperty(ProxyConstants.HTTP_PROXY_HOST);
@ -142,11 +158,11 @@ public abstract class HttpClient {
cacheSize = (long) config.getSettings().thumbCacheSize * 1024 * 1024;
Builder builder = new OkHttpClient.Builder()
.cookieJar(cookieJar)
.connectionPool(GLOBAL_HTTP_CONN_POOL)
.connectTimeout(config.getSettings().httpTimeout, TimeUnit.MILLISECONDS)
.readTimeout(config.getSettings().httpTimeout, TimeUnit.MILLISECONDS)
.addNetworkInterceptor(new LoggingInterceptor());
.cookieJar(cookieJar)
.connectionPool(GLOBAL_HTTP_CONN_POOL)
.connectTimeout(config.getSettings().httpTimeout, TimeUnit.MILLISECONDS)
.readTimeout(config.getSettings().httpTimeout, TimeUnit.MILLISECONDS)
.addNetworkInterceptor(new LoggingInterceptor());
if (cacheSize > 0) {
cache = HttpClientCacheProvider.getCache(config);
@ -155,6 +171,10 @@ public abstract class HttpClient {
}
}
if (config.getSettings().proxyType == ProxyType.PAC) {
builder.proxySelector(ProxySelector.getDefault());
}
ProxyType proxyType = config.getSettings().proxyType;
if (proxyType == ProxyType.HTTP) {
String username = config.getSettings().proxyUser;

9
server/src/assembly/pac.js Normal file
View File

@ -0,0 +1,9 @@
function FindProxyForURL(url, host) {
if (shExpMatch(host, "*stripchat.com")) {
return "SOCKS 127.0.0.1:1080";
} else if (shExpMatch(host, "*chaturbate.com")) {
return "PROXY 127.0.0.1:8080";
} else {
return "DIRECT";
}
}

6
server/src/assembly/server.xml
View File

@ -26,6 +26,12 @@
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>${project.basedir}/src/assembly/pac.js</source>
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
<destName>pac.js</destName>
</file>
<file>
<source>${project.basedir}/../CHANGELOG.md</source>
<outputDirectory>ctbrec</outputDirectory>