falloutBot/go-mc
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #206

Browse Source
This commit is contained in:
Tnze
2022-06-14 13:15:57 +08:00
parent 780260c3bf
commit 44703ce940
12 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bot/basic/events.go
View File

@ -1,9 +1,10 @@
package basic
import (
"github.com/google/uuid"
"time"
"github.com/google/uuid"
"github.com/Tnze/go-mc/bot"
"github.com/Tnze/go-mc/chat"
"github.com/Tnze/go-mc/data/packetid"

21
bot/basic/info.go
View File

@ -1,7 +1,6 @@
package basic
import (
"golang.org/x/exp/slices"
"unsafe"
"github.com/Tnze/go-mc/data/packetid"
@ -49,7 +48,7 @@ type Dimension struct {
} `nbt:"element"`
}
type DimensionCodec struct {
// What is Below? (wik.vg)
// What is Below? (wiki.vg)
ChatType struct {
Type string `nbt:"type"`
Value []struct {
@ -173,11 +172,10 @@ func (p *Player) handleLoginPacket(packet pk.Packet) error {
// p.WorldNames[i] = string(v)
// }
p.WorldNames = *(*[]string)(unsafe.Pointer(&WorldNames))
index := slices.IndexFunc(p.DimensionCodec.DimensionType.Value, func(d Dimension) bool {
return d.Name == string(currentDimension)
})
if index != -1 {
p.Dimension = p.DimensionCodec.DimensionType.Value[index]
for _, d := range p.DimensionCodec.DimensionType.Value {
if d.Name == string(currentDimension) {
p.Dimension = d
}
}
err = p.c.Conn.WritePacket(pk.Marshal( //PluginMessage packet
@ -221,11 +219,10 @@ func (p *Player) handleRespawnPacket(packet pk.Packet) error {
if err != nil {
return Error{err}
}
index := slices.IndexFunc(p.DimensionCodec.DimensionType.Value, func(d Dimension) bool {
return d.Name == string(currentDimension)
})
if index != -1 {
p.Dimension = p.DimensionCodec.DimensionType.Value[index]
for _, d := range p.DimensionCodec.DimensionType.Value {
if d.Name == string(currentDimension) {
p.Dimension = d
}
}
return nil
}

4
bot/client.go
View File

@ -2,7 +2,7 @@ package bot
import (
"github.com/Tnze/go-mc/net"
"github.com/Tnze/go-mc/yggdrasil/userApi"
"github.com/Tnze/go-mc/yggdrasil/user"
"github.com/google/uuid"
)
@ -10,7 +10,7 @@ import (
type Client struct {
Conn *net.Conn
Auth Auth
KeyPair *userApi.KeyPairResp
KeyPair user.KeyPairResp
Name string
UUID uuid.UUID

19
bot/login.go
View File

@ -13,14 +13,13 @@ import (
"encoding/json"
"encoding/pem"
"fmt"
"github.com/Tnze/go-mc/yggdrasil/userApi"
randN "golang.org/x/exp/rand"
"io"
"net/http"
"strings"
"github.com/Tnze/go-mc/net/CFB8"
pk "github.com/Tnze/go-mc/net/packet"
"github.com/Tnze/go-mc/yggdrasil/user"
)
// Auth includes an account
@ -47,7 +46,7 @@ func handleEncryptionRequest(c *Client, p pk.Packet) error {
// 响应加密请求
// Write Encryption Key Response
p, err = genEncryptionKeyResponse(key, er.PublicKey, er.VerifyToken, c.KeyPair)
p, err = genEncryptionKeyResponse(key, er.PublicKey, er.VerifyToken, &c.KeyPair)
if err != nil {
return fmt.Errorf("gen encryption key response fail: %v", err)
}
@ -182,7 +181,7 @@ func newSymmetricEncryption() (key []byte, encoStream, decoStream cipher.Stream)
return
}
func genEncryptionKeyResponse(shareSecret, publicKey, verifyToken []byte, keyPair *userApi.KeyPairResp) (erp pk.Packet, err error) {
func genEncryptionKeyResponse(shareSecret, publicKey, verifyToken []byte, keyPair *user.KeyPairResp) (erp pk.Packet, err error) {
iPK, err := x509.ParsePKIXPublicKey(publicKey) // Decode Public Key
if err != nil {
err = fmt.Errorf("decode public key fail: %v", err)
@ -202,14 +201,16 @@ func genEncryptionKeyResponse(shareSecret, publicKey, verifyToken []byte, keyPai
return erp, err
}
l := randN.Int63()
var b bytes.Buffer
pk.Long(l).WriteTo(&b)
var l pk.Long
if _, err := l.ReadFrom(rand.Reader); err != nil {
err = fmt.Errorf("generate random number fail: %v", err)
return erp, err
}
key := privateKey.(*rsa.PrivateKey)
hash := sha256.New()
hash.Write(verifyToken)
hash.Write(b.Bytes())
_, _ = l.WriteTo(hash)
signedData, err := key.Sign(rand.Reader, hash.Sum(nil), crypto.SHA256)
if err != nil {
err = fmt.Errorf("sign verifyToken fail: %v", err)
@ -219,7 +220,7 @@ func genEncryptionKeyResponse(shareSecret, publicKey, verifyToken []byte, keyPai
0x01,
pk.ByteArray(cryptPK),
pk.Boolean(false),
pk.Long(l),
l,
pk.ByteArray(signedData),
), nil
} else {

6
bot/mcbot.go
View File

@ -9,7 +9,6 @@ import (
"encoding/base64"
"encoding/pem"
"errors"
"github.com/Tnze/go-mc/yggdrasil/userApi"
"net"
"strconv"
@ -17,6 +16,7 @@ import (
"github.com/Tnze/go-mc/data/packetid"
mcnet "github.com/Tnze/go-mc/net"
pk "github.com/Tnze/go-mc/net/packet"
"github.com/Tnze/go-mc/yggdrasil/user"
)
// ProtocolVersion is the protocol version number of minecraft net protocol
@ -75,7 +75,7 @@ func (c *Client) join(ctx context.Context, d *mcnet.Dialer, addr string) error {
return LoginErr{"handshake", err}
}
// Login Start
pair, err := userApi.GetOrFetchKeyPair(c.Auth.AsTk)
pair, err := user.GetOrFetchKeyPair(c.Auth.AsTk)
if err != nil {
// (No Signature)
err = c.Conn.WritePacket(pk.Marshal(
@ -101,7 +101,7 @@ func (c *Client) join(ctx context.Context, d *mcnet.Dialer, addr string) error {
if err != nil {
return LoginErr{"login start (with sig)", err}
}
c.KeyPair = &pair
c.KeyPair = pair
}
for {
//Receive Packet