Fix

Author: oq-x

protocol/net/authentication.go

@@ -18,13 +18,13 @@ func authurl(u, h string) string {
 	return "https://sessionserver.mojang.com/session/minecraft/hasJoined?username=" + u + "&serverId=" + h
 }
 
-func (c *Conn) authenticate() error {
-	key, err := x509.MarshalPKIXPublicKey(&c.listener.privKey.PublicKey)
+func (conn *Conn) authenticate() error {
+	key, err := x509.MarshalPKIXPublicKey(&conn.listener.privKey.PublicKey)
 	if err != nil {
 		return err
 	}
-	hash := c.sessionHash(key)
-	res, err := http.Get(authurl(c.username, hash))
+	hash := conn.sessionHash(key)
+	res, err := http.Get(authurl(conn.username, hash))
 	if err != nil {
 		return err
 	}
@@ -49,19 +49,19 @@ func (c *Conn) authenticate() error {
 		return err
 	}
 
-	c.username = response.Name
-	c.uuid, err = uuid.Parse(response.ID)
+	conn.username = response.Name
+	conn.uuid, err = uuid.Parse(response.ID)
 	if err != nil {
 		return err
 	}
-	c.properties = *(*[]login.Property)(unsafe.Pointer(&response.Properties))
+	conn.properties = *(*[]login.Property)(unsafe.Pointer(&response.Properties))
 
 	return nil
 }
 
-func (c *Conn) sessionHash(publicKey []byte) string {
+func (conn *Conn) sessionHash(publicKey []byte) string {
 	hash := sha1.New()
-	hash.Write(c.sharedSecret)
+	hash.Write(conn.sharedSecret)
 	hash.Write(publicKey)
 
 	sum := hash.Sum(nil)

protocol/net/config.go

@@ -12,12 +12,13 @@ import (
 type Config struct {
 	Status StatusProvider
 
-	IP                   net.IP
-	Port                 int
-	CompressionThreshold int32
-	Encrypt              bool
-	Authenticate         bool
-	AcceptTransfers      bool
+	PacketWriteChanBuffer int
+	IP                    net.IP
+	Port                  int
+	CompressionThreshold  int32
+	Encrypt               bool
+	Authenticate          bool
+	AcceptTransfers       bool
 }
 
 type StatusProvider func(*Conn) status.StatusResponseData

protocol/net/conn.go

@@ -55,6 +55,8 @@ type Conn struct {
 	usesForge bool
 	read_mu   sync.Mutex
 	write_mu  sync.Mutex
+
+	packetWriteChan chan packet.Encodeable
 }
 
 func (conn *Conn) UsesForge() bool {
@@ -347,6 +349,27 @@ func (conn *Conn) ReadPacket() (decoded packet.Decodeable, interceptionStopped b
 	}
 }
 
+// PushPacket adds a packet to the queue without waiting for it to be sent
+func (conn *Conn) PushPacket(pk packet.Encodeable) {
+	conn.packetWriteChan <- pk
+}
+
+func (conn *Conn) packetWriteChanListen() {
+	go func() {
+		for pk := range conn.packetWriteChan {
+			if conn.encrypted {
+				conn.write_mu.Lock()
+			}
+
+			conn.WritePacket(pk)
+
+			if conn.encrypted {
+				conn.write_mu.Unlock()
+			}
+		}
+	}()
+}
+
 func (conn *Conn) writeLegacyStatus(status status.StatusResponseData) {
 	protocolString := fmt.Sprint(status.Version.Protocol)
 	onlineString := fmt.Sprint(status.Players.Online)
@@ -487,7 +510,7 @@ func (conn *Conn) handleHandshake() bool {
 				return false
 			}
 			if conn.listener.cfg.Authenticate {
-				if err := conn.authenticate(); err != nil {
+				if err := conn.authenticate(); err != nil && conn.listener.cfg.Authenticate {
 					conn.WritePacket(&login.Disconnect{Reason: text.TextComponent{Text: "This server uses authenticated encryption mode, and you are using a cracked account."}})
 					return false
 				}
@@ -503,10 +526,9 @@ func (conn *Conn) handleHandshake() bool {
 		conn.compressionSet = true
 
 		suc := &login.LoginSuccess{
-			UUID:                conn.uuid,
-			Username:            conn.username,
-			Properties:          conn.properties,
-			StrictErrorHandling: true,
+			UUID:       conn.uuid,
+			Username:   conn.username,
+			Properties: conn.properties,
 		}
 		if err := conn.WritePacket(suc); err != nil {
 			return false

protocol/net/encryption.go

@@ -11,57 +11,57 @@ import (
 	"github.com/zeppelinmc/zeppelin/protocol/net/packet/login"
 )
 
-func (c *Conn) encryptd(plaintext, dst []byte) {
-	c.encrypter.XORKeyStream(dst, plaintext)
+func (conn *Conn) encryptd(plaintext, dst []byte) {
+	conn.encrypter.XORKeyStream(dst, plaintext)
 }
 
-func (c *Conn) decryptd(ciphertext, dst []byte) {
-	c.decrypter.XORKeyStream(dst, ciphertext)
+func (conn *Conn) decryptd(ciphertext, dst []byte) {
+	conn.decrypter.XORKeyStream(dst, ciphertext)
 }
 
-func (c *Conn) encrypt() error {
-	key, err := x509.MarshalPKIXPublicKey(&c.listener.privKey.PublicKey)
+func (conn *Conn) encrypt() error {
+	key, err := x509.MarshalPKIXPublicKey(&conn.listener.privKey.PublicKey)
 	if err != nil {
 		return err
 	}
 
 	verifyToken := make([]byte, 4)
 	rand.Read(verifyToken)
 
-	c.WritePacket(&login.EncryptionRequest{
+	conn.WritePacket(&login.EncryptionRequest{
 		PublicKey:          key,
 		VerifyToken:        verifyToken,
-		ShouldAuthenticate: c.listener.cfg.Authenticate,
+		ShouldAuthenticate: conn.listener.cfg.Authenticate,
 	})
-	p, s, err := c.ReadPacket()
+	p, s, err := conn.ReadPacket()
 	if err != nil || s {
 		return err
 	}
 	res, ok := p.(*login.EncryptionResponse)
 	if !ok {
 		return fmt.Errorf("unsuccessful encryption")
 	}
-	c.encrypted = ok
+	conn.encrypted = ok
 
-	c.sharedSecret, err = rsa.DecryptPKCS1v15(nil, c.listener.privKey, res.SharedSecret)
+	conn.sharedSecret, err = rsa.DecryptPKCS1v15(nil, conn.listener.privKey, res.SharedSecret)
 	if err != nil {
 		return err
 	}
-	c.verifyToken, err = rsa.DecryptPKCS1v15(nil, c.listener.privKey, res.VerifyToken)
+	conn.verifyToken, err = rsa.DecryptPKCS1v15(nil, conn.listener.privKey, res.VerifyToken)
 	if err != nil {
 		return err
 	}
 
-	if [4]byte(c.verifyToken) != [4]byte(verifyToken) {
+	if [4]byte(conn.verifyToken) != [4]byte(verifyToken) {
 		return fmt.Errorf("unsuccessful encryption")
 	}
 
-	block, err := aes.NewCipher(c.sharedSecret)
+	block, err := aes.NewCipher(conn.sharedSecret)
 	if err != nil {
 		return err
 	}
-	c.encrypter = cfb8.NewCFB8(block, c.sharedSecret, false)
-	c.decrypter = cfb8.NewCFB8(block, c.sharedSecret, true)
+	conn.encrypter = cfb8.NewCFB8(block, conn.sharedSecret, false)
+	conn.decrypter = cfb8.NewCFB8(block, conn.sharedSecret, true)
 
 	return nil
 }

protocol/net/io/encoding/encoding.go

@@ -81,7 +81,7 @@ func VarInt(data []byte) (int32, []byte, error) {
 		currentByte = data[0]
 		data = data[1:]
 
-		value |= int32((currentByte & 127)) << position
+		value |= int32(currentByte&127) << position
 
 		if (currentByte & 128) == 0 {
 			break
@@ -99,10 +99,10 @@ func VarInt(data []byte) (int32, []byte, error) {
 
 func ReadVarInt(r io.Reader) (int32, error) {
 	var (
-		position     int32
-		currentByte  byte
-		CONTINUE_BIT byte = 128
-		SEGMENT_BITS byte = 127
+		position    int32
+		currentByte byte
+		continueBit byte = 128
+		segmentBits byte = 127
 
 		value int32
 	)
@@ -112,9 +112,9 @@ func ReadVarInt(r io.Reader) (int32, error) {
 			return value, err
 		}
 
-		value |= int32((currentByte & SEGMENT_BITS)) << position
+		value |= int32(currentByte&segmentBits) << position
 
-		if (currentByte & CONTINUE_BIT) == 0 {
+		if (currentByte & continueBit) == 0 {
 			break
 		}
 
@@ -130,15 +130,15 @@ func ReadVarInt(r io.Reader) (int32, error) {
 
 func AppendVarLong(data []byte, value int64) []byte {
 	var (
-		CONTINUE_BIT int64 = 128
-		SEGMENT_BITS int64 = 127
+		continueBit int64 = 128
+		segmentBits int64 = 127
 	)
 	for {
-		if (value & ^SEGMENT_BITS) == 0 {
+		if (value & ^segmentBits) == 0 {
 			return append(data, byte(value))
 		}
 
-		data = append(data, byte((value&SEGMENT_BITS)|CONTINUE_BIT))
+		data = append(data, byte((value&segmentBits)|continueBit))
 
 		value >>= 7
 	}
@@ -180,7 +180,7 @@ func (set FixedBitSet) Get(i int) bool {
 }
 
 func (set FixedBitSet) Set(i int) {
-	set[i/8] |= (1 << (i % 8))
+	set[i/8] |= 1 << (i % 8)
 }
 
 func (set FixedBitSet) Unset(i int) {

protocol/net/listener.go

@@ -4,6 +4,7 @@ package net
 import (
 	"crypto/rsa"
 	"fmt"
+	"github.com/zeppelinmc/zeppelin/protocol/net/packet"
 	"net"
 
 	"github.com/zeppelinmc/zeppelin/protocol/text"
@@ -63,6 +64,8 @@ func (l *Listener) newConn(c net.Conn) *Conn {
 	conn := &Conn{
 		Conn:     c,
 		listener: l,
+
+		packetWriteChan: make(chan packet.Encodeable, l.cfg.PacketWriteChanBuffer),
 	}
 
 	return conn

protocol/net/metadata/metadata.go

@@ -126,7 +126,7 @@ const (
 	IsInRiptideSpinAttack
 )
 
-// base entity
+// base state
 const (
 	// Byte (0)
 	BaseIndex = iota
@@ -146,7 +146,7 @@ const (
 	TicksFrozenInPowderedSnowIndex
 )
 
-// living entity extends entity
+// living state extends state
 const (
 	// Byte (0)
 	LivingEntityHandstatesIndex = iota + 8
@@ -164,7 +164,7 @@ const (
 	LivingEntitySleepingBedPositionIndex
 )
 
-// player extends living entity
+// player extends living state
 const (
 	// Float (3)
 	PlayerAdditionalHeartsIndex = iota + 15

protocol/net/metadata/new.go

@@ -0,0 +1,29 @@
+package metadata
+
+// Player returns the default player metadata object
+func Player(health float32) Metadata {
+	return Metadata{
+		// Entity
+		BaseIndex:                      Byte(0),
+		AirTicksIndex:                  VarInt(300),
+		CustomNameIndex:                OptionalTextComponent(nil),
+		IsCustomNameVisibleIndex:       Boolean(false),
+		IsSilentIndex:                  Boolean(false),
+		HasNoGravityIndex:              Boolean(false),
+		PoseIndex:                      Standing,
+		TicksFrozenInPowderedSnowIndex: VarInt(0),
+		// Living Entity extends Entity
+		LivingEntityHandstatesIndex: Byte(0),
+		LivingEntityHealthIndex:     Float(health), // this one is actually stored in data (others are too but arent used yet)
+		//LivingEntityPotionEffectColorIndex:   VarInt(0),
+		LivingEntityPotionEffectAmbientIndex: Boolean(false),
+		LivingEntityArrowCountIndex:          VarInt(0),
+		LivingEntityBeeStingersCountIndex:    VarInt(0),
+		LivingEntitySleepingBedPositionIndex: OptionalPosition(nil),
+		// Player extends Living Entity
+		PlayerAdditionalHeartsIndex:   Float(0),
+		PlayerScoreIndex:              VarInt(0),
+		PlayerDisplayedSkinPartsIndex: Byte(0),
+		PlayerMainHandIndex:           Byte(1),
+	}
+}