add optional encryption flag to login server and update ServeLogin behavior

cmd/strom/main.go

@@ -67,6 +67,7 @@ func Help(args []string) (err error) {
 func mainE() (err error) {
 	subcommands["help"] = Help
 	args := os.Args
+	args = []string{"TEST", "packet-spy", "-addr", "127.0.0.1:25571"}
 
 	if len(args) < 2 {
 		err = ExpectedASubcommandErr

cmd/strom/packet_inspector/main.go

@@ -102,7 +102,7 @@ func Run(args []string) (err error) {
 				return
 			}
 		}
-		_, err = server.ServeLogin(serveeConn, server.WithOtherAccount(acc), server.WithStatus(StatusResponse), server.WithoutOnlineMode())
+		_, err = server.ServeLogin(serveeConn, server.WithOtherAccount(acc), server.WithStatus(StatusResponse), server.WithoutOnlineMode(), server.WithoutEncryption())
 		if err != nil {
 			return
 		}

server/login_server.go

@@ -38,14 +38,14 @@ func (u UnexpectedNextStateError) Error() string {
 
 type LoginServer struct {
 	*proto.Conn
-	DontEncrypt, OnlineMode bool
-	ServerHost              string
-	ServerPort              uint16
-	Requested               NameAndUUID
-	Given                   *NameAndUUID
-	CompressionThreshold    int32
-	Status                  []byte
-	CompatibleVersions      []int32
+	Encryption, OnlineMode bool
+	ServerHost             string
+	ServerPort             uint16
+	Requested              NameAndUUID
+	Given                  *NameAndUUID
+	CompressionThreshold   int32
+	Status                 []byte
+	CompatibleVersions     []int32
 
 	ServerId       string // always empty for now
 	VerifyToken    []byte
@@ -107,7 +107,7 @@ func (l *LoginServer) OnLoginStart(packet *v1_21_8.LoginToServerPacketLoginStart
 	}
 
 	l.Requested = NameAndUUID{packet.Username, packet.PlayerUUID}
-	if !l.DontEncrypt {
+	if l.Encryption {
 		return l.Encrypt()
 	}
 	return l.FinishLogin()
@@ -241,9 +241,16 @@ func WithoutOnlineMode() LoginServerSetting {
 	}
 }
 
+func WithoutEncryption() LoginServerSetting {
+	return func(s *LoginServer) {
+		s.Encryption = false
+	}
+}
+
 func ServeLogin(c *proto.Conn, settings ...LoginServerSetting) (ret *LoginServer, err error) {
 	ret = &LoginServer{Conn: c}
 	ret.OnlineMode = true
+	ret.Encryption = true
 
 	ret.RegisterCritical(ret.OnDefault)
 	ret.RegisterCriticalUntilLatest(ret.OnHandshake)
@@ -255,6 +262,11 @@ func ServeLogin(c *proto.Conn, settings ...LoginServerSetting) (ret *LoginServer
 	for _, s := range settings {
 		s(ret)
 	}
+	if ret.OnlineMode && !ret.Encryption {
+		err = fmt.Errorf("online mode requires encryption")
+		return
+	}
+
 	ret.CompressionThreshold = 256
 	err = ret.StartConn()
 	return