From 0ead2da2da9d4aab9f85b3c547e66e808ee4a0b5 Mon Sep 17 00:00:00 2001 From: maru Date: Wed, 8 May 2024 15:47:56 -0400 Subject: [PATCH 01/10] Remove unused endpoint game/playercount --- api/common.go | 1 - api/endpoints.go | 4 ---- 2 files changed, 5 deletions(-) diff --git a/api/common.go b/api/common.go index 62ef843..920d41e 100644 --- a/api/common.go +++ b/api/common.go @@ -40,7 +40,6 @@ func Init(mux *http.ServeMux) { mux.HandleFunc("GET /account/logout", handleAccountLogout) // game - mux.HandleFunc("GET /game/playercount", handleGamePlayerCount) mux.HandleFunc("GET /game/titlestats", handleGameTitleStats) mux.HandleFunc("GET /game/classicsessioncount", handleGameClassicSessionCount) diff --git a/api/endpoints.go b/api/endpoints.go index fb41047..ee4f76d 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -144,10 +144,6 @@ func handleAccountLogout(w http.ResponseWriter, r *http.Request) { // game -func handleGamePlayerCount(w http.ResponseWriter, r *http.Request) { - w.Write([]byte(strconv.Itoa(playerCount))) -} - func handleGameTitleStats(w http.ResponseWriter, r *http.Request) { err := json.NewEncoder(w).Encode(defs.TitleStats{ PlayerCount: playerCount, From 7dbcb18ebf36ff738472be995f88a26ea41cb4c5 Mon Sep 17 00:00:00 2001 From: maru Date: Wed, 8 May 2024 17:23:07 -0400 Subject: [PATCH 02/10] Use INSERT instead of REPLACE for savedata storage functions --- db/savedata.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/savedata.go b/db/savedata.go index 881345f..dc2c860 100644 --- a/db/savedata.go +++ b/db/savedata.go @@ -65,7 +65,7 @@ func StoreSystemSaveData(uuid []byte, data defs.SystemSaveData) error { return err } - _, err = handle.Exec("REPLACE INTO systemSaveData (uuid, data, timestamp) VALUES (?, ?, UTC_TIMESTAMP())", uuid, buf.Bytes()) + _, err = handle.Exec("INSERT INTO systemSaveData (uuid, data, timestamp) VALUES (?, ?, UTC_TIMESTAMP()) ON DUPLICATE KEY UPDATE data = ?, timestamp = UTC_TIMESTAMP()", uuid, buf.Bytes(), buf.Bytes()) if err != nil { return err } @@ -116,7 +116,7 @@ func StoreSessionSaveData(uuid []byte, data defs.SessionSaveData, slot int) erro return err } - _, err = handle.Exec("REPLACE INTO sessionSaveData (uuid, slot, data, timestamp) VALUES (?, ?, ?, UTC_TIMESTAMP())", uuid, slot, buf.Bytes()) + _, err = handle.Exec("INSERT INTO sessionSaveData (uuid, slot, data, timestamp) VALUES (?, ?, ?, UTC_TIMESTAMP()) ON DUPLICATE KEY UPDATE data = ?, timestamp = UTC_TIMESTAMP()", uuid, slot, buf.Bytes(), buf.Bytes()) if err != nil { return err } From 192b777ac3e0c7b7c603f621637423de0467384a Mon Sep 17 00:00:00 2001 From: maru Date: Wed, 8 May 2024 20:08:10 -0400 Subject: [PATCH 03/10] Set ArgonMaxInstances to number of cores --- api/account/common.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/account/common.go b/api/account/common.go index 9102f4e..8e8c0ff 100644 --- a/api/account/common.go +++ b/api/account/common.go @@ -19,6 +19,7 @@ package account import ( "regexp" + "runtime" "golang.org/x/crypto/argon2" ) @@ -34,13 +35,13 @@ const ( ArgonKeySize = 32 ArgonSaltSize = 16 - ArgonMaxInstances = 16 - UUIDSize = 16 TokenSize = 32 ) var ( + ArgonMaxInstances = runtime.NumCPU() + isValidUsername = regexp.MustCompile(`^\w{1,16}$`).MatchString semaphore = make(chan bool, ArgonMaxInstances) ) From 4971ad9d42c7f9ad908d287f9abd7facf2f70e18 Mon Sep 17 00:00:00 2001 From: maru Date: Wed, 8 May 2024 20:19:33 -0400 Subject: [PATCH 04/10] Add new database limits --- db/db.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/db/db.go b/db/db.go index 05e92c4..31ad9a8 100644 --- a/db/db.go +++ b/db/db.go @@ -21,9 +21,11 @@ import ( "database/sql" "encoding/hex" "fmt" - _ "github.com/go-sql-driver/mysql" "log" "os" + "time" + + _ "github.com/go-sql-driver/mysql" ) var handle *sql.DB @@ -36,7 +38,10 @@ func Init(username, password, protocol, address, database string) error { return fmt.Errorf("failed to open database connection: %s", err) } - handle.SetMaxOpenConns(1000) + handle.SetMaxIdleConns(256) + handle.SetMaxOpenConns(256) + handle.SetConnMaxIdleTime(time.Second * 30) + handle.SetConnMaxLifetime(time.Minute) tx, err := handle.Begin() if err != nil { From 59ea469fb68182b1ab1c3135e88f2e4aca4efb20 Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 9 May 2024 05:59:48 -0400 Subject: [PATCH 05/10] Don't import legacy saves if system exists in database --- db/db.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/db/db.go b/db/db.go index 31ad9a8..e84f031 100644 --- a/db/db.go +++ b/db/db.go @@ -73,6 +73,12 @@ func Init(username, password, protocol, address, database string) error { continue } + var count int + err = handle.QueryRow("SELECT COUNT(*) FROM systemSaveData WHERE uuid = ?", uuid).Scan(&count) + if err != nil || count != 0 { + continue + } + // store new system data systemData, err := LegacyReadSystemSaveData(uuid) if err != nil { From de0bd74dc258f380284c75723b4a4f49fccfc068 Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 9 May 2024 14:13:19 -0400 Subject: [PATCH 06/10] Update database limits --- db/db.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/db/db.go b/db/db.go index e84f031..3ab8c87 100644 --- a/db/db.go +++ b/db/db.go @@ -38,8 +38,12 @@ func Init(username, password, protocol, address, database string) error { return fmt.Errorf("failed to open database connection: %s", err) } - handle.SetMaxIdleConns(256) - handle.SetMaxOpenConns(256) + if protocol == "unix" { + handle.SetMaxOpenConns(1000) + } else { + handle.SetMaxOpenConns(200) + } + handle.SetConnMaxIdleTime(time.Second * 30) handle.SetConnMaxLifetime(time.Minute) From e4de7c2391885426ee60cb4e76a466128a38d7dd Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 9 May 2024 14:22:20 -0400 Subject: [PATCH 07/10] Update database limiting code more --- db/db.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/db/db.go b/db/db.go index 3ab8c87..d927377 100644 --- a/db/db.go +++ b/db/db.go @@ -37,15 +37,16 @@ func Init(username, password, protocol, address, database string) error { if err != nil { return fmt.Errorf("failed to open database connection: %s", err) } - - if protocol == "unix" { - handle.SetMaxOpenConns(1000) - } else { - handle.SetMaxOpenConns(200) + + conns := 1024 + if protocol != "unix" { + conns = 256 } - handle.SetConnMaxIdleTime(time.Second * 30) - handle.SetConnMaxLifetime(time.Minute) + handle.SetMaxOpenConns(conns) + handle.SetMaxIdleConns(conns/4) + + handle.SetConnMaxIdleTime(time.Second * 10) tx, err := handle.Begin() if err != nil { From fadd10602afbcc451f830cde7099e7fc23c56b17 Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 9 May 2024 14:26:54 -0400 Subject: [PATCH 08/10] Don't log ErrNoRows in savedata --- api/endpoints.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/endpoints.go b/api/endpoints.go index ee4f76d..3515f4f 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -18,6 +18,7 @@ package api import ( + "database/sql" "encoding/json" "fmt" "net/http" @@ -280,6 +281,10 @@ func handleSaveData(w http.ResponseWriter, r *http.Request) { switch r.URL.Path { case "/savedata/get": save, err = savedata.Get(uuid, datatype, slot) + if err == sql.ErrNoRows { + http.Error(w, err.Error(), http.StatusNotFound) + return + } case "/savedata/update": err = savedata.Update(uuid, slot, save) case "/savedata/delete": From 633142eb293a4fff81f2d5e27466654060bd0e70 Mon Sep 17 00:00:00 2001 From: maru Date: Fri, 10 May 2024 13:16:35 -0400 Subject: [PATCH 09/10] Allow serving HTTPS --- rogueserver.go | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/rogueserver.go b/rogueserver.go index f86185f..5659cae 100644 --- a/rogueserver.go +++ b/rogueserver.go @@ -42,6 +42,9 @@ func main() { dbaddr := flag.String("dbaddr", "localhost", "database address") dbname := flag.String("dbname", "pokeroguedb", "database name") + tlscert := flag.String("tlscert", "", "tls certificate path") + tlskey := flag.String("tlskey", "", "tls key path") + flag.Parse() // register gob types @@ -66,10 +69,15 @@ func main() { api.Init(mux) // start web server + handler := prodHandler(mux) if *debug { - err = http.Serve(listener, debugHandler(mux)) + handler = debugHandler(mux) + } + + if *tlscert == "" { + err = http.Serve(listener, handler) } else { - err = http.Serve(listener, mux) + err = http.ServeTLS(listener, handler, *tlscert, *tlskey) } if err != nil { log.Fatalf("failed to create http server or server errored: %s", err) @@ -107,3 +115,19 @@ func debugHandler(router *http.ServeMux) http.Handler { router.ServeHTTP(w, r) }) } + + +func prodHandler(router *http.ServeMux) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type") + w.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST") + w.Header().Set("Access-Control-Allow-Origin", "https://pokerogue.net") + + if r.Method == "OPTIONS" { + w.WriteHeader(http.StatusOK) + return + } + + router.ServeHTTP(w, r) + }) +} From 8a32efeaa3985df9cdc7176ba6888e02146ae32e Mon Sep 17 00:00:00 2001 From: maru Date: Fri, 10 May 2024 13:40:00 -0400 Subject: [PATCH 10/10] Clean up rogueserver.go --- rogueserver.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/rogueserver.go b/rogueserver.go index 5659cae..42f2d7d 100644 --- a/rogueserver.go +++ b/rogueserver.go @@ -101,6 +101,21 @@ func createListener(proto, addr string) (net.Listener, error) { return listener, nil } +func prodHandler(router *http.ServeMux) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type") + w.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST") + w.Header().Set("Access-Control-Allow-Origin", "https://pokerogue.net") + + if r.Method == "OPTIONS" { + w.WriteHeader(http.StatusOK) + return + } + + router.ServeHTTP(w, r) + }) +} + func debugHandler(router *http.ServeMux) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.Header().Set("Access-Control-Allow-Headers", "*") @@ -116,18 +131,3 @@ func debugHandler(router *http.ServeMux) http.Handler { }) } - -func prodHandler(router *http.ServeMux) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type") - w.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST") - w.Header().Set("Access-Control-Allow-Origin", "https://pokerogue.net") - - if r.Method == "OPTIONS" { - w.WriteHeader(http.StatusOK) - return - } - - router.ServeHTTP(w, r) - }) -}