buyfakett/server_torii
1
0
Fork 0
mirror of https://github.com/Rayzggz/server_torii.git synced 2025-06-21 22:41:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix config

Browse Source
This commit is contained in:
buyfakett
2025-05-08 10:08:36 +08:00
parent 4a9afa8784
commit c69c5b5cd7
7 changed files with 122 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/server/checker.go
View File

@ -15,7 +15,7 @@ import (
type CheckFunc func(dataType.UserRequest, *config.RuleSet, *action.Decision, *dataType.SharedMemory)
func CheckMain(w http.ResponseWriter, userRequestData dataType.UserRequest, ruleSet *config.RuleSet, cfg *config.MainConfig, sharedMem *dataType.SharedMemory) {
func CheckMain(w http.ResponseWriter, userRequestData dataType.UserRequest, ruleSet *config.RuleSet, sharedMem *dataType.SharedMemory) {
decision := action.NewDecision()
checkFuncs := make([]CheckFunc, 0)
@ -42,7 +42,7 @@ func CheckMain(w http.ResponseWriter, userRequestData dataType.UserRequest, rule
return
}
} else if bytes.Compare(decision.HTTPCode, []byte("403")) == 0 {
tpl, err := template.ParseFiles(cfg.ErrorPage + "/403.html")
tpl, err := template.ParseFiles(config.Cfg.Server.ErrorPage + "/403.html")
if err != nil {
utils.LogError(userRequestData, fmt.Sprintf("Error parsing template: %v", err), "CheckMain")
http.Error(w, "500 - Internal Server Error", http.StatusInternalServerError)
@ -54,7 +54,7 @@ func CheckMain(w http.ResponseWriter, userRequestData dataType.UserRequest, rule
ConnectIP string
Date string
}{
EdgeTag: cfg.NodeName,
EdgeTag: config.Cfg.Server.NodeName,
ConnectIP: userRequestData.RemoteIP,
Date: time.Now().Format("2006-01-02 15:04:05"),
}
@ -67,7 +67,7 @@ func CheckMain(w http.ResponseWriter, userRequestData dataType.UserRequest, rule
}
} else if bytes.Compare(decision.HTTPCode, []byte("CAPTCHA")) == 0 {
tpl, err := template.ParseFiles(cfg.ErrorPage + "/CAPTCHA.html")
tpl, err := template.ParseFiles(config.Cfg.Server.ErrorPage + "/CAPTCHA.html")
if err != nil {
utils.LogError(userRequestData, fmt.Sprintf("Error parsing template: %v", err), "CheckMain")
http.Error(w, "500 - Internal Server Error", http.StatusInternalServerError)
@ -83,7 +83,7 @@ func CheckMain(w http.ResponseWriter, userRequestData dataType.UserRequest, rule
}
} else if bytes.Compare(decision.HTTPCode, []byte("429")) == 0 {
tpl, err := template.ParseFiles(cfg.ErrorPage + "/429.html")
tpl, err := template.ParseFiles(config.Cfg.Server.ErrorPage + "/429.html")
if err != nil {
utils.LogError(userRequestData, fmt.Sprintf("Error parsing template: %v", err), "CheckMain")
http.Error(w, "500 - Internal Server Error", http.StatusInternalServerError)
@ -94,7 +94,7 @@ func CheckMain(w http.ResponseWriter, userRequestData dataType.UserRequest, rule
ConnectIP string
Date string
}{
EdgeTag: cfg.NodeName,
EdgeTag: config.Cfg.Server.NodeName,
ConnectIP: userRequestData.RemoteIP,
Date: time.Now().Format("2006-01-02 15:04:05"),
}

40
internal/server/server.go
View File

@ -10,33 +10,33 @@ import (
)
// StartServer starts the HTTP server
func StartServer(cfg *config.MainConfig, ruleSet *config.RuleSet, sharedMem *dataType.SharedMemory) error {
func StartServer(ruleSet *config.RuleSet, sharedMem *dataType.SharedMemory) error {
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
userRequestData := processRequestData(cfg, r)
userRequestData := processRequestData(r)
if strings.HasPrefix(userRequestData.Uri, cfg.WebPath) {
CheckTorii(w, r, userRequestData, ruleSet, cfg, sharedMem)
if strings.HasPrefix(userRequestData.Uri, config.Cfg.Server.WebPath) {
CheckTorii(w, r, userRequestData, ruleSet, sharedMem)
} else {
CheckMain(w, userRequestData, ruleSet, cfg, sharedMem)
CheckMain(w, userRequestData, ruleSet, sharedMem)
}
})
log.Printf("HTTP Server listening on :%s ...", cfg.Port)
return http.ListenAndServe(":"+cfg.Port, nil)
log.Printf("HTTP Server listening on :%s ...", config.Cfg.Server.Port)
return http.ListenAndServe(":"+config.Cfg.Server.Port, nil)
}
func processRequestData(cfg *config.MainConfig, r *http.Request) dataType.UserRequest {
func processRequestData(r *http.Request) dataType.UserRequest {
userRequest := dataType.UserRequest{
RemoteIP: getClientIP(cfg, r),
Uri: getReqURI(cfg, r),
Captcha: getCaptchaStatus(cfg, r),
RemoteIP: getClientIP(r),
Uri: getReqURI(r),
Captcha: getCaptchaStatus(r),
ToriiClearance: getHeader(r, "__torii_clearance"),
ToriiSessionID: getHeader(r, "__torii_session_id"),
UserAgent: r.UserAgent(),
Host: getReqHost(cfg, r),
Host: getReqHost(r),
}
return userRequest
}
@ -49,9 +49,9 @@ func getHeader(r *http.Request, headerName string) string {
return cookie.Value
}
func getCaptchaStatus(cfg *config.MainConfig, r *http.Request) bool {
func getCaptchaStatus(r *http.Request) bool {
captchaStatus := false
for _, headerName := range cfg.ConnectingCaptchaStatusHeaders {
for _, headerName := range config.Cfg.Server.ConnectingCaptchaStatusHeaders {
if captchaVal := r.Header.Get(headerName); captchaVal != "" {
if captchaVal == "on" {
captchaStatus = true
@ -63,9 +63,9 @@ func getCaptchaStatus(cfg *config.MainConfig, r *http.Request) bool {
}
func getReqURI(cfg *config.MainConfig, r *http.Request) string {
func getReqURI(r *http.Request) string {
var clientURI string
for _, headerName := range cfg.ConnectingURIHeaders {
for _, headerName := range config.Cfg.Server.ConnectingURIHeaders {
if uriVal := r.Header.Get(headerName); uriVal != "" {
clientURI = uriVal
break
@ -77,9 +77,9 @@ func getReqURI(cfg *config.MainConfig, r *http.Request) string {
return clientURI
}
func getClientIP(cfg *config.MainConfig, r *http.Request) string {
func getClientIP(r *http.Request) string {
var clientIP string
for _, headerName := range cfg.ConnectingIPHeaders {
for _, headerName := range config.Cfg.Server.ConnectingIPHeaders {
if ipVal := r.Header.Get(headerName); ipVal != "" {
if strings.Contains(clientIP, ",") {
parts := strings.Split(ipVal, ",")
@ -102,9 +102,9 @@ func getClientIP(cfg *config.MainConfig, r *http.Request) string {
return clientIP
}
func getReqHost(cfg *config.MainConfig, r *http.Request) string {
func getReqHost(r *http.Request) string {
var clientHost = ""
for _, headerName := range cfg.ConnectingHostHeaders {
for _, headerName := range config.Cfg.Server.ConnectingHostHeaders {
if hostVal := r.Header.Get(headerName); hostVal != "" {
clientHost = hostVal
break

10
internal/server/torii.go
View File

@ -12,13 +12,13 @@ import (
"time"
)
func CheckTorii(w http.ResponseWriter, r *http.Request, reqData dataType.UserRequest, ruleSet *config.RuleSet, cfg *config.MainConfig, sharedMem *dataType.SharedMemory) {
func CheckTorii(w http.ResponseWriter, r *http.Request, reqData dataType.UserRequest, ruleSet *config.RuleSet, sharedMem *dataType.SharedMemory) {
decision := action.NewDecision()
decision.SetCode(action.Continue, []byte("403"))
if reqData.Uri == cfg.WebPath+"/captcha" {
if reqData.Uri == config.Cfg.Server.WebPath+"/captcha" {
check.CheckCaptcha(r, reqData, ruleSet, decision)
} else if reqData.Uri == cfg.WebPath+"/health_check" {
} else if reqData.Uri == config.Cfg.Server.WebPath+"/health_check" {
decision.SetResponse(action.Done, []byte("200"), []byte("ok"))
}
if bytes.Compare(decision.HTTPCode, []byte("200")) == 0 {
@ -65,7 +65,7 @@ func CheckTorii(w http.ResponseWriter, r *http.Request, reqData dataType.UserReq
}
}
} else {
tpl, err := template.ParseFiles(cfg.ErrorPage + "/403.html")
tpl, err := template.ParseFiles(config.Cfg.Server.ErrorPage + "/403.html")
if err != nil {
http.Error(w, "500 - Internal Server Error", http.StatusInternalServerError)
return
@ -76,7 +76,7 @@ func CheckTorii(w http.ResponseWriter, r *http.Request, reqData dataType.UserReq
ConnectIP string
Date string
}{
EdgeTag: cfg.NodeName,
EdgeTag: config.Cfg.Server.NodeName,
ConnectIP: reqData.RemoteIP,
Date: time.Now().Format("2006-01-02 15:04:05"),
}