Fix broken io.Reader implementations

[rbdr/mobius] / hotline / user.go

diff --git a/hotline/user.go b/hotline/user.go
index 5d09b2d449e069fc0f9ffaa296e6567ccd510248..02deb31a9475eb6f681ebdef4c0344a31b42e3ca 100644 (file)
--- a/hotline/user.go
+++ b/hotline/user.go
@@ -2,14 +2,23 @@ package hotline
 
 import (
        "encoding/binary"
 
 import (
        "encoding/binary"

+       "io"
+       "slices"

 )
 
 )
 

-// User flags are stored as a 2 byte bitmap with the following values:
+// User flags are stored as a 2 byte bitmap and represent various user states

 const (
 const (

-       userFlagAway        = 0 // User is away
-       userFlagAdmin       = 1 // User is admin
-       userFlagRefusePM    = 2 // User refuses private messages
-       userFLagRefusePChat = 3 // User refuses private chat
+       UserFlagAway        = iota // User is away
+       UserFlagAdmin              // User is admin
+       UserFlagRefusePM           // User refuses private messages
+       UserFlagRefusePChat        // User refuses private chat
+)
+
+// FieldOptions flags are sent from v1.5+ clients as part of TranAgreed
+const (
+       UserOptRefusePM     = iota // User has "Refuse private messages" pref set
+       UserOptRefuseChat          // User has "Refuse private chat" pref set
+       UserOptAutoResponse        // User has "Automatic response" pref set

 )
 
 type User struct {
 )
 
 type User struct {


@@ -17,9 +26,11 @@ type User struct {
        Icon  []byte // Size 2
        Flags []byte // Size 2
        Name  string // Variable length user name
        Icon  []byte // Size 2
        Flags []byte // Size 2
        Name  string // Variable length user name

+
+       readOffset int // Internal offset to track read progress

 }
 
 }
 

-func (u User) Payload() []byte {
+func (u *User) Read(p []byte) (int, error) {

        nameLen := make([]byte, 2)
        binary.BigEndian.PutUint16(nameLen, uint16(len(u.Name)))
 
        nameLen := make([]byte, 2)
        binary.BigEndian.PutUint16(nameLen, uint16(len(u.Name)))
 


@@ -31,37 +42,37 @@ func (u User) Payload() []byte {
                u.Flags = u.Flags[2:]
        }
 
                u.Flags = u.Flags[2:]
        }
 

-       out := append(u.ID[:2], u.Icon[:2]...)
-       out = append(out, u.Flags[:2]...)
-       out = append(out, nameLen...)
-       out = append(out, u.Name...)
-
-       return out
-}
+       b := slices.Concat(
+               u.ID,
+               u.Icon,
+               u.Flags,
+               nameLen,
+               []byte(u.Name),
+       )

 
 

-func ReadUser(b []byte) (*User, error) {
-       u := &User{
-               ID:    b[0:2],
-               Icon:  b[2:4],
-               Flags: b[4:6],
-               Name:  string(b[8:]),
+       if u.readOffset >= len(b) {
+               return 0, io.EOF // All bytes have been read

        }
        }

-       return u, nil
+
+       n := copy(p, b)
+
+       return n, io.EOF

 }
 
 }
 

-// DecodeUserString decodes an obfuscated user string from a client
-// e.g. 98 8a 9a 8c 8b => "guest"
-func DecodeUserString(obfuText []byte) (clearText string) {
-       for _, char := range obfuText {
-               clearText += string(rune(255 - uint(char)))
-       }
-       return clearText
+func (u *User) Write(p []byte) (int, error) {
+       namelen := int(binary.BigEndian.Uint16(p[6:8]))
+       u.ID = p[0:2]
+       u.Icon = p[2:4]
+       u.Flags = p[4:6]
+       u.Name = string(p[8 : 8+namelen])
+
+       return 8 + namelen, nil

 }
 
 }
 

-// negateString takes []byte s containing cleartext and rotates by 255 into obfuscated cleartext.
+// encodeString takes []byte s containing cleartext and rotates by 255 into obfuscated cleartext.

 // The Hotline protocol uses this format for sending passwords over network.
 // Not secure, but hey, it was the 90s!
 // The Hotline protocol uses this format for sending passwords over network.
 // Not secure, but hey, it was the 90s!

-func negateString(clearText []byte) []byte {
+func encodeString(clearText []byte) []byte {

        obfuText := make([]byte, len(clearText))
        for i := 0; i < len(clearText); i++ {
                obfuText[i] = 255 - clearText[i]
        obfuText := make([]byte, len(clearText))
        for i := 0; i < len(clearText); i++ {
                obfuText[i] = 255 - clearText[i]