mirror of
https://github.com/WiiLink24/wfc-server.git
synced 2026-09-14 11:35:50 -05:00
API: Handle OPTIONS request method
This commit is contained in:
53
api/ban.go
53
api/ban.go
@@ -8,6 +8,9 @@ import (
|
||||
"time"
|
||||
"wwfc/database"
|
||||
"wwfc/gpcm"
|
||||
"wwfc/logging"
|
||||
|
||||
"github.com/logrusorgru/aurora/v3"
|
||||
)
|
||||
|
||||
func HandleBan(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -17,36 +20,46 @@ func HandleBan(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
if r.Method == http.MethodPost {
|
||||
success, err, statusCode = handleBanImpl(r)
|
||||
} else if r.Method == http.MethodOptions {
|
||||
statusCode = http.StatusNoContent
|
||||
w.Header().Set("Access-Control-Allow-Methods", "POST")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
} else {
|
||||
err = "Incorrect request. POST only."
|
||||
statusCode = http.StatusBadRequest
|
||||
statusCode = http.StatusMethodNotAllowed
|
||||
w.Header().Set("Allow", "POST")
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
|
||||
var jsonData []byte
|
||||
if success {
|
||||
jsonData, _ = json.Marshal(map[string]string{"success": "true"})
|
||||
} else {
|
||||
jsonData, _ = json.Marshal(map[string]string{"error": err})
|
||||
|
||||
if statusCode != http.StatusNoContent {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
if success {
|
||||
jsonData, _ = json.Marshal(map[string]string{"success": "true"})
|
||||
} else {
|
||||
jsonData, _ = json.Marshal(map[string]string{"error": err})
|
||||
}
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Length", strconv.Itoa(len(jsonData)))
|
||||
|
||||
w.WriteHeader(statusCode)
|
||||
w.Write(jsonData)
|
||||
}
|
||||
|
||||
type BanRequestSpec struct {
|
||||
Secret string
|
||||
Pid uint32
|
||||
Days uint64
|
||||
Hours uint64
|
||||
Minutes uint64
|
||||
Tos bool
|
||||
Reason string
|
||||
ReasonHidden string
|
||||
Moderator string
|
||||
Secret string `json:"secret"`
|
||||
ProfileID uint32 `json:"pid"`
|
||||
Days uint64 `json:"days"`
|
||||
Hours uint64 `json:"hours"`
|
||||
Minutes uint64 `json:"minutes"`
|
||||
Tos bool `json:"tos"`
|
||||
Reason string `json:"reason"`
|
||||
ReasonHidden string `json:"reason_hidden"`
|
||||
Moderator string `json:"moderator"`
|
||||
}
|
||||
|
||||
func handleBanImpl(r *http.Request) (bool, string, int) {
|
||||
@@ -67,8 +80,8 @@ func handleBanImpl(r *http.Request) (bool, string, int) {
|
||||
return false, "Invalid API secret in request", http.StatusUnauthorized
|
||||
}
|
||||
|
||||
if req.Pid == 0 {
|
||||
return false, "pid missing or 0 in request", http.StatusBadRequest
|
||||
if req.ProfileID == 0 {
|
||||
return false, "Profile ID missing or 0 in request", http.StatusBadRequest
|
||||
}
|
||||
|
||||
if req.Reason == "" {
|
||||
@@ -87,11 +100,13 @@ func handleBanImpl(r *http.Request) (bool, string, int) {
|
||||
|
||||
length := time.Duration(minutes) * time.Minute
|
||||
|
||||
if !database.BanUser(pool, ctx, req.Pid, req.Tos, length, req.Reason, req.ReasonHidden, moderator) {
|
||||
logging.Notice("API:"+moderator, "Ban profile:", aurora.Cyan(req.ProfileID), "TOS:", aurora.Cyan(req.Tos), "Length:", aurora.Cyan(length), "Reason:", aurora.BrightCyan(req.Reason), "Reason (Hidden):", aurora.BrightCyan(req.ReasonHidden))
|
||||
|
||||
if !database.BanUser(pool, ctx, req.ProfileID, req.Tos, length, req.Reason, req.ReasonHidden, moderator) {
|
||||
return false, "Failed to ban user", http.StatusInternalServerError
|
||||
}
|
||||
|
||||
gpcm.KickPlayerCustomMessage(req.Pid, req.Reason, gpcm.WWFCMsgProfileRestrictedCustom)
|
||||
gpcm.KickPlayerCustomMessage(req.ProfileID, req.Reason, gpcm.WWFCMsgProfileRestrictedCustom)
|
||||
|
||||
return true, "", http.StatusOK
|
||||
}
|
||||
|
||||
34
api/kick.go
34
api/kick.go
@@ -15,30 +15,40 @@ func HandleKick(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
if r.Method == http.MethodPost {
|
||||
success, err, statusCode = handleKickImpl(r)
|
||||
} else if r.Method == http.MethodOptions {
|
||||
statusCode = http.StatusNoContent
|
||||
w.Header().Set("Access-Control-Allow-Methods", "POST")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
} else {
|
||||
err = "Incorrect request. POST only."
|
||||
statusCode = http.StatusBadRequest
|
||||
statusCode = http.StatusMethodNotAllowed
|
||||
w.Header().Set("Allow", "POST")
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
|
||||
var jsonData []byte
|
||||
if success {
|
||||
jsonData, _ = json.Marshal(map[string]string{"success": "true"})
|
||||
} else {
|
||||
jsonData, _ = json.Marshal(map[string]string{"error": err})
|
||||
|
||||
if statusCode != http.StatusNoContent {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
if success {
|
||||
jsonData, _ = json.Marshal(map[string]string{"success": "true"})
|
||||
} else {
|
||||
jsonData, _ = json.Marshal(map[string]string{"error": err})
|
||||
}
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Length", strconv.Itoa(len(jsonData)))
|
||||
|
||||
w.WriteHeader(statusCode)
|
||||
w.Write(jsonData)
|
||||
}
|
||||
|
||||
type KickRequestSpec struct {
|
||||
Secret string
|
||||
Reason string
|
||||
Pid uint32
|
||||
Secret string `json:"secret"`
|
||||
Reason string `json:"reason"`
|
||||
ProfileID uint32 `json:"pid"`
|
||||
}
|
||||
|
||||
func handleKickImpl(r *http.Request) (bool, string, int) {
|
||||
@@ -59,15 +69,15 @@ func handleKickImpl(r *http.Request) (bool, string, int) {
|
||||
return false, "Invalid API secret in request", http.StatusUnauthorized
|
||||
}
|
||||
|
||||
if req.Pid == 0 {
|
||||
return false, "pid missing or 0 in request", http.StatusBadRequest
|
||||
if req.ProfileID == 0 {
|
||||
return false, "Profile ID missing or 0 in request", http.StatusBadRequest
|
||||
}
|
||||
|
||||
if req.Reason == "" {
|
||||
return false, "Missing kick reason in request", http.StatusBadRequest
|
||||
}
|
||||
|
||||
gpcm.KickPlayerCustomMessage(req.Pid, req.Reason, gpcm.WWFCMsgKickedCustom)
|
||||
gpcm.KickPlayerCustomMessage(req.ProfileID, req.Reason, gpcm.WWFCMsgKickedCustom)
|
||||
|
||||
return true, "", http.StatusOK
|
||||
}
|
||||
|
||||
30
api/unban.go
30
api/unban.go
@@ -15,29 +15,39 @@ func HandleUnban(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
if r.Method == http.MethodPost {
|
||||
success, err, statusCode = handleUnbanImpl(r)
|
||||
} else if r.Method == http.MethodOptions {
|
||||
statusCode = http.StatusNoContent
|
||||
w.Header().Set("Access-Control-Allow-Methods", "POST")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
} else {
|
||||
err = "Incorrect request. POST only."
|
||||
statusCode = http.StatusBadRequest
|
||||
statusCode = http.StatusMethodNotAllowed
|
||||
w.Header().Set("Allow", "POST")
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
|
||||
var jsonData []byte
|
||||
if success {
|
||||
jsonData, _ = json.Marshal(map[string]string{"success": "true"})
|
||||
} else {
|
||||
jsonData, _ = json.Marshal(map[string]string{"error": err})
|
||||
|
||||
if statusCode != http.StatusNoContent {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
if success {
|
||||
jsonData, _ = json.Marshal(map[string]string{"success": "true"})
|
||||
} else {
|
||||
jsonData, _ = json.Marshal(map[string]string{"error": err})
|
||||
}
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Length", strconv.Itoa(len(jsonData)))
|
||||
|
||||
w.WriteHeader(statusCode)
|
||||
w.Write(jsonData)
|
||||
}
|
||||
|
||||
type UnbanRequestSpec struct {
|
||||
Secret string
|
||||
Pid uint32
|
||||
Secret string `json:"secret"`
|
||||
ProfileID uint32 `json:"pid"`
|
||||
}
|
||||
|
||||
func handleUnbanImpl(r *http.Request) (bool, string, int) {
|
||||
@@ -58,11 +68,11 @@ func handleUnbanImpl(r *http.Request) (bool, string, int) {
|
||||
return false, "Invalid API secret in request", http.StatusUnauthorized
|
||||
}
|
||||
|
||||
if req.Pid == 0 {
|
||||
if req.ProfileID == 0 {
|
||||
return false, "pid missing or 0 in request", http.StatusBadRequest
|
||||
}
|
||||
|
||||
if !database.UnbanUser(pool, ctx, req.Pid) {
|
||||
if !database.UnbanUser(pool, ctx, req.ProfileID) {
|
||||
return false, "Failed to unban user", http.StatusInternalServerError
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user