marcel/zoraxy
1
0
Fork 0
mirror of https://github.com/tobychui/zoraxy.git synced 2025-06-03 06:07:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

#550

Browse Source 
- Instead of clearing the Zoraxy cookie on the client side, set the Zoraxy session in the server side to an empty value instead
This commit is contained in:
Toby Chui 2025-02-19 21:38:27 +08:00
parent 1116b643b5
commit 394cf50e1d
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/mod/dynamicproxy/loadbalance/originPicker.go
View File

@ -13,6 +13,10 @@ import (
by this request. by this request.
*/ */
const (
STICKY_SESSION_NAME = "zr_sticky_session"
)
// GetRequestUpstreamTarget return the upstream target where this // GetRequestUpstreamTarget return the upstream target where this
// request should be routed // request should be routed
func (m *RouteManager) GetRequestUpstreamTarget(w http.ResponseWriter, r *http.Request, origins []*Upstream, useStickySession bool) (*Upstream, error) { func (m *RouteManager) GetRequestUpstreamTarget(w http.ResponseWriter, r *http.Request, origins []*Upstream, useStickySession bool) (*Upstream, error) {
@ -50,7 +54,7 @@ func (m *RouteManager) GetRequestUpstreamTarget(w http.ResponseWriter, r *http.R
return origins[targetOriginId], nil return origins[targetOriginId], nil
} }
//No sticky session, get a random origin //No sticky session, get a random origin
m.clearSessionHandler(w, r) //Clear the session m.clearSessionHandler(w, r)
//Filter the offline origins //Filter the offline origins
origins = m.FilterOfflineOrigins(origins) origins = m.FilterOfflineOrigins(origins)
@ -78,7 +82,7 @@ func (m *RouteManager) GetUsableUpstreamCounts(origins []*Upstream) int {
/* Features related to session access */ /* Features related to session access */
//Set a new origin for this connection by session //Set a new origin for this connection by session
func (m *RouteManager) setSessionHandler(w http.ResponseWriter, r *http.Request, originIpOrDomain string, index int) error { func (m *RouteManager) setSessionHandler(w http.ResponseWriter, r *http.Request, originIpOrDomain string, index int) error {
session, err := m.SessionStore.Get(r, "STICKYSESSION") session, err := m.SessionStore.Get(r, STICKY_SESSION_NAME)
if err != nil { if err != nil {
return err return err
} }
@ -93,13 +97,15 @@ func (m *RouteManager) setSessionHandler(w http.ResponseWriter, r *http.Request,
return nil return nil
} }
// Clear the zoraxy only session values
func (m *RouteManager) clearSessionHandler(w http.ResponseWriter, r *http.Request) error { func (m *RouteManager) clearSessionHandler(w http.ResponseWriter, r *http.Request) error {
session, err := m.SessionStore.Get(r, "STICKYSESSION") session, err := m.SessionStore.Get(r, STICKY_SESSION_NAME)
if err != nil { if err != nil {
return err return err
} }
session.Options.MaxAge = -1
session.Options.Path = "/" session.Values["zr_sid_origin"] = ""
session.Values["zr_sid_index"] = -1
err = session.Save(r, w) err = session.Save(r, w)
if err != nil { if err != nil {
return err return err
@ -110,7 +116,7 @@ func (m *RouteManager) clearSessionHandler(w http.ResponseWriter, r *http.Reques
// Get the previous connected origin from session // Get the previous connected origin from session
func (m *RouteManager) getSessionHandler(r *http.Request, upstreams []*Upstream) (int, error) { func (m *RouteManager) getSessionHandler(r *http.Request, upstreams []*Upstream) (int, error) {
// Get existing session // Get existing session
session, err := m.SessionStore.Get(r, "STICKYSESSION") session, err := m.SessionStore.Get(r, STICKY_SESSION_NAME)
if err != nil { if err != nil {
return -1, err return -1, err
} }
@ -119,7 +125,7 @@ func (m *RouteManager) getSessionHandler(r *http.Request, upstreams []*Upstream)
originDomainRaw := session.Values["zr_sid_origin"] originDomainRaw := session.Values["zr_sid_origin"]
originIDRaw := session.Values["zr_sid_index"] originIDRaw := session.Values["zr_sid_index"]
if originDomainRaw == nil || originIDRaw == nil { if originDomainRaw == nil || originIDRaw == nil || originIDRaw == -1 {
return -1, errors.New("no session has been set") return -1, errors.New("no session has been set")
} }
originDomain := originDomainRaw.(string) originDomain := originDomainRaw.(string)
@ -201,21 +207,3 @@ func getRandomUpstreamByWeight(upstreams []*Upstream) (*Upstream, int, error) {
return nil, -1, errors.New("failed to pick an upstream origin server") return nil, -1, errors.New("failed to pick an upstream origin server")
} }
// IntRange returns a random integer in the range from min to max.
/*
func intRange(min, max int) (int, error) {
var result int
switch {
case min > max:
// Fail with error
return result, errors.New("min is greater than max")
case max == min:
result = max
case max > min:
b := rand.Intn(max-min) + min
result = min + int(b)
}
return result, nil
}
*/