X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/aebc4d3647b9823ae8cbb57b21b1af83bfd011fb..9a75b7cbfa6fa37ed10732bbff8b722d652a1cdc:/hotline/user.go?ds=sidebyside

diff --git a/hotline/user.go b/hotline/user.go
index 00fe98c..5b1b705 100644
--- a/hotline/user.go
+++ b/hotline/user.go
@@ -2,16 +2,21 @@ package hotline
 
 import (
 	"encoding/binary"
-	"golang.org/x/crypto/bcrypt"
-	"log"
 )
 
-// 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 (
-	userFlagAway        = 0 // User is away
-	userFlagAdmin       = 1 // User is admin
-	userFlagRefusePM    = 2 // User refuses private messages
-	userFLagRefusePChat = 3 // User refuses private chat
+	UserFlagAway        = 0 // User is away
+	UserFlagAdmin       = 1 // User is admin
+	UserFlagRefusePM    = 2 // User refuses private messages
+	UserFlagRefusePChat = 3 // User refuses private chat
+)
+
+// FieldOptions flags are sent from v1.5+ clients as part of TranAgreed
+const (
+	refusePM     = 0 // User has "Refuse private messages" pref set
+	refuseChat   = 1 // User has "Refuse private chat" pref set
+	autoResponse = 2 // User has "Automatic response" pref set
 )
 
 type User struct {
@@ -51,37 +56,22 @@ func ReadUser(b []byte) (*User, error) {
 	return u, nil
 }
 
-// DecodeUserString decodes an obfuscated user string from a client
+// decodeString decodes an obfuscated user string from a client
 // e.g. 98 8a 9a 8c 8b => "guest"
-func DecodeUserString(obfuText []byte) (clearText string) {
+func decodeString(obfuText []byte) (clearText string) {
 	for _, char := range obfuText {
 		clearText += string(rune(255 - uint(char)))
 	}
 	return clearText
 }
 
-// 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!
-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]
 	}
 	return obfuText
 }
-
-func hashAndSalt(pwd []byte) string {
-	// Use GenerateFromPassword to hash & salt pwd.
-	// MinCost is just an integer constant provided by the bcrypt
-	// package along with DefaultCost & MaxCost.
-	// The cost can be any value you want provided it isn't lower
-	// than the MinCost (4)
-	hash, err := bcrypt.GenerateFromPassword(pwd, bcrypt.MinCost)
-	if err != nil {
-		log.Println(err)
-	}
-	// GenerateFromPassword returns a byte slice so we need to
-	// convert the bytes to a string and return it
-	return string(hash)
-}