mirror of
https://github.com/xpipe-io/xpipe.git
synced 2026-08-25 18:56:39 +00:00
Rework
This commit is contained in:
@@ -276,6 +276,12 @@ public final class AppPrefs {
|
||||
.valueClass(HttpProxy.class)
|
||||
.requiresRestart(true)
|
||||
.build());
|
||||
final ObjectProperty<String> noProxyList = map(Mapping.builder()
|
||||
.property(new GlobalObjectProperty<>())
|
||||
.key("noProxy")
|
||||
.valueClass(String.class)
|
||||
.requiresRestart(true)
|
||||
.build());
|
||||
final Property<UUID> terminalProxy = map(Mapping.builder()
|
||||
.property(new GlobalObjectProperty<>())
|
||||
.key("terminalProxy")
|
||||
@@ -595,6 +601,10 @@ public final class AppPrefs {
|
||||
return httpProxy;
|
||||
}
|
||||
|
||||
public ObservableValue<String> noProxyList() {
|
||||
return noProxyList;
|
||||
}
|
||||
|
||||
public ObservableBooleanValue disableApiAuthentication() {
|
||||
return disableApiAuthentication;
|
||||
}
|
||||
|
||||
@@ -92,8 +92,19 @@ public class HttpProxyCategory extends AppPrefsCategory {
|
||||
DesktopHelper.browseFile(AppCertStore.getDir());
|
||||
});
|
||||
}))
|
||||
.pref(prefs.noProxyList)
|
||||
.addComp(new TextAreaComp(prefs.noProxyList)
|
||||
.applyStructure(structure -> {
|
||||
structure.getTextArea().setPromptText("""
|
||||
my.domain
|
||||
*.example.com
|
||||
|
||||
""");
|
||||
})
|
||||
.maxWidth(600), prefs.noProxyList)
|
||||
.pref(prefs.disableHttpsTlsCheck)
|
||||
.addToggle(prefs.disableHttpsTlsCheck))
|
||||
.addToggle(prefs.disableHttpsTlsCheck)
|
||||
)
|
||||
.buildComp();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package io.xpipe.app.util;
|
||||
|
||||
import io.xpipe.app.core.AppCertStore;
|
||||
import io.xpipe.app.ext.ProcModuleProvider;
|
||||
import io.xpipe.app.issue.ErrorEventFactory;
|
||||
import io.xpipe.app.prefs.AppPrefs;
|
||||
@@ -17,6 +18,7 @@ import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Value
|
||||
@Builder
|
||||
@@ -61,6 +63,19 @@ public class HttpProxy {
|
||||
// Use HTTP protocol as well here as most proxies still require that
|
||||
map.put("https_proxy", http);
|
||||
map.put("HTTPS_PROXY", http);
|
||||
|
||||
AppCertStore.getBundleFile().ifPresent(bundleFile -> {
|
||||
map.put("ssl_cert_file", bundleFile.toString());
|
||||
map.put("SSL_CERT_FILE", bundleFile.toString());
|
||||
});
|
||||
|
||||
var np = AppPrefs.get().noProxyList().getValue();
|
||||
if (np != null && !np.isEmpty()) {
|
||||
var val = np.lines().collect(Collectors.joining(","));
|
||||
map.put("no_proxy", val);
|
||||
map.put("NO_PROXY", val);
|
||||
}
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
@@ -249,6 +249,10 @@
|
||||
-fx-prompt-text-fill: -color-fg-subtle;
|
||||
}
|
||||
|
||||
.text-area:focused {
|
||||
-fx-prompt-text-fill: -color-fg-subtle;
|
||||
}
|
||||
|
||||
.agent-socket-choice:disabled .text-field {
|
||||
-fx-opacity: 1.0;
|
||||
}
|
||||
|
||||
Vendored
+1
@@ -121,6 +121,7 @@ The latest release of the [apple container runtime](https://github.com/apple/con
|
||||
- Serial connections now also support being assigned to abstract hosts
|
||||
- Add option to reinstall XPipe on Windows if an incremental update fails
|
||||
- The API endpoints for /connection/... have been renamed to /store/... and API parameter names have been changed from connection to store
|
||||
- There is now a setting for controlling NO_PROXY for a configured http proxy
|
||||
- Fix various rendering performance issues
|
||||
|
||||
## Important migration notice (Does not apply to PTB)
|
||||
|
||||
Generated
+4
-1
@@ -1366,7 +1366,10 @@ documentationDescription=Check out the documentation
|
||||
customEditorCommandInTerminal=Run custom command in a terminal
|
||||
customEditorCommandInTerminalDescription=If your editor is terminal-based, you can enable this option to automatically open a terminal and run the command in the terminal session instead.\n\nYou can use this option for editors like vi, vim, nvim, and others.
|
||||
disableHttpsTlsCheck=Disable HTTPS request certificate verification
|
||||
disableHttpsTlsCheckDescription=If your organization is decrypting your HTTPS traffic in firewalls using SSL interception, any update checks or license checks will fail due to the certificates not matching up. You can fix this by enabling this option and disabling TLS certificate validation.
|
||||
#force
|
||||
disableHttpsTlsCheckDescription=If your organization is decrypting your HTTPS traffic in firewalls using SSL interception, any HTTP requests will fail unless the certificates are trusted. You can enable this option and disable TLS certificate validation for testing if something does not work as expected with the custom certificates.
|
||||
noProxy=No proxy
|
||||
noProxyDescription=Do not use proxy server for addresses matching the following values
|
||||
connectionsSelected=$NUMBER$ connections selected
|
||||
addConnections=Add connections
|
||||
browseDirectory=Browse directory
|
||||
|
||||
Reference in New Issue
Block a user