seang96/gmessages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move some things out of payload package

Browse source
This commit is contained in:
Tulir Asokan 2023-07-16 02:16:10 +03:00
parent abb2c8a21f
commit 5d7edac1e8
3 changed files with 26 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
libgm/pair.go
View file

@ -90,7 +90,14 @@ func (p *Pairer) startRefreshRelayTask() {
} }
func (p *Pairer) RefreshPhoneRelay() { func (p *Pairer) RefreshPhoneRelay() {
body, _, err := payload.RefreshPhoneRelay(p.client.authData.TachyonAuthToken) body, err := proto.Marshal(&binary.AuthenticationContainer{
AuthMessage: &binary.AuthMessage{
RequestID: util.RandomUUIDv4(),
Network: &payload.Network,
TachyonAuthToken: p.client.authData.TachyonAuthToken,
ConfigVersion: payload.ConfigMessage,
},
})
if err != nil { if err != nil {
p.client.Logger.Err(err).Msg("refresh phone relay err") p.client.Logger.Err(err).Msg("refresh phone relay err")
return return
@ -120,30 +127,30 @@ func (p *Pairer) RefreshPhoneRelay() {
} }
func (c *Client) GetWebEncryptionKey() (*binary.WebEncryptionKeyResponse, error) { func (c *Client) GetWebEncryptionKey() (*binary.WebEncryptionKeyResponse, error) {
body, rawData, err1 := payload.GetWebEncryptionKey(c.authData.TachyonAuthToken) body, err := proto.Marshal(&binary.AuthenticationContainer{
if err1 != nil { AuthMessage: &binary.AuthMessage{
c.Logger.Err(err1).Msg("web encryption key err") RequestID: uuid.NewString(),
return nil, err1 TachyonAuthToken: c.authData.TachyonAuthToken,
ConfigVersion: payload.ConfigMessage,
},
})
if err != nil {
return nil, err
} }
c.Logger.Debug().Any("keyByteLength", len(rawData.AuthMessage.TachyonAuthToken)).Any("json", rawData).Any("base64", body).Msg("GetWebEncryptionKey Payload") webKeyResponse, err := c.MakeRelayRequest(util.GET_WEB_ENCRYPTION_KEY, body)
webKeyResponse, reqErr := c.MakeRelayRequest(util.GET_WEB_ENCRYPTION_KEY, body) if err != nil {
if reqErr != nil { return nil, err
c.Logger.Err(reqErr).Msg("Web encryption key request err")
return nil, reqErr
} }
responseBody, err2 := io.ReadAll(webKeyResponse.Body) responseBody, err := io.ReadAll(webKeyResponse.Body)
defer webKeyResponse.Body.Close() defer webKeyResponse.Body.Close()
if err2 != nil { if err != nil {
c.Logger.Err(err2).Msg("Web encryption key read response err") return nil, err
return nil, err2
} }
parsedResponse := &binary.WebEncryptionKeyResponse{} parsedResponse := &binary.WebEncryptionKeyResponse{}
err2 = proto.Unmarshal(responseBody, parsedResponse) err = proto.Unmarshal(responseBody, parsedResponse)
if err2 != nil { if err != nil {
c.Logger.Err(err2).Msg("Parse webkeyresponse into proto struct error") return nil, err
return nil, err2
} }
c.Logger.Debug().Any("webenckeyresponse", parsedResponse).Msg("Web encryption key")
if c.pairer != nil { if c.pairer != nil {
if c.pairer.ticker != nil { if c.pairer.ticker != nil {
c.pairer.ticker.Stop() c.pairer.ticker.Stop()

24
libgm/payload/getWebEncryptionKey.go
View file

@ -1,24 +0,0 @@
package payload
import (
"google.golang.org/protobuf/proto"
"go.mau.fi/mautrix-gmessages/libgm/binary"
"go.mau.fi/mautrix-gmessages/libgm/util"
)
func GetWebEncryptionKey(WebPairKey []byte) ([]byte, *binary.AuthenticationContainer, error) {
id := util.RandomUUIDv4()
payload := &binary.AuthenticationContainer{
AuthMessage: &binary.AuthMessage{
RequestID: id,
TachyonAuthToken: WebPairKey,
ConfigVersion: ConfigMessage,
},
}
encodedPayload, err2 := proto.Marshal(payload)
if err2 != nil {
return nil, payload, err2
}
return encodedPayload, payload, nil
}

24
libgm/payload/refreshPhoneRelay.go
View file

@ -1,24 +0,0 @@
package payload
import (
"google.golang.org/protobuf/proto"
"go.mau.fi/mautrix-gmessages/libgm/binary"
"go.mau.fi/mautrix-gmessages/libgm/util"
)
func RefreshPhoneRelay(rpcKey []byte) ([]byte, *binary.AuthenticationContainer, error) {
payload := &binary.AuthenticationContainer{
AuthMessage: &binary.AuthMessage{
RequestID: util.RandomUUIDv4(),
Network: &Network,
TachyonAuthToken: rpcKey,
ConfigVersion: ConfigMessage,
},
}
encodedPayload, err2 := proto.Marshal(payload)
if err2 != nil {
return nil, payload, err2
}
return encodedPayload, payload, nil
}