diff --git a/src/mod/acme/acme.go b/src/mod/acme/acme.go index a8916e3..bcc3c84 100644 --- a/src/mod/acme/acme.go +++ b/src/mod/acme/acme.go @@ -144,7 +144,7 @@ func (a *ACMEHandler) ObtainCert(domains []string, certificateName string, email } else { // (caName == "" || caUrl == "") will use default acme config.CADirURL = a.DefaultAcmeServer - a.Logf("[INFO] Using Default ACME "+a.DefaultAcmeServer+" for CA Directory URL", nil) + a.Logf("Using Default ACME "+a.DefaultAcmeServer+" for CA Directory URL", nil) } } diff --git a/src/mod/acme/acmewizard/acmewizard.go b/src/mod/acme/acmewizard/acmewizard.go index fcdbb74..bd980bd 100644 --- a/src/mod/acme/acmewizard/acmewizard.go +++ b/src/mod/acme/acmewizard/acmewizard.go @@ -75,6 +75,15 @@ func HandleGuidedStepCheck(w http.ResponseWriter, r *http.Request) { httpServerReachable := isHTTPServerAvailable(domain) js, _ := json.Marshal(httpServerReachable) utils.SendJSONResponse(w, string(js)) + } else if stepNo == 10 { + //Resolve public Ip address for tour + publicIp, err := getPublicIPAddress() + if err != nil { + utils.SendErrorResponse(w, err.Error()) + return + } + js, _ := json.Marshal(publicIp) + utils.SendJSONResponse(w, string(js)) } else { utils.SendErrorResponse(w, "invalid step number") } diff --git a/src/mod/dynamicproxy/dpcore/dpcore.go b/src/mod/dynamicproxy/dpcore/dpcore.go index 6f870a2..862f3da 100644 --- a/src/mod/dynamicproxy/dpcore/dpcore.go +++ b/src/mod/dynamicproxy/dpcore/dpcore.go @@ -54,6 +54,9 @@ type ReverseProxy struct { Prepender string Verbal bool + + //Appended by Zoraxy project + } type ResponseRewriteRuleSet struct { diff --git a/src/web/components/httprp.html b/src/web/components/httprp.html index 5eebc2c..28007bb 100644 --- a/src/web/components/httprp.html +++ b/src/web/components/httprp.html @@ -348,6 +348,20 @@ `); }else if (datatype == "inbound"){ let originalContent = $(column).html(); + + //Check if this host is covered within one of the certificates. If not, show the icon + let domainIsCovered = true; + let domains = [payload.RootOrMatchingDomain]; //Domain for getting certificate if needed + for (var i = 0; i < payload.MatchingDomainAlias.length; i++){ + let thisAliasName = payload.MatchingDomainAlias[i]; + domains.push(thisAliasName); + } + if (true){ + domainIsCovered = false; + } + //encode the domain to DOM + let certificateDomains = encodeURIComponent(JSON.stringify(domains)); + column.empty().append(`${originalContent}
@@ -355,10 +369,11 @@

- - - + + + `); + $(".hostAccessRuleSelector").dropdown(); }else{ @@ -517,6 +532,15 @@ }) } + /* + Certificate Shortcut + */ + + function requestCertificateForExistingHost(hostUUID, RootAndAliasDomains){ + RootAndAliasDomains = JSON.parse(decodeURIComponent(RootAndAliasDomains)) + alert(RootAndAliasDomains.join(", ")) + } + //Bind on tab switch events tabSwitchEventBind["httprp"] = function(){ listProxyEndpoints(); diff --git a/src/web/components/quickstart.html b/src/web/components/quickstart.html new file mode 100644 index 0000000..273f97b --- /dev/null +++ b/src/web/components/quickstart.html @@ -0,0 +1,77 @@ + +
+
+

+ +
+ Welcome to Zoraxy! +
What services are you planning to setup today?
+
+

+
+
+
+
+
+

Basic Homepage

+
+
+

Host a static homepage with Zoraxy and point your domain name to your web server.

+ +
+ +
+
+
+
+
+
+

Sub-domains Routing

+
+
+

Add and handle traffic from your subdomains and point them to a dedicated web services somewhere else.

+ +
+ +
+
+
+
+
+
+

HTTPS Green Lock(s)

+
+
+

Turn your unsafe HTTP website into HTTPS using free certificate from public certificate authorities organizations.

+ +
+ +
+
+
+
+
+
+ +
+
+ +
+ + \ No newline at end of file diff --git a/src/web/components/rules.html b/src/web/components/rules.html index 2873660..5683c60 100644 --- a/src/web/components/rules.html +++ b/src/web/components/rules.html @@ -30,12 +30,12 @@

New Proxy Rule

You can add more proxy rules to support more site via domain / subdomains

-
+
Support subdomain and wildcard, e.g. s1.mydomain.com or *.test.mydomain.com. Use comma (,) for alias hostnames.
-
+
e.g. 192.168.0.101:8000 or example.com @@ -43,7 +43,7 @@ -
+
@@ -67,7 +67,7 @@ Security
-
+
@@ -154,7 +154,9 @@

- +
+ +


diff --git a/src/web/components/status.html b/src/web/components/status.html index e783ba6..a664cdd 100644 --- a/src/web/components/status.html +++ b/src/web/components/status.html @@ -53,8 +53,10 @@
- - +
+ + +

Network Status

Overall Network I/O in Current Host Server

diff --git a/src/web/components/webserv.html b/src/web/components/webserv.html index ccc073e..8d099b6 100644 --- a/src/web/components/webserv.html +++ b/src/web/components/webserv.html @@ -13,34 +13,35 @@
- -

Web Server Settings

-
-
-
- - +
+

Web Server Settings

+
+
+
+ + +
-
-
-
- - - If this folder do not contains any index files, list the directory of this folder. +
+
+ + + If this folder do not contains any index files, list the directory of this folder. +
+
+
+ + + + The web server root folder can only be changed via startup flags of zoraxy for security reasons. + See the -webserv flag for more details. + +
+
+ + + Use http://127.0.0.1:8081 in proxy rules to access the web server
-
-
- - - - The web server root folder can only be changed via startup flags of zoraxy for security reasons. - See the -webserv flag for more details. - -
-
- - - Use http://127.0.0.1:8081 in proxy rules to access the web server
Changes are saved automatically diff --git a/src/web/img/res/1F310.png b/src/web/img/res/1F310.png new file mode 100644 index 0000000..90d9271 Binary files /dev/null and b/src/web/img/res/1F310.png differ diff --git a/src/web/img/res/1F387.png b/src/web/img/res/1F387.png new file mode 100644 index 0000000..403c26d Binary files /dev/null and b/src/web/img/res/1F387.png differ diff --git a/src/web/img/res/1F38A.png b/src/web/img/res/1F38A.png new file mode 100644 index 0000000..1ecac56 Binary files /dev/null and b/src/web/img/res/1F38A.png differ diff --git a/src/web/img/res/1F44B.png b/src/web/img/res/1F44B.png new file mode 100644 index 0000000..c95f091 Binary files /dev/null and b/src/web/img/res/1F44B.png differ diff --git a/src/web/img/res/1F500.png b/src/web/img/res/1F500.png new file mode 100644 index 0000000..928d8b4 Binary files /dev/null and b/src/web/img/res/1F500.png differ diff --git a/src/web/img/res/1F512.png b/src/web/img/res/1F512.png new file mode 100644 index 0000000..5e33b8f Binary files /dev/null and b/src/web/img/res/1F512.png differ diff --git a/src/web/img/res/1F914.png b/src/web/img/res/1F914.png new file mode 100644 index 0000000..f42134a Binary files /dev/null and b/src/web/img/res/1F914.png differ diff --git a/src/web/img/res/2728.png b/src/web/img/res/2728.png new file mode 100644 index 0000000..dca06dd Binary files /dev/null and b/src/web/img/res/2728.png differ diff --git a/src/web/img/res/2753.png b/src/web/img/res/2753.png new file mode 100644 index 0000000..ba63102 Binary files /dev/null and b/src/web/img/res/2753.png differ diff --git a/src/web/img/res/E25E.png b/src/web/img/res/E25E.png new file mode 100644 index 0000000..d3017c5 Binary files /dev/null and b/src/web/img/res/E25E.png differ diff --git a/src/web/index.html b/src/web/index.html index 1ac34d7..c80e54e 100644 --- a/src/web/index.html +++ b/src/web/index.html @@ -36,6 +36,9 @@
+ +
+


@@ -171,6 +177,22 @@
Confirm Exit?
+ +
+

Welcome to Zoraxy Tour

+

This is a simplified tour to show some of what it can do. + Use your keyboard or click the next button to get going.

+
+
+
+

Steps 1 / 9

+
+
+
+ +
+ +