mika/rogueserver
1
0
Fork 0
mirror of https://github.com/pagefaultgames/rogueserver.git synced 2025-07-06 08:22:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: mika:f9cce330f6fa3292f85223b717fc7b464911acfc
Branches Tags
mika:master
mika:live
mika:save-rewrite
mika:beta
mika:styling-fixes
...
compare: mika:b51f5cbf692240c8eea54470b73c71f99cef106a
Branches Tags
mika:live
mika:save-rewrite
mika:master
mika:beta
mika:styling-fixes

2 Commits
f9cce330f6 ... b51f5cbf69

Author SHA1 Message Date
Pancakes
b51f5cbf69
Fix out of date session in /savedata/system/verify 2024-06-10 18:04:48 -04:00
Pancakes
23c2458d8f
Support legacy /savedata/system/verify 2024-06-10 14:56:15 -04:00
1 changed files with 31 additions and 14 deletions
Show Stats Expand all files Collapse all files

41
api/endpoints.go
View File

@ -479,15 +479,18 @@ func handleSystem(w http.ResponseWriter, r *http.Request) {
return
}
if !r.URL.Query().Has("clientSessionId") {
httpError(w, r, fmt.Errorf("missing clientSessionId"), http.StatusBadRequest)
return
}
var active bool
if r.URL.Path != "/savedata/system/verify" {
if !r.URL.Query().Has("clientSessionId") {
httpError(w, r, fmt.Errorf("missing clientSessionId"), http.StatusBadRequest)
return
}
active, err := db.IsActiveSession(uuid, r.URL.Query().Get("clientSessionId"))
if err != nil {
httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusBadRequest)
return
active, err = db.IsActiveSession(uuid, r.URL.Query().Get("clientSessionId"))
if err != nil {
httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusBadRequest)
return
}
}
switch r.PathValue("action") {
@ -536,10 +539,24 @@ func handleSystem(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusNoContent)
case "verify":
var input SystemVerifyRequest
err = json.NewDecoder(r.Body).Decode(&input)
if err != nil {
httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest)
return
if !r.URL.Query().Has("clientSessionId") {
err = json.NewDecoder(r.Body).Decode(&input)
if err != nil {
httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest)
return
}
active, err = db.IsActiveSession(uuid, input.ClientSessionId)
if err != nil {
httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusBadRequest)
return
}
} else {
active, err = db.IsActiveSession(uuid, r.URL.Query().Get("clientSessionId"))
if err != nil {
httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusBadRequest)
return
}
}
response := SystemVerifyResponse{