hrfee
/
jfa-go
mirror of https://github.com/hrfee/jfa-go.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

matrix: remove crypto dep in main file

This commit is contained in:
Harvey Tindall 2021-07-16 17:11:17 +01:00
parent 1336a87ae2
commit f04411e137
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix.go
View File

@ -7,7 +7,6 @@ import (
"github.com/gomarkdown/markdown" "github.com/gomarkdown/markdown"
"maunium.net/go/mautrix" "maunium.net/go/mautrix"
"maunium.net/go/mautrix/crypto"
"maunium.net/go/mautrix/event" "maunium.net/go/mautrix/event"
"maunium.net/go/mautrix/id" "maunium.net/go/mautrix/id"
) )
@ -21,8 +20,7 @@ type MatrixDaemon struct {
languages map[id.RoomID]string // Map of roomIDs to language codes languages map[id.RoomID]string // Map of roomIDs to language codes
Encryption bool Encryption bool
isEncrypted map[id.RoomID]bool isEncrypted map[id.RoomID]bool
cryptoStore *crypto.GobStore crypto Crypto
olm *crypto.OlmMachine
app *appContext app *appContext
start int64 start int64
} }

38
matrix_crypto.go
View File

@ -12,6 +12,11 @@ import (
"maunium.net/go/mautrix/id" "maunium.net/go/mautrix/id"
) )
type Crypto struct {
cryptoStore *crypto.GobStore
olm *crypto.OlmMachine
}
func MatrixE2EE() bool { return true } func MatrixE2EE() bool { return true }
type stateStore struct { type stateStore struct {
@ -105,13 +110,16 @@ func InitMatrixCrypto(d *MatrixDaemon) (err error) {
// if err != nil { // if err != nil {
// return // return
// } // }
d.olm = crypto.NewOlmMachine(d.bot, olmLog, cryptoStore, &stateStore{&d.isEncrypted}) olm := crypto.NewOlmMachine(d.bot, olmLog, cryptoStore, &stateStore{&d.isEncrypted})
d.olm.AllowUnverifiedDevices = true olm.AllowUnverifiedDevices = true
err = d.olm.Load() err = d.crypto.olm.Load()
if err != nil { if err != nil {
return return
} }
d.cryptoStore = cryptoStore d.crypto = Crypto{
cryptoStore: cryptoStore,
olm: olm,
}
return return
} }
@ -120,11 +128,11 @@ func HandleSyncerCrypto(startTime int64, d *MatrixDaemon, syncer *mautrix.Defaul
return return
} }
syncer.OnSync(func(resp *mautrix.RespSync, since string) bool { syncer.OnSync(func(resp *mautrix.RespSync, since string) bool {
d.olm.ProcessSyncResponse(resp, since) d.crypto.olm.ProcessSyncResponse(resp, since)
return true return true
}) })
syncer.OnEventType(event.StateMember, func(source mautrix.EventSource, evt *event.Event) { syncer.OnEventType(event.StateMember, func(source mautrix.EventSource, evt *event.Event) {
d.olm.HandleMemberEvent(evt) d.crypto.olm.HandleMemberEvent(evt)
// if evt.Content.AsMember().Membership != event.MembershipJoin { // if evt.Content.AsMember().Membership != event.MembershipJoin {
// return // return
// } // }
@ -133,7 +141,7 @@ func HandleSyncerCrypto(startTime int64, d *MatrixDaemon, syncer *mautrix.Defaul
// fmt.Println("FS", err) // fmt.Println("FS", err)
// return // return
// } // }
// err = d.olm.ShareGroupSession(evt.RoomID, userIDs) // err = d.crypto.olm.ShareGroupSession(evt.RoomID, userIDs)
// if err != nil { // if err != nil {
// fmt.Println("FS", err) // fmt.Println("FS", err)
// return // return
@ -143,8 +151,8 @@ func HandleSyncerCrypto(startTime int64, d *MatrixDaemon, syncer *mautrix.Defaul
if evt.Timestamp < startTime { if evt.Timestamp < startTime {
return return
} }
fmt.Printf("%+v\n", d.cryptoStore.GroupSessions) fmt.Printf("%+v\n", d.crypto.cryptoStore.GroupSessions)
decrypted, err := d.olm.DecryptMegolmEvent(evt) decrypted, err := d.crypto.olm.DecryptMegolmEvent(evt)
if err != nil { if err != nil {
d.app.err.Printf("Failed to decrypt Matrix message: %v", err) d.app.err.Printf("Failed to decrypt Matrix message: %v", err)
return return
@ -155,7 +163,7 @@ func HandleSyncerCrypto(startTime int64, d *MatrixDaemon, syncer *mautrix.Defaul
func CryptoShutdown(d *MatrixDaemon) { func CryptoShutdown(d *MatrixDaemon) {
if d.Encryption { if d.Encryption {
d.olm.FlushStore() d.crypto.olm.FlushStore()
} }
} }
@ -181,7 +189,7 @@ func EncryptRoom(d *MatrixDaemon, room *mautrix.RespCreateRoom, userID id.UserID
return return
} }
userIDs = append(userIDs, userID) userIDs = append(userIDs, userID)
err = d.olm.ShareGroupSession(room.RoomID, userIDs) err = d.crypto.olm.ShareGroupSession(room.RoomID, userIDs)
return return
} }
@ -191,19 +199,19 @@ func SendEncrypted(d *MatrixDaemon, content *event.MessageEventContent, roomID i
return return
} }
var encrypted *event.EncryptedEventContent var encrypted *event.EncryptedEventContent
encrypted, err = d.olm.EncryptMegolmEvent(roomID, event.EventMessage, content) encrypted, err = d.crypto.olm.EncryptMegolmEvent(roomID, event.EventMessage, content)
if err == crypto.SessionExpired || err == crypto.SessionNotShared || err == crypto.NoGroupSession { if err == crypto.SessionExpired || err == crypto.SessionNotShared || err == crypto.NoGroupSession {
// err = d.olm.ShareGroupSession(id.RoomID(user.RoomID), []id.UserID{id.UserID(user.UserID), d.userID}) // err = d.crypto.olm.ShareGroupSession(id.RoomID(user.RoomID), []id.UserID{id.UserID(user.UserID), d.userID})
var userIDs []id.UserID var userIDs []id.UserID
userIDs, err = d.getUserIDs(roomID) userIDs, err = d.getUserIDs(roomID)
if err != nil { if err != nil {
return return
} }
err = d.olm.ShareGroupSession(roomID, userIDs) err = d.crypto.olm.ShareGroupSession(roomID, userIDs)
if err != nil { if err != nil {
return return
} }
encrypted, err = d.olm.EncryptMegolmEvent(roomID, event.EventMessage, content) encrypted, err = d.crypto.olm.EncryptMegolmEvent(roomID, event.EventMessage, content)
} }
if err != nil { if err != nil {
return return

2
matrix_nocrypto.go
View File

@ -8,6 +8,8 @@ import (
"maunium.net/go/mautrix/id" "maunium.net/go/mautrix/id"
) )
type Crypto struct{}
func MatrixE2EE() bool { return false } func MatrixE2EE() bool { return false }
func InitMatrixCrypto(d *MatrixDaemon) (err error) { func InitMatrixCrypto(d *MatrixDaemon) (err error) {