Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-14 07:55:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

further sign server rewrite

Browse Source
This commit is contained in:
wish
2023-04-30 13:51:30 +10:00
parent 6601285218
commit a260500bb5
3 changed files with 80 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
server/signserver/dbutils.go
View File

@@ -1,8 +1,10 @@
package signserver package signserver
import ( import (
"database/sql"
"errors" "errors"
"erupe-ce/common/mhfcourse" "erupe-ce/common/mhfcourse"
"erupe-ce/common/token"
"strings" "strings"
"time" "time"
@@ -220,11 +222,18 @@ func (s *Server) checkToken(uid uint32) (bool, error) {
return false, nil return false, nil
} }
func (s *Server) registerToken(uid uint32, token string) (uint32, error) { func (s *Server) registerUidToken(uid uint32) (uint32, string, error) {
var id uint32 token := token.Generate(16)
var err error var tid uint32
err = s.db.QueryRow("INSERT INTO sign_sessions (user_id, token) VALUES ($1, $2) RETURNING id", uid, token).Scan(&id) err := s.db.QueryRow(`INSERT INTO sign_sessions (user_id, token) VALUES ($1, $2) RETURNING id`, uid, token).Scan(&tid)
return id, err return tid, token, err
}
func (s *Server) registerPsnToken(psn string) (uint32, string, error) {
token := token.Generate(16)
var tid uint32
err := s.db.QueryRow(`INSERT INTO sign_sessions (psn_id, token) VALUES ($1, $2) RETURNING id`, psn, token).Scan(&tid)
return tid, token, err
} }
func (s *Server) validateToken(token string, tokenID uint32) bool { func (s *Server) validateToken(token string, tokenID uint32) bool {
@@ -240,16 +249,28 @@ func (s *Server) validateToken(token string, tokenID uint32) bool {
return true return true
} }
func (s *Server) validateLogin(user string, pass string) (uint32, error) { func (s *Server) validateLogin(user string, pass string) (uint32, RespID) {
var uid uint32 var uid uint32
var passDB string var passDB string
err := s.db.QueryRow(`SELECT id, password FROM users WHERE username = $1`, user).Scan(&uid, &passDB) err := s.db.QueryRow(`SELECT id, password FROM users WHERE username = $1`, user).Scan(&uid, &passDB)
if err != nil { if err != nil {
return 0, err if err == sql.ErrNoRows {
s.logger.Info("User not found", zap.String("User", user))
if s.erupeConfig.DevMode && s.erupeConfig.DevModeOptions.AutoCreateAccount {
uid, err = s.registerDBAccount(user, pass)
if err == nil {
return uid, SIGN_SUCCESS
} else {
return 0, SIGN_EABORT
}
}
return 0, SIGN_EAUTH
}
return 0, SIGN_EABORT
} else { } else {
if bcrypt.CompareHashAndPassword([]byte(passDB), []byte(pass)) == nil { if bcrypt.CompareHashAndPassword([]byte(passDB), []byte(pass)) == nil {
return uid, nil return uid, SIGN_SUCCESS
} }
return 0, nil return 0, SIGN_EPASS
} }
} }

10
server/signserver/dsgn_resp.go
View File

@@ -4,7 +4,6 @@ import (
"erupe-ce/common/byteframe" "erupe-ce/common/byteframe"
ps "erupe-ce/common/pascalstring" ps "erupe-ce/common/pascalstring"
"erupe-ce/common/stringsupport" "erupe-ce/common/stringsupport"
"erupe-ce/common/token"
"erupe-ce/server/channelserver" "erupe-ce/server/channelserver"
"fmt" "fmt"
"go.uber.org/zap" "go.uber.org/zap"
@@ -19,8 +18,13 @@ func (s *Session) makeSignResponse(uid uint32) []byte {
} }
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
sessToken := token.Generate(16) var tokenID uint32
tokenID, err := s.server.registerToken(uid, sessToken) var sessToken string
if uid == 0 && s.psn != "" {
tokenID, sessToken, err = s.server.registerPsnToken(s.psn)
} else {
tokenID, sessToken, err = s.server.registerUidToken(uid)
}
if err != nil { if err != nil {
bf.WriteUint8(uint8(SIGN_EABORT)) bf.WriteUint8(uint8(SIGN_EABORT))
return bf.Data() return bf.Data()

55
server/signserver/session.go
View File

@@ -31,6 +31,7 @@ type Session struct {
rawConn net.Conn rawConn net.Conn
cryptConn *network.CryptConn cryptConn *network.CryptConn
client client client client
psn string
} }
func (s *Session) work() { func (s *Session) work() {
@@ -87,46 +88,24 @@ func (s *Session) handlePacket(pkt []byte) error {
func (s *Session) authenticate(username string, password string) { func (s *Session) authenticate(username string, password string) {
newCharaReq := false newCharaReq := false
if username[len(username)-1] == 43 { // '+' if username[len(username)-1] == 43 { // '+'
username = username[:len(username)-1] username = username[:len(username)-1]
newCharaReq = true newCharaReq = true
} }
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
uid, resp := s.server.validateLogin(username, password)
uid, err := s.server.validateLogin(username, password) switch resp {
switch { case SIGN_SUCCESS:
case err == sql.ErrNoRows:
s.logger.Info("User not found", zap.String("Username", username))
if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.AutoCreateAccount {
uid, err = s.server.registerDBAccount(username, password)
if err == nil && uid > 0 {
bf.WriteBytes(s.makeSignResponse(uid))
}
} else {
bf.WriteUint8(uint8(SIGN_EAUTH))
}
case err != nil:
s.logger.Error("Error getting user details", zap.Error(err))
bf.WriteUint8(uint8(SIGN_EABORT))
default:
if uid > 0 {
s.logger.Debug("Passwords match!")
if newCharaReq { if newCharaReq {
_ = s.server.newUserChara(username) _ = s.server.newUserChara(username)
} }
bf.WriteBytes(s.makeSignResponse(uid)) bf.WriteBytes(s.makeSignResponse(uid))
} else { default:
s.logger.Warn("Incorrect password") bf.WriteUint8(uint8(resp))
bf.WriteUint8(uint8(SIGN_EPASS))
} }
}
if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.LogOutboundMessages { if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.LogOutboundMessages {
fmt.Printf("\n[Server] -> [Client]\nData [%d bytes]:\n%s\n", len(bf.Data()), hex.Dump(bf.Data())) fmt.Printf("\n[Server] -> [Client]\nData [%d bytes]:\n%s\n", len(bf.Data()), hex.Dump(bf.Data()))
} }
_ = s.cryptConn.SendPacket(bf.Data()) _ = s.cryptConn.SendPacket(bf.Data())
} }
@@ -148,9 +127,9 @@ func (s *Session) handlePSSGN(bf *byteframe.ByteFrame) {
_ = bf.ReadNullTerminatedBytes() // VITA = 0000000256, PS3 = 0000000255 _ = bf.ReadNullTerminatedBytes() // VITA = 0000000256, PS3 = 0000000255
_ = bf.ReadBytes(2) // VITA = 1, PS3 = ! _ = bf.ReadBytes(2) // VITA = 1, PS3 = !
_ = bf.ReadBytes(82) _ = bf.ReadBytes(82)
psnUser := string(bf.ReadNullTerminatedBytes()) s.psn = string(bf.ReadNullTerminatedBytes())
var uid uint32 var uid uint32
err := s.server.db.QueryRow(`SELECT id FROM users WHERE psn_id = $1`, psnUser).Scan(&uid) err := s.server.db.QueryRow(`SELECT id FROM users WHERE psn_id = $1`, s.psn).Scan(&uid)
if err != nil { if err != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
s.cryptConn.SendPacket(s.makeSignResponse(0)) s.cryptConn.SendPacket(s.makeSignResponse(0))
@@ -166,16 +145,16 @@ func (s *Session) handlePSNLink(bf *byteframe.ByteFrame) {
_ = bf.ReadNullTerminatedBytes() // Client ID _ = bf.ReadNullTerminatedBytes() // Client ID
credentials := strings.Split(stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes()), "\n") credentials := strings.Split(stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes()), "\n")
token := string(bf.ReadNullTerminatedBytes()) token := string(bf.ReadNullTerminatedBytes())
if s.server.erupeConfig.DevModeOptions.DisableTokenCheck || !s.server.validateToken(token, 0) { uid, resp := s.server.validateLogin(credentials[0], credentials[1])
uid, err := s.server.validateLogin(credentials[0], credentials[1]) if resp == SIGN_SUCCESS && uid > 0 {
if err == nil && uid > 0 {
var psn string var psn string
err = s.server.db.QueryRow(`SELECT psn_id FROM sign_sessions WHERE token = $1`, token).Scan(&psn) err := s.server.db.QueryRow(`SELECT psn_id FROM sign_sessions WHERE token = $1`, token).Scan(&psn)
if err != nil { if err != nil {
s.sendCode(SIGN_ECOGLINK) s.sendCode(SIGN_ECOGLINK)
return return
} }
// Since we check for the psn_id, this will never run
var exists int var exists int
err = s.server.db.QueryRow(`SELECT count(*) FROM users WHERE psn_id = $1`, psn).Scan(&exists) err = s.server.db.QueryRow(`SELECT count(*) FROM users WHERE psn_id = $1`, psn).Scan(&exists)
if err != nil { if err != nil {
@@ -187,11 +166,11 @@ func (s *Session) handlePSNLink(bf *byteframe.ByteFrame) {
} }
var currentPSN string var currentPSN string
err = s.server.db.QueryRow(`SELECT psn_id FROM users WHERE username = $1`, credentials[0]).Scan(&currentPSN) err = s.server.db.QueryRow(`SELECT COALESCE(psn_id, '') FROM users WHERE username = $1`, credentials[0]).Scan(&currentPSN)
if err != nil { if err != nil {
s.sendCode(SIGN_ECOGLINK) s.sendCode(SIGN_ECOGLINK)
return return
} else if psn != currentPSN { } else if currentPSN != "" {
s.sendCode(SIGN_EMBID) s.sendCode(SIGN_EMBID)
return return
} }
@@ -199,12 +178,10 @@ func (s *Session) handlePSNLink(bf *byteframe.ByteFrame) {
_, err = s.server.db.Exec(`UPDATE users SET psn_id = $1 WHERE username = $2`, psn, credentials[0]) _, err = s.server.db.Exec(`UPDATE users SET psn_id = $1 WHERE username = $2`, psn, credentials[0])
if err == nil { if err == nil {
s.sendCode(SIGN_SUCCESS) s.sendCode(SIGN_SUCCESS)
return
}
} }
} else {
s.sendCode(SIGN_ECOGLINK) s.sendCode(SIGN_ECOGLINK)
}
}
} }
func (s *Session) handleDSGN(bf *byteframe.ByteFrame) { func (s *Session) handleDSGN(bf *byteframe.ByteFrame) {