mirrors_public/schollz_croc
0
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 13:21:00 +02:00
Code Activity

reduce complexity

Browse source
This commit is contained in:
Zack Scholl 2019-09-20 09:45:42 -07:00
parent 24abf4fdd8
commit 07c20e2cde
1 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/croc/croc.go
View file

@ -479,7 +479,7 @@ func (c *Client) transfer(options TransferOptions) (err error) {
return return
} }
func (c *Client) processMessageFileInfo(m message.Message) (err error) { func (c *Client) processMessageFileInfo(m message.Message) (done bool, err error) {
var senderInfo SenderInfo var senderInfo SenderInfo
err = json.Unmarshal(m.Bytes, &senderInfo) err = json.Unmarshal(m.Bytes, &senderInfo)
if err != nil { if err != nil {
@ -575,6 +575,34 @@ func (c *Client) procesMesssagePake(m message.Message) (err error) {
return return
} }
func (c *Client) processMessageSalt(m message.Message) (done bool, err error) {
log.Debug("received salt")
if !c.Options.IsSender {
log.Debug("sending salt back")
err = message.Send(c.conn[0], c.Key, message.Message{
Type: "salt",
Bytes: m.Bytes,
Message: c.ExternalIP,
})
}
log.Debugf("session key is verified, generating encryption with salt: %x", m.Bytes)
key, err := c.Pake.SessionKey()
if err != nil {
return true, err
}
c.Key, err = crypt.New(key, m.Bytes)
if err != nil {
return true, err
}
if c.ExternalIPConnected == "" {
// it can be preset by the local relay
c.ExternalIPConnected = m.Message
}
log.Debugf("connected as %s -> %s", c.ExternalIP, c.ExternalIPConnected)
c.Step1ChannelSecured = true
return
}
func (c *Client) processMessage(payload []byte) (done bool, err error) { func (c *Client) processMessage(payload []byte) (done bool, err error) {
m, err := message.Decode(c.Key, payload) m, err := message.Decode(c.Key, payload)
if err != nil { if err != nil {
@ -592,37 +620,14 @@ func (c *Client) processMessage(payload []byte) (done bool, err error) {
case "pake": case "pake":
err = c.procesMesssagePake(m) err = c.procesMesssagePake(m)
case "salt": case "salt":
log.Debug("received salt") done, err = c.processMessageSalt(m)
if !c.Options.IsSender {
log.Debug("sending salt back")
err = message.Send(c.conn[0], c.Key, message.Message{
Type: "salt",
Bytes: m.Bytes,
Message: c.ExternalIP,
})
}
log.Debugf("session key is verified, generating encryption with salt: %x", m.Bytes)
key, err := c.Pake.SessionKey()
if err != nil {
return true, err
}
c.Key, err = crypt.New(key, m.Bytes)
if err != nil {
return true, err
}
if c.ExternalIPConnected == "" {
// it can be preset by the local relay
c.ExternalIPConnected = m.Message
}
log.Debugf("connected as %s -> %s", c.ExternalIP, c.ExternalIPConnected)
c.Step1ChannelSecured = true
case "error": case "error":
// c.spinner.Stop() // c.spinner.Stop()
fmt.Print("\r") fmt.Print("\r")
err = fmt.Errorf("peer error: %s", m.Message) err = fmt.Errorf("peer error: %s", m.Message)
return true, err return true, err
case "fileinfo": case "fileinfo":
err = c.processMessageFileInfo(m) done, err = c.processMessageFileInfo(m)
case "recipientready": case "recipientready":
var remoteFile RemoteFileRequest var remoteFile RemoteFileRequest
err = json.Unmarshal(m.Bytes, &remoteFile) err = json.Unmarshal(m.Bytes, &remoteFile)