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

revert： Let Current Waiting room become External Migration

Browse Source
This commit is contained in:
Roi Feng
2025-06-17 18:25:24 -04:00
parent 6abbb3a323
commit fff4327007
8 changed files with 52 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
internal/server/checker.go
View File

@ -25,7 +25,7 @@ func CheckMain(w http.ResponseWriter, userRequestData dataType.UserRequest, rule
checkFuncs = append(checkFuncs, check.URLBlockList)
checkFuncs = append(checkFuncs, check.VerifyBot)
checkFuncs = append(checkFuncs, check.HTTPFlood)
checkFuncs = append(checkFuncs, check.WaitingRoom)
checkFuncs = append(checkFuncs, check.ExternalMigration)
checkFuncs = append(checkFuncs, check.Captcha)
for _, checkFunc := range checkFuncs {
@ -107,35 +107,6 @@ func CheckMain(w http.ResponseWriter, userRequestData dataType.UserRequest, rule
return
}
} else if bytes.Compare(decision.HTTPCode, []byte("WAITING_ROOM")) == 0 {
tpl, err := template.ParseFiles(cfg.ErrorPage + "/waiting_room.html")
if err != nil {
utils.LogError(userRequestData, fmt.Sprintf("Error parsing template: %v", err), "CheckMain")
http.Error(w, "500 - Internal Server Error", http.StatusInternalServerError)
return
}
sessionID := string(decision.ResponseData)
data := struct {
EdgeTag string
ConnectIP string
Date string
}{
EdgeTag: cfg.NodeName,
ConnectIP: userRequestData.RemoteIP,
Date: time.Now().Format("2006-01-02 15:04:05"),
}
w.Header().Set("Set-Cookie", "__torii_session_id="+sessionID+"; Path=/; Max-Age=86400; Priority=High; HttpOnly;")
w.Header().Set("Content-Type", "text/html; charset=utf-8")
w.WriteHeader(http.StatusServiceUnavailable)
if err = tpl.Execute(w, data); err != nil {
utils.LogError(userRequestData, fmt.Sprintf("Error executing template: %v", err), "CheckMain")
http.Error(w, "500 - Internal Server Error", http.StatusInternalServerError)
return
}
} else {
//should never happen
utils.LogError(userRequestData, fmt.Sprintf("Error access in wrong state: %v", decision), "CheckMain")

118
internal/server/torii.go
View File

@ -2,7 +2,6 @@ package server
import (
"bytes"
"encoding/json"
"html/template"
"net/http"
"server_torii/internal/action"
@ -21,12 +20,6 @@ func CheckTorii(w http.ResponseWriter, r *http.Request, reqData dataType.UserReq
check.CheckCaptcha(r, reqData, ruleSet, decision)
} else if reqData.Uri == cfg.WebPath+"/health_check" {
decision.SetResponse(action.Done, []byte("200"), []byte("ok"))
} else if reqData.Uri == cfg.WebPath+"/waiting_room/status" {
handleWaitingRoomStatus(w, r, reqData, ruleSet, sharedMem)
return
} else if reqData.Uri == cfg.WebPath+"/waiting_room/join" {
handleWaitingRoomJoin(w, r, reqData, ruleSet, sharedMem)
return
}
if bytes.Compare(decision.HTTPCode, []byte("200")) == 0 {
if bytes.Compare(decision.ResponseData, []byte("ok")) == 0 {
@ -95,114 +88,3 @@ func CheckTorii(w http.ResponseWriter, r *http.Request, reqData dataType.UserReq
}
}
}
func handleWaitingRoomStatus(w http.ResponseWriter, r *http.Request, reqData dataType.UserRequest, ruleSet *config.RuleSet, sharedMem *dataType.SharedMemory) {
if !ruleSet.WaitingRoomRule.Enabled {
w.WriteHeader(http.StatusNotFound)
err := json.NewEncoder(w).Encode(map[string]interface{}{
"error": "Waiting room not enabled",
})
if err != nil {
return
}
return
}
sessionID := reqData.ToriiSessionID
clearance := reqData.ToriiClearance
userKey := check.GenerateUserKey(reqData)
secretKey := ruleSet.CAPTCHARule.SecretKey
// Check queue status using new core logic
inQueue, position, totalQueue, canEnter := sharedMem.WaitingRoom.GetQueueStatus(sessionID, clearance, userKey, secretKey)
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
err := json.NewEncoder(w).Encode(map[string]interface{}{
"inQueue": inQueue,
"position": position,
"totalQueue": totalQueue,
"canEnter": canEnter,
})
if err != nil {
return
}
}
func handleWaitingRoomJoin(w http.ResponseWriter, r *http.Request, reqData dataType.UserRequest, ruleSet *config.RuleSet, sharedMem *dataType.SharedMemory) {
if !ruleSet.WaitingRoomRule.Enabled {
w.WriteHeader(http.StatusNotFound)
err := json.NewEncoder(w).Encode(map[string]interface{}{
"error": "Waiting room not enabled",
})
if err != nil {
return
}
return
}
if r.Method != http.MethodPost {
w.WriteHeader(http.StatusMethodNotAllowed)
err := json.NewEncoder(w).Encode(map[string]interface{}{
"error": "Method not allowed",
})
if err != nil {
return
}
return
}
sessionID := reqData.ToriiSessionID
userKey := check.GenerateUserKey(reqData)
secretKey := ruleSet.CAPTCHARule.SecretKey
// Join queue using new core logic
success, positiveID, clearance, canEnter := sharedMem.WaitingRoom.JoinQueue(sessionID, userKey, secretKey)
if !success {
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusBadRequest)
err := json.NewEncoder(w).Encode(map[string]interface{}{
"success": false,
"message": "Invalid session or unable to join queue",
})
if err != nil {
return
}
return
}
if canEnter {
// User can enter directly
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
err := json.NewEncoder(w).Encode(map[string]interface{}{
"success": true,
"canEnter": true,
"message": "可以进入网站",
})
if err != nil {
return
}
return
}
// User is in queue, set clearance cookie and return position info
inQueue, position, totalQueue, _ := sharedMem.WaitingRoom.GetQueueStatus(sessionID, clearance, userKey, secretKey)
w.Header().Set("Set-Cookie", "__torii_clearance="+clearance+"; Path=/; Max-Age=86400; Priority=High; HttpOnly;")
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
err := json.NewEncoder(w).Encode(map[string]interface{}{
"success": true,
"canEnter": false,
"inQueue": inQueue,
"position": position,
"totalQueue": totalQueue,
"positiveID": positiveID,
"message": "已加入排队",
})
if err != nil {
return
}
}