4 Commits

Author SHA1 Message Date
Toby Chui
0f621d0edd Merge pull request #759 from AnthonyMichaelTDM/issue-758
fix(issue 758): Handle existing symlink in start_zerotier function
2025-07-22 07:10:01 +08:00
Toby Chui
9230f9374d Added null check on front-end
- Added null check on TlsOption on front-end
2025-07-21 20:10:55 +08:00
Anthony Rubick
c982541a40 fix(issue 758): Handle existing symlink in start_zerotier function
Closes Zoraxy 3.2.5 don't start in the docker container
Fixes #758
2025-07-20 23:39:34 -07:00
Toby Chui
6493a82e5f Fixed #756
- Added missing TLS config on new http proxy creation
2025-07-21 07:21:55 +08:00
4 changed files with 18 additions and 6 deletions

1
.gitignore vendored
View File

@@ -61,3 +61,4 @@ www/html/index.html
*.exe
/src/dist
/src/plugins

View File

@@ -73,7 +73,10 @@ def start_zerotier():
os.makedirs(config_dir, exist_ok=True)
try:
os.symlink(config_dir, zt_path, target_is_directory=True)
except FileExistsError:
print(f"Symlink {zt_path} already exists, skipping creation.")
zerotier_proc = popen(["zerotier-one"])

View File

@@ -389,6 +389,8 @@ func ReverseProxyHandleAddEndpoint(w http.ResponseWriter, r *http.Request) {
//TLS
BypassGlobalTLS: useBypassGlobalTLS,
AccessFilterUUID: accessRuleID,
TlsOptions: tlscert.GetDefaultHostSpecificTlsBehavior(),
//VDir
VirtualDirectories: []*dynamicproxy.VirtualDirectoryEndpoint{},
//Custom headers

View File

@@ -1423,10 +1423,16 @@
/* ------------ TLS ------------ */
updateTlsResolveList(uuid);
if (subd.TlsOptions){
editor.find(".Tls_EnableSNI").prop("checked", !subd.TlsOptions.DisableSNI);
editor.find(".Tls_EnableLegacyCertificateMatching").prop("checked", !subd.TlsOptions.DisableLegacyCertificateMatching);
editor.find(".Tls_EnableAutoHTTPS").prop("checked", !!subd.TlsOptions.EnableAutoHTTPS);
}else{
//Use default options
editor.find(".Tls_EnableSNI").prop("checked", true);
editor.find(".Tls_EnableLegacyCertificateMatching").prop("checked", true);
editor.find(".Tls_EnableAutoHTTPS").prop("checked", false);
}
editor.find(".Tls_EnableSNI").off("change").on("change", function() {
saveTlsConfigs(uuid);