diff --git a/.gitignore b/.gitignore index 7938566..900a83e 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ www/html/index.html /src/dist /src/plugins +.DS_Store diff --git a/src/mod/sshprox/embed_darwin_amd64.go b/src/mod/sshprox/embed_darwin_amd64.go new file mode 100644 index 0000000..7348ea1 --- /dev/null +++ b/src/mod/sshprox/embed_darwin_amd64.go @@ -0,0 +1,18 @@ +//go:build darwin && amd64 +// +build darwin,amd64 + +package sshprox + +import "embed" + +/* +Binary embedding for AMD64 builds + +Make sure when compile, gotty binary exists in static.gotty +*/ +var ( + //go:embed gotty/gotty_darwin_amd64 + //go:embed gotty/.gotty + //go:embed gotty/LICENSE + gotty embed.FS +) diff --git a/src/mod/sshprox/gotty/gotty_darwin_amd64 b/src/mod/sshprox/gotty/gotty_darwin_amd64 new file mode 100755 index 0000000..44df0dd Binary files /dev/null and b/src/mod/sshprox/gotty/gotty_darwin_amd64 differ diff --git a/src/web/components/httprp.html b/src/web/components/httprp.html index 92544d6..4be1b3b 100644 --- a/src/web/components/httprp.html +++ b/src/web/components/httprp.html @@ -1426,11 +1426,17 @@ /* ------------ TLS ------------ */ updateTlsResolveList(uuid); - 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); - + if (subd.TlsOptions != null){ + //Use the saved settings + 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{ + //Default settings + editor.find(".Tls_EnableSNI").prop("checked", true); + editor.find(".Tls_EnableLegacyCertificateMatching").prop("checked", false); + editor.find(".Tls_EnableAutoHTTPS").prop("checked", false); + } editor.find(".Tls_EnableSNI").off("change").on("change", function() { saveTlsConfigs(uuid); }); diff --git a/src/web/snippet/logview.html b/src/web/snippet/logview.html index 3dfb814..1800704 100644 --- a/src/web/snippet/logview.html +++ b/src/web/snippet/logview.html @@ -116,7 +116,6 @@ } -
@@ -139,7 +138,6 @@