diff --git a/.gitignore b/.gitignore
index 26006a7..6e386d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,9 @@ docker/ImagePublisher.sh
src/mod/acme/test/stackoverflow.pem
/tools/dns_challenge_update/code-gen/acmedns
/tools/dns_challenge_update/code-gen/lego
+src/tmp/localhost.key
+src/tmp/localhost.pem
+src/www/html/index.html
+src/sys.uuid
+src/zoraxy
+src/log/
\ No newline at end of file
diff --git a/README.md b/README.md
index f95724a..125b650 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,8 @@ See the [/docker](https://github.com/tobychui/zoraxy/tree/main/docker) folder fo
Usage of zoraxy:
-autorenew int
ACME auto TLS/SSL certificate renew check interval (seconds) (default 86400)
+ -docker
+ Run Zoraxy in docker compatibility mode
-fastgeoip
Enable high speed geoip lookup, require 1GB extra memory (Not recommend for low end devices)
-log
@@ -188,4 +190,3 @@ If you like the project and want to support us, please consider a donation. You
This project is open-sourced under AGPL. I open-sourced this project so everyone can check for security issues and benefit all users. **This software is intended to be free of charge. If you have acquired this software from a third-party seller, the authors of this repository bears no responsibility for any technical difficulties assistance or support.**
-
diff --git a/example/README.md b/example/README.md
index a14ee27..80d232e 100644
--- a/example/README.md
+++ b/example/README.md
@@ -15,4 +15,12 @@ The templates folder contains the template for overriding the build in error or
To use the template, copy and paste the `wwww` folder to the same directory as zoraxy executable (aka the src/ file if you `go build` with the current folder tree).
+
+
+### Other Templates
+
+There are a few pre-built templates that works with Zoraxy where you can find in the `other-templates` folder. Copy the folder into `www` and rename the folder to `templates` to active them.
+
+
+
It is worth mentioning that the uwu icons for not-found and access-denied are created by @SAWARATSUKI
diff --git a/example/other-templates/templates_cf/blacklist.html b/example/other-templates/templates_cf/blacklist.html
new file mode 100644
index 0000000..3381b28
--- /dev/null
+++ b/example/other-templates/templates_cf/blacklist.html
@@ -0,0 +1,185 @@
+
+ Access denied | website used Zoraxy to restrict access
+
+
Please enable cookies.
+
+
+
+
+
+
+
+
+
What happened?
+
The owner of this website has banned your IP address (
+
+
+
+
+
+
+
+
+
+
+
404 - Host Not Found
+
+
+
+
+
+
+
Error 404
+
Target Host Not Found
+
+
+
+
+
+
+
+
+
+
You
+
+
Working
+
+
+
+
+
+
+
+
Gateway Node
+
+
Working
+
+
+
+
+
+
+
+
+
Not Found
+
+
+
+
+
+
+
+
+
What happend?
+
The reverse proxy target domain is not found.
+
+
+
What can I do?
+
If you are a visitor of this website:
+
Please try again in a few minutes
+
If you are the owner of this website:
+
+
Check if the proxy rules that match this hostname exists
+
Visit the Reverse Proxy management interface to correct any setting errors
+
+
+
+
+
+
+
+ Access denied | website used Zoraxy to restrict access
+
+
Please enable cookies.
+
+
+
+
+
+
+
+
+
What happened?
+
Your IP address (
+
+
+
+
+
+
+
+
+
+
+
Access Denied (｡ŏ_ŏ)
+
+
+
Oh nyo, uwu have bewn bwackwisted! (｡ŏ_ŏ)
+
Not Found Σ(*ﾟдﾟﾉ)ﾉ
+
+
+
The page uwu awe wooking fow does nowt exists own thiws sewvew Σ(*ﾟдﾟﾉ)ﾉ
+
Not Whitelisted (´・ω・`)
+
+
+
Oh nyo, youw ip iws nowt incwuded in the whitewist of thiws website (´・ω・`)
+
Host
Destination
Virtual Directory
- Basic Auth
+ Advanced Settings
Actions
@@ -78,7 +78,7 @@
vdList += ``;
if (subd.VirtualDirectories.length == 0){
- vdList = `No Virtual Directory `;
}
let enableChecked = "checked";
@@ -104,8 +104,11 @@
${subd.Domain} ${tlsIcon}
${vdList}
-
- ${subd.RequireBasicAuth?`
+ ${subd.RequireBasicAuth?`No Special Settings `:""}
@@ -243,9 +246,9 @@
input = `
-
-
+
`;
column.empty().append(input);
}else if (datatype == "vdir"){
@@ -263,11 +267,11 @@
Edit Virtual Directories
`);
- }else if (datatype == "basicauth"){
+ }else if (datatype == "advanced"){
let requireBasicAuth = payload.RequireBasicAuth;
- let checkstate = "";
+ let basicAuthCheckstate = "";
if (requireBasicAuth){
- checkstate = "checked";
+ basicAuthCheckstate = "checked";
}
let skipWebSocketOriginCheck = payload.SkipWebSocketOriginCheck;
@@ -276,16 +280,35 @@
wsCheckstate = "checked";
}
+ let requireRateLimit = payload.RequireRateLimit;
+ let rateLimitCheckState = "";
+ if (requireRateLimit){
+ rateLimitCheckState = "checked";
+ }
+ let rateLimit = payload.RateLimit;
+ if (rateLimit == 0){
+ //This value is not set. Make it default to 100
+ rateLimit = 100;
+ }
+ let rateLimitDisableState = "";
+ if (!payload.RequireRateLimit){
+ rateLimitDisableState = "disabled";
+ }
+
column.empty().append(`
- Require Basic Auth
-
+
+
+
+
+
@@ -294,13 +317,34 @@
Check this to allow cross-origin websocket requests
-
-
+
+ Require Rate LimitCheck this to enable rate limit on this inbound hostname
+
+
+
+ req / sec / IP
+
+
`);
+ } else if (datatype == "ratelimit"){
+
+ column.empty().append(`
+
+ Require Rate Limit
+
+
+
+ `);
+
}else if (datatype == 'action'){
column.empty().append(`
@@ -331,6 +375,17 @@
$("#httpProxyList").find(".editBtn").addClass("disabled");
}
+ //handleToggleRateLimitInput will get trigger if the "require rate limit" checkbox
+ // is changed and toggle the disable state of the rate limit input field
+ function handleToggleRateLimitInput(){
+ let isRateLimitEnabled = $("#httpProxyList input.RequireRateLimit")[0].checked;
+ if (isRateLimitEnabled){
+ $("#httpProxyList input.RateLimit").parent().removeClass("disabled");
+ }else{
+ $("#httpProxyList input.RateLimit").parent().addClass("disabled");
+ }
+ }
+
function exitProxyInlineEdit(){
listProxyEndpoints();
$("#httpProxyList").find(".editBtn").removeClass("disabled");
@@ -348,6 +403,8 @@
let requireTLS = $(row).find(".RequireTLS")[0].checked;
let skipCertValidations = $(row).find(".SkipCertValidations")[0].checked;
let requireBasicAuth = $(row).find(".RequireBasicAuth")[0].checked;
+ let requireRateLimit = $(row).find(".RequireRateLimit")[0].checked;
+ let rateLimit = $(row).find(".RateLimit").val();
let bypassGlobalTLS = $(row).find(".BypassGlobalTLS")[0].checked;
let bypassWebsocketOrigin = $(row).find(".SkipWebSocketOriginCheck")[0].checked;
console.log(newDomain, requireTLS, skipCertValidations, requireBasicAuth)
@@ -364,6 +421,8 @@
"tlsval": skipCertValidations,
"bpwsorg" : bypassWebsocketOrigin,
"bauth" :requireBasicAuth,
+ "rate" :requireRateLimit,
+ "ratenum" :rateLimit,
},
success: function(data){
if (data.error !== undefined){
@@ -375,6 +434,21 @@
}
})
}
+
+ //Clearn the proxy target value, make sure user do not enter http:// or https://
+ //and auto select TLS checkbox if https:// exists
+ function cleanProxyTargetValue(input){
+ let targetDomain = $(input).val().trim();
+ if (targetDomain.startsWith("http://")){
+ targetDomain = targetDomain.substr(7);
+ $(input).val(targetDomain);
+ $("#httpProxyList input.RequireTLS").parent().checkbox("set unchecked");
+ }else if (targetDomain.startsWith("https://")){
+ targetDomain = targetDomain.substr(8);
+ $(input).val(targetDomain);
+ $("#httpProxyList input.RequireTLS").parent().checkbox("set checked");
+ }
+ }
/* button events */
function editBasicAuthCredentials(uuid){
@@ -406,6 +480,7 @@
$("#vdirBaseRoutingRule").parent().dropdown("set selected", uuid);
}
+ //Open the custom header editor
function editCustomHeaders(uuid){
let payload = encodeURIComponent(JSON.stringify({
ept: "host",
@@ -414,6 +489,15 @@
showSideWrapper("snippet/customHeaders.html?t=" + Date.now() + "#" + payload);
}
+ //Open the load balance option
+ function editLoadBalanceOptions(uuid){
+ let payload = encodeURIComponent(JSON.stringify({
+ ept: "host",
+ ep: uuid
+ }));
+ showSideWrapper("snippet/loadBalancer.html?t=" + Date.now() + "#" + payload);
+ }
+
function handleProxyRuleToggle(object){
let endpointUUID = $(object).attr("eptuuid");
let isChecked = object.checked;
@@ -438,10 +522,6 @@
})
}
- /* Access List handling */
-
-
-
//Bind on tab switch events
tabSwitchEventBind["httprp"] = function(){
listProxyEndpoints();
diff --git a/src/web/components/rules.html b/src/web/components/rules.html
index 6a4faad..e42c261 100644
--- a/src/web/components/rules.html
+++ b/src/web/components/rules.html
@@ -26,9 +26,12 @@
Target IP Address or Domain Name with port
- E.g. 192.168.0.101:8000 or example.com
+
+
+
+
+ Require Rate LimitThis proxy endpoint will be rate limited.
+
+
+
+
Rate Limit
+
+
Return a 429 error code if request rate exceed the rate limit.
+
-
+
Use TLS to serve proxy request
diff --git a/src/web/components/streamprox.html b/src/web/components/streamprox.html
index 7b100fa..76be84f 100644
--- a/src/web/components/streamprox.html
+++ b/src/web/components/streamprox.html
@@ -123,6 +123,7 @@
$('#streamProxyForm input, #streamProxyForm select').val('');
$('#streamProxyForm select').dropdown('clear');
$("#streamProxyForm input[name=timeout]").val(10);
+ $("#streamProxyForm .toggle.checkbox").checkbox("set unchecked");
}
function cancelStreamProxyEdit(event=undefined) {
@@ -305,6 +306,7 @@
}
initProxyConfigList();
cancelStreamProxyEdit();
+ clearStreamProxyAddEditForm();
},
error: function() {
diff --git a/src/web/hosterror.html b/src/web/hosterror.html
index 5bbc367..0325ac0 100644
--- a/src/web/hosterror.html
+++ b/src/web/hosterror.html
@@ -14,7 +14,7 @@
404 - Host Not Found
diff --git a/src/web/snippet/customHeaders.html b/src/web/snippet/customHeaders.html
index 6e07c78..450243d 100644
--- a/src/web/snippet/customHeaders.html
+++ b/src/web/snippet/customHeaders.html
@@ -5,6 +5,22 @@
-
You can define custom headers to be sent
- together with the client request to the backend server in
- this reverse proxy endpoint / host.
-
-
-
-
- Key
- Value
- Remove
-
-
-
-
-
Edit Custom Header
-
Add or remove custom header(s) over this proxy target
-
-
-
-
Zoraxy
-
Client
+
+
+
+
+
+ Key
+ Value
+ Remove
+
+
+
+
+
+
+
Edit Custom Header
+
Add or remove custom header(s) over this proxy target
+
+
+
+ Zoraxy
+ Client
+
+
+
+
+
+
+ Header Key
+
+ The header key is NOT case sensitive
+
+
+ Header Value
+
+
+
+
+
-
-
-
-
-
- Header Key
-
- The header key is NOT case sensitive
-
-
- Header Value
-
-
-
-
-
-
+
+
HTTP Strict Transport Security
+
Force future attempts to access this site to only use HTTPS
+
+ Enable HSTSHSTS header will be automatically ignored if the site is accessed using HTTP
+
+
+
Permission Policy
+
Explicitly declare what functionality can and cannot be used on this website.
+
+ Enable Permission PolicyEnable Permission-Policy header with all allowed state.
+
+
+
+
+ Feature
+ Enabled
+ Allow All (*)
+ Self Only (self)
+
+
+
+
+
+
+
+
+
+
+
+
Close
@@ -70,6 +127,9 @@
+ 
+