zmv7/minetest_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add skip first SRP to prevent auth failure

Browse Source
This commit is contained in:
zmv7 2022-05-04 10:07:53 +05:00 committed by GitHub
parent 8e3f4479ca
commit c7ca96ed43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client_handler.go
View File

@ -16,6 +16,7 @@ type ClientHandler struct {
DownloadMedia bool DownloadMedia bool
Password string Password string
StalkMode bool StalkMode bool
SkipSRP int
SRPPubA []byte SRPPubA []byte
SRPPrivA []byte SRPPrivA []byte
MediaHashes map[string][]byte MediaHashes map[string][]byte
@ -29,7 +30,7 @@ func (ch *ClientHandler) HandlerLoop(cmd_chan chan commands.Command) {
} }
} }
} }
var isdone = false
func (ch *ClientHandler) handleCommand(o interface{}) error { func (ch *ClientHandler) handleCommand(o interface{}) error {
switch cmd := o.(type) { switch cmd := o.(type) {
case *commands.ServerSetPeer: case *commands.ServerSetPeer:
@ -39,12 +40,9 @@ func (ch *ClientHandler) handleCommand(o interface{}) error {
if err != nil { if err != nil {
return err return err
} }
if cmd.PeerID > 1000 {
isdone = false
} else {
isdone = true
}
case *commands.ServerHello: case *commands.ServerHello:
fmt.Printf("Server sent 'HELLO'\n")
packet.ResetSeqNr(65500) packet.ResetSeqNr(65500)
if ch.StalkMode { if ch.StalkMode {
return nil return nil
@ -57,14 +55,15 @@ isdone = true
if err != nil { if err != nil {
return err return err
} }
if isdone == true { if ch.SkipSRP <= 0 {
fmt.Printf("Sending SRP bytes A, len=%d\n", len(ch.SRPPubA)) fmt.Printf("Sending SRP bytes A, len=%d\n", len(ch.SRPPubA))
err = ch.Client.SendCommand(commands.NewClientSRPBytesA(ch.SRPPubA)) err = ch.Client.SendCommand(commands.NewClientSRPBytesA(ch.SRPPubA))
if err != nil { if err != nil {
return err return err
} }
} else {
ch.SkipSRP = ch.SkipSRP - 1
} }
isdone = true
} }
if cmd.AuthMechanismFirstSRP { if cmd.AuthMechanismFirstSRP {
// new client // new client