onyx_online/q3rcon-proxy
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/q3rcon-proxy.git synced 2025-01-18 16:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

move packet header check methods into Session

Browse Source 
log invalid packets at error level
This commit is contained in:
onyx-and-iris 2024-03-20 18:02:55 +00:00
parent 15e4cf6e42
commit dfcdb6a96a
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/udpproxy/session.go
View File

@ -1,6 +1,7 @@
package udpproxy package udpproxy
import ( import (
"errors"
"net" "net"
"strings" "strings"
"time" "time"
@ -37,6 +38,14 @@ func (s *Session) isRconPacket(buf []byte) bool {
return string(buf[:8]) == "\xff\xff\xff\xffrcon" return string(buf[:8]) == "\xff\xff\xff\xffrcon"
} }
func (s *Session) isQueryPacket(buf []byte) bool {
return string(buf[:13]) == "\xff\xff\xff\xffgetstatus" || string(buf[:11]) == "\xff\xff\xff\xffgetinfo"
}
func (s *Session) isValidPacket(buf []byte) bool {
return s.isRconPacket(buf) || s.isQueryPacket(buf)
}
func (s *Session) isResponsePacket(buf []byte) bool { func (s *Session) isResponsePacket(buf []byte) bool {
return string(buf[:9]) == "\xff\xff\xff\xffprint" return string(buf[:9]) == "\xff\xff\xff\xffprint"
} }
@ -46,7 +55,7 @@ func (s *Session) listen() error {
buf := make([]byte, 2048) buf := make([]byte, 2048)
n, err := s.serverConn.Read(buf) n, err := s.serverConn.Read(buf)
if err != nil { if err != nil {
log.Println(err) log.Error(err)
continue continue
} }
@ -55,14 +64,18 @@ func (s *Session) listen() error {
} }
func (s *Session) proxyFrom(buf []byte) error { func (s *Session) proxyFrom(buf []byte) error {
if !s.isResponsePacket(buf) {
return nil
}
s.updateTime = time.Now() s.updateTime = time.Now()
_, err := s.proxyConn.WriteToUDP(buf, s.caddr) _, err := s.proxyConn.WriteToUDP(buf, s.caddr)
if err != nil { if err != nil {
log.Println(err) log.Error(err)
return err return err
} }
if s.isResponsePacket(buf) { if log.GetLevel() == log.DebugLevel {
parts := strings.Split(string(buf[10:]), " ") parts := strings.Split(string(buf[10:]), " ")
log.Debugf("Response: %s", strings.Join(parts, " ")) log.Debugf("Response: %s", strings.Join(parts, " "))
} }
@ -71,10 +84,16 @@ func (s *Session) proxyFrom(buf []byte) error {
} }
func (s *Session) proxyTo(buf []byte) error { func (s *Session) proxyTo(buf []byte) error {
if !s.isValidPacket(buf) {
err := errors.New("not a rcon or query packet")
log.Error(err.Error())
return err
}
s.updateTime = time.Now() s.updateTime = time.Now()
_, err := s.serverConn.Write(buf) _, err := s.serverConn.Write(buf)
if err != nil { if err != nil {
log.Println(err) log.Error(err)
return err return err
} }

20
pkg/udpproxy/udpproxy.go
View File

@ -37,18 +37,6 @@ func New(port, target string) (*Client, error) {
}, nil }, nil
} }
func (c *Client) isRconPacket(buf []byte) bool {
return string(buf[:8]) == "\xff\xff\xff\xffrcon"
}
func (c *Client) isQueryPacket(buf []byte) bool {
return string(buf[:13]) == "\xff\xff\xff\xffgetstatus" || string(buf[:11]) == "\xff\xff\xff\xffgetinfo"
}
func (c *Client) isValidPacket(buf []byte) bool {
return c.isRconPacket(buf) || c.isQueryPacket(buf)
}
func (c *Client) ListenAndServe() error { func (c *Client) ListenAndServe() error {
var err error var err error
c.proxyConn, err = net.ListenUDP("udp", c.laddr) c.proxyConn, err = net.ListenUDP("udp", c.laddr)
@ -62,18 +50,14 @@ func (c *Client) ListenAndServe() error {
buf := make([]byte, 2048) buf := make([]byte, 2048)
n, caddr, err := c.proxyConn.ReadFromUDP(buf) n, caddr, err := c.proxyConn.ReadFromUDP(buf)
if err != nil { if err != nil {
log.Println(err) log.Error(err)
}
if !c.isValidPacket(buf[:n]) {
continue
} }
session, found := c.sessions[caddr.String()] session, found := c.sessions[caddr.String()]
if !found { if !found {
session, err = newSession(caddr, c.raddr, c.proxyConn) session, err = newSession(caddr, c.raddr, c.proxyConn)
if err != nil { if err != nil {
log.Println(err) log.Error(err)
continue continue
} }