Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
TC
/
Zoraxy
-ын хуулбар https://git.hkwtc.org/TC/ReverseProxy
1
0
Салаа 0
Файлууд Асуудлууд 0 Мэдлэгийн сан
Эх сурвалжийг харах

auto update script executed

tobychui 1 жил өмнө
parent
5e654b27fa
commit
2751fd3ea6
7 өөрчлөгдсөн 88 нэмэгдсэн , 5 устгасан
Өөрчлөллтийг нэгтгэж харах Өөрчлөлтийн статистик харах
  1. 5 4
      mod/dynamicproxy/Server.go
  2. 55 0
      mod/dynamicproxy/templates/forbidden.html
  3. 10 0
      mod/dynamicproxy/typedef.go
  4. 1 1
      mod/webserv/webserv.go
  5. 1 0
      reverseproxy.go
  6. 8 0
      www/templates/blacklist.html
  7. 8 0
      www/templates/whitelist.html

+ 5 - 4
mod/dynamicproxy/Server.go
Файл харах 

@@ -7,6 +7,7 @@ import (
 
 	"net/http"

 	"net/http"

 	"net/url"

 	"net/url"

 	"os"

 	"os"

+	"path/filepath"

 	"strings"

 	"strings"

 

 

 	"imuslab.com/zoraxy/mod/geodb"

 	"imuslab.com/zoraxy/mod/geodb"

@@ -192,9 +193,9 @@ func (h *ProxyHandler) handleAccessRouting(w http.ResponseWriter, r *http.Reques
 
 	if h.Parent.Option.GeodbStore.IsBlacklisted(clientIpAddr) {

 	if h.Parent.Option.GeodbStore.IsBlacklisted(clientIpAddr) {

 		w.Header().Set("Content-Type", "text/html; charset=utf-8")

 		w.Header().Set("Content-Type", "text/html; charset=utf-8")

 		w.WriteHeader(http.StatusForbidden)

 		w.WriteHeader(http.StatusForbidden)

-		template, err := os.ReadFile("./web/forbidden.html")

+		template, err := os.ReadFile(filepath.Join(h.Parent.Option.WebDirectory, "templates/blacklist.html"))

 		if err != nil {

 		if err != nil {

-			w.Write([]byte("403 - Forbidden"))

+			w.Write(page_forbidden)

 		} else {

 		} else {

 			w.Write(template)

 			w.Write(template)

 		}

 		}

@@ -206,9 +207,9 @@ func (h *ProxyHandler) handleAccessRouting(w http.ResponseWriter, r *http.Reques
 
 	if !h.Parent.Option.GeodbStore.IsWhitelisted(clientIpAddr) {

 	if !h.Parent.Option.GeodbStore.IsWhitelisted(clientIpAddr) {

 		w.Header().Set("Content-Type", "text/html; charset=utf-8")

 		w.Header().Set("Content-Type", "text/html; charset=utf-8")

 		w.WriteHeader(http.StatusForbidden)

 		w.WriteHeader(http.StatusForbidden)

-		template, err := os.ReadFile("./web/forbidden.html")

+		template, err := os.ReadFile(filepath.Join(h.Parent.Option.WebDirectory, "templates/whitelist.html"))

 		if err != nil {

 		if err != nil {

-			w.Write([]byte("403 - Forbidden"))

+			w.Write(page_forbidden)

 		} else {

 		} else {

 			w.Write(template)

 			w.Write(template)

 		}

 		}

+ 55 - 0
mod/dynamicproxy/templates/forbidden.html
Файл харах 

@@ -0,0 +1,55 @@
 
+<html>
 
+    <head>
 
+        <!-- Zoraxy Forbidden Template -->
 
+        <meta charset="UTF-8">
 
+        <meta name="viewport" content="width=device-width, initial-scale=1.0 user-scalable=no">
 
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.5.0/semantic.min.css">
 
+        <script type="text/javascript" src="https://code.jquery.com/jquery-3.6.4.min.js"></script>
 
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.5.0/semantic.min.js"></script>
 
+        <title>Forbidden</title>
 
+        <style>
 
+            #msg{
 
+                position: absolute;
 
+                top: calc(50% - 150px);
 
+                left: calc(50% - 250px);
 
+                width: 500px;
 
+                height: 300px;
 
+                text-align: center;
 
+            }
 
+
 
+            #footer{
 
+                position: fixed;
 
+                padding: 2em;
 
+                padding-left: 5em;
 
+                padding-right: 5em;
 
+                bottom: 0px;
 
+                left: 0px;
 
+                width: 100%;
 
+            }   
+
 
+            small{
 
+                word-break: break-word;
 
+            }
 
+        </style>
 
+    </head>
 
+    <body>
 
+        <div id="msg">
 
+            <h1 style="font-size: 6em; margin-bottom: 0px;"><i class="red ban icon"></i></h1>
 
+            <div>
 
+                <h3 style="margin-top: 1em;">403 - Forbidden</h3>
 
+                <div class="ui divider"></div>
 
+                <p>You do not have permission to view this directory or page. <br>
 
+                    This might cause by the region limit setting of this site.</p>
 
+                <div class="ui divider"></div>
 
+                <div style="text-align: left;">
 
+                    <small>Request time: <span id="reqtime"></span></small><br>
 
+                    <small id="reqURLDisplay">Request URI: <span id="requrl"></span></small>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <script>
 
+            $("#reqtime").text(new Date().toLocaleString(undefined, {year: 'numeric', month: '2-digit', day: '2-digit', weekday:"long", hour: '2-digit', hour12: false, minute:'2-digit', second:'2-digit'}));
 
+            $("#requrl").text(window.location.href);
 
+        </script>
 
+    </body>
 
+</html>

+ 10 - 0
mod/dynamicproxy/typedef.go
Файл харах 

@@ -1,6 +1,7 @@
 
 package dynamicproxy

 package dynamicproxy

 

 

 import (

 import (

+	_ "embed"

 	"net"

 	"net"

 	"net/http"

 	"net/http"

 	"sync"

 	"sync"

@@ -31,6 +32,7 @@ type RouterOption struct {
 
 	RedirectRuleTable  *redirection.RuleTable

 	RedirectRuleTable  *redirection.RuleTable

 	GeodbStore         *geodb.Store //GeoIP blacklist and whitelist

 	GeodbStore         *geodb.Store //GeoIP blacklist and whitelist

 	StatisticCollector *statistic.Collector

 	StatisticCollector *statistic.Collector

+	WebDirectory       string //The static web server directory containing the templates folder

 }

 }

 

 

 type Router struct {

 type Router struct {

@@ -123,3 +125,11 @@ type SubdOptions struct {
 
 	BasicAuthCredentials    []*BasicAuthCredentials

 	BasicAuthCredentials    []*BasicAuthCredentials

 	BasicAuthExceptionRules []*BasicAuthExceptionRule

 	BasicAuthExceptionRules []*BasicAuthExceptionRule

 }

 }

+

+/*

+Web Templates

+*/

+var (

+	//go:embed templates/forbidden.html

+	page_forbidden []byte

+)

+ 1 - 1
mod/webserv/webserv.go
Файл харах 

@@ -40,7 +40,7 @@ type WebServer struct {
 
 // NewWebServer creates a new WebServer instance.
 
 // NewWebServer creates a new WebServer instance.
 
 func NewWebServer(options *WebServerOptions) *WebServer {
 
 func NewWebServer(options *WebServerOptions) *WebServer {
 
 	if !utils.FileExists(options.WebRoot) {
 
 	if !utils.FileExists(options.WebRoot) {
 
-		//Web root folder not exists. Create one
 
+		//Web root folder not exists. Create one with default templates
 
 		os.MkdirAll(filepath.Join(options.WebRoot, "html"), 0775)
 
 		os.MkdirAll(filepath.Join(options.WebRoot, "html"), 0775)
 
 		os.MkdirAll(filepath.Join(options.WebRoot, "templates"), 0775)
 
 		os.MkdirAll(filepath.Join(options.WebRoot, "templates"), 0775)
 
 		indexTemplate, err := templates.ReadFile("templates/index.html")
 
 		indexTemplate, err := templates.ReadFile("templates/index.html")

+ 1 - 0
reverseproxy.go
Файл харах 

@@ -64,6 +64,7 @@ func ReverseProxtInit() {
 
 		RedirectRuleTable:  redirectTable,
 
 		RedirectRuleTable:  redirectTable,
 
 		GeodbStore:         geodbStore,
 
 		GeodbStore:         geodbStore,
 
 		StatisticCollector: statisticCollector,
 
 		StatisticCollector: statisticCollector,
 
+		WebDirectory:       *staticWebServerRoot,
 
 	})
 
 	})
 
 	if err != nil {
 
 	if err != nil {
 
 		log.Println(err.Error())
 
 		log.Println(err.Error())

+ 8 - 0
www/templates/blacklist.html
Файл харах 

@@ -0,0 +1,8 @@
 
+<html>
 
+    <head>
 
+        <title>Oops</title>
 
+    </head>
 
+    <body>
 
+        <h1>Your IP have been blacklisted</h1>
 
+    </body>
 
+</html>

+ 8 - 0
www/templates/whitelist.html
Файл харах 

@@ -0,0 +1,8 @@
 
+<html>
 
+    <head>
 
+        <title>Oops</title>
 
+    </head>
 
+    <body>
 
+        <h1>Your IP is not whitelisted on this site</h1>
 
+    </body>
 
+</html>