From 0e8e81a6078a98803f1012882f8c176fd3b5204e Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Mon, 27 Apr 2020 00:38:04 +0300
Subject: Add support for decrypting messages

---
 matrix/matrix.go     | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 matrix/rooms/room.go |  2 +-
 matrix/sync.go       | 45 ++++++++++++++++++++++++++++++++-------------
 3 files changed, 80 insertions(+), 15 deletions(-)

(limited to 'matrix')

diff --git a/matrix/matrix.go b/matrix/matrix.go
index d0fd2f4..8804103 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -37,6 +37,7 @@ import (
 	"github.com/pkg/errors"
 
 	"maunium.net/go/mautrix"
+	"maunium.net/go/mautrix/crypto"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/format"
 	"maunium.net/go/mautrix/id"
@@ -55,6 +56,7 @@ import (
 // It is used for all Matrix calls from the UI and Matrix event handlers.
 type Container struct {
 	client  *mautrix.Client
+	crypto  *crypto.OlmMachine
 	syncer  *GomuksSyncer
 	gmx     ifc.Gomuks
 	ui      ifc.GomuksUI
@@ -88,6 +90,24 @@ func (log mxLogger) Debugfln(message string, args ...interface{}) {
 	debug.Printf("[Matrix] "+message, args...)
 }
 
+type cryptoLogger struct{}
+
+func (c cryptoLogger) Error(message string, args ...interface{}) {
+	debug.Printf("[Crypto/Error] "+message, args...)
+}
+
+func (c cryptoLogger) Warn(message string, args ...interface{}) {
+	debug.Printf("[Crypto/Warn] "+message, args...)
+}
+
+func (c cryptoLogger) Debug(message string, args ...interface{}) {
+	debug.Printf("[Crypto/Debug] "+message, args...)
+}
+
+func (c cryptoLogger) Trace(message string, args ...interface{}) {
+	debug.Printf("[Crypto/Trace] "+message, args...)
+}
+
 // InitClient initializes the mautrix client and connects to the homeserver specified in the config.
 func (c *Container) InitClient() error {
 	if len(c.config.HS) == 0 {
@@ -97,6 +117,7 @@ func (c *Container) InitClient() error {
 	if c.client != nil {
 		c.Stop()
 		c.client = nil
+		c.crypto = nil
 	}
 
 	var mxid id.UserID
@@ -112,6 +133,17 @@ func (c *Container) InitClient() error {
 		return err
 	}
 	c.client.Logger = mxLogger{}
+	c.client.DeviceID = c.config.DeviceID
+
+	cryptoStore, err := crypto.NewGobStore(filepath.Join(c.config.CacheDir, "crypto.gob"))
+	if err != nil {
+		return err
+	}
+	c.crypto = crypto.NewOlmMachine(c.client, cryptoLogger{}, cryptoStore)
+	err = c.crypto.Load()
+	if err != nil {
+		return err
+	}
 
 	if c.history == nil {
 		c.history, err = NewHistoryManager(c.config.HistoryPath)
@@ -159,7 +191,9 @@ func (c *Container) PasswordLogin(user, password string) error {
 
 func (c *Container) finishLogin(resp *mautrix.RespLogin) {
 	c.client.SetCredentials(resp.UserID, resp.AccessToken)
+	c.client.DeviceID = resp.DeviceID
 	c.config.UserID = resp.UserID
+	c.config.DeviceID = resp.DeviceID
 	c.config.AccessToken = resp.AccessToken
 	c.config.Save()
 
@@ -250,6 +284,7 @@ func (c *Container) Logout() {
 	c.config.DeleteSession()
 	c.Stop()
 	c.client = nil
+	c.crypto = nil
 	c.ui.OnLogout()
 }
 
@@ -315,8 +350,9 @@ func (c *Container) OnLogin() {
 
 	debug.Print("Initializing syncer")
 	c.syncer = NewGomuksSyncer(c.config.Rooms)
+	c.syncer.OnSync(c.crypto.ProcessSyncResponse)
 	c.syncer.OnEventType(event.EventMessage, c.HandleMessage)
-	c.syncer.OnEventType(event.EventEncrypted, c.HandleMessage)
+	c.syncer.OnEventType(event.EventEncrypted, c.HandleEncrypted)
 	c.syncer.OnEventType(event.EventSticker, c.HandleMessage)
 	c.syncer.OnEventType(event.EventReaction, c.HandleMessage)
 	c.syncer.OnEventType(event.EventRedaction, c.HandleRedaction)
@@ -516,6 +552,16 @@ func (c *Container) HandleReaction(room *rooms.Room, reactsTo id.EventID, reactE
 	}
 }
 
+func (c *Container) HandleEncrypted(source EventSource, mxEvent *event.Event) {
+	evt, err := c.crypto.DecryptMegolmEvent(mxEvent)
+	if err != nil {
+		debug.Print("Failed to decrypt event:", err)
+		return
+	}
+	debug.Print("!!!!!", evt)
+	c.HandleMessage(source, evt)
+}
+
 // HandleMessage is the event handler for the m.room.message timeline event.
 func (c *Container) HandleMessage(source EventSource, mxEvent *event.Event) {
 	room := c.GetOrCreateRoom(mxEvent.RoomID)
diff --git a/matrix/rooms/room.go b/matrix/rooms/room.go
index 0238cfb..45222e1 100644
--- a/matrix/rooms/room.go
+++ b/matrix/rooms/room.go
@@ -412,7 +412,7 @@ func (room *Room) UpdateState(evt *event.Event) {
 	case *event.TopicEventContent:
 		room.topicCache = content.Topic
 	case *event.EncryptionEventContent:
-		if content.Algorithm == event.AlgorithmMegolmV1 {
+		if content.Algorithm == id.AlgorithmMegolmV1 {
 			room.Encrypted = true
 		}
 	}
diff --git a/matrix/sync.go b/matrix/sync.go
index 85de68c..415748e 100644
--- a/matrix/sync.go
+++ b/matrix/sync.go
@@ -83,9 +83,11 @@ func (es EventSource) String() string {
 }
 
 type EventHandler func(source EventSource, event *event.Event)
+type SyncHandler func(resp *mautrix.RespSync)
 
 type GomuksSyncer struct {
 	rooms             *rooms.RoomCache
+	globalListeners   []SyncHandler
 	listeners         map[event.Type][]EventHandler // event type to listeners array
 	FirstSyncDone     bool
 	InitDoneCallback  func()
@@ -96,10 +98,11 @@ type GomuksSyncer struct {
 // NewGomuksSyncer returns an instantiated GomuksSyncer
 func NewGomuksSyncer(rooms *rooms.RoomCache) *GomuksSyncer {
 	return &GomuksSyncer{
-		rooms:         rooms,
-		listeners:     make(map[event.Type][]EventHandler),
-		FirstSyncDone: false,
-		Progress:      StubSyncingModal{},
+		rooms:           rooms,
+		globalListeners: []SyncHandler{},
+		listeners:       make(map[event.Type][]EventHandler),
+		FirstSyncDone:   false,
+		Progress:        StubSyncingModal{},
 	}
 }
 
@@ -109,23 +112,26 @@ func (s *GomuksSyncer) ProcessResponse(res *mautrix.RespSync, since string) (err
 		s.rooms.DisableUnloading()
 	}
 	debug.Print("Received sync response")
+	s.Progress.SetMessage("Processing sync response")
 	steps := len(res.Rooms.Join) + len(res.Rooms.Invite) + len(res.Rooms.Leave)
-	s.Progress.SetSteps(steps + 2)
-	s.Progress.SetMessage("Processing global events")
-	s.processSyncEvents(nil, res.Presence.Events, EventSourcePresence)
-	s.Progress.Step()
-	s.processSyncEvents(nil, res.AccountData.Events, EventSourceAccountData)
-	s.Progress.Step()
+	s.Progress.SetSteps(steps + 2 + len(s.globalListeners))
 
 	wait := &sync.WaitGroup{}
-
-	wait.Add(steps)
 	callback := func() {
 		wait.Done()
 		s.Progress.Step()
 	}
+	wait.Add(len(s.globalListeners))
+	s.notifyGlobalListeners(res, callback)
+	wait.Wait()
+
+	s.processSyncEvents(nil, res.Presence.Events, EventSourcePresence)
+	s.Progress.Step()
+	s.processSyncEvents(nil, res.AccountData.Events, EventSourceAccountData)
+	s.Progress.Step()
+
+	wait.Add(steps)
 
-	s.Progress.SetMessage("Processing room events")
 	for roomID, roomData := range res.Rooms.Join {
 		go s.processJoinedRoom(roomID, roomData, callback)
 	}
@@ -152,6 +158,15 @@ func (s *GomuksSyncer) ProcessResponse(res *mautrix.RespSync, since string) (err
 	return
 }
 
+func (s *GomuksSyncer) notifyGlobalListeners(res *mautrix.RespSync, callback func()) {
+	for _, listener := range s.globalListeners {
+		go func(listener SyncHandler) {
+			listener(res)
+			callback()
+		}(listener)
+	}
+}
+
 func (s *GomuksSyncer) processJoinedRoom(roomID id.RoomID, roomData mautrix.SyncJoinedRoom, callback func()) {
 	defer debug.Recover()
 	room := s.rooms.GetOrCreate(roomID)
@@ -239,6 +254,10 @@ func (s *GomuksSyncer) OnEventType(eventType event.Type, callback EventHandler)
 	s.listeners[eventType] = append(s.listeners[eventType], callback)
 }
 
+func (s *GomuksSyncer) OnSync(callback SyncHandler) {
+	s.globalListeners = append(s.globalListeners, callback)
+}
+
 func (s *GomuksSyncer) notifyListeners(source EventSource, evt *event.Event) {
 	listeners, exists := s.listeners[evt.Type]
 	if !exists {
-- 
cgit v1.2.3-70-g09d2


From 7d0d701c5014be43f993d34a52e122f41eedc18d Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 28 Apr 2020 00:58:26 +0300
Subject: Add initial support for encrypting messages

---
 config/config.go     |  1 +
 go.mod               |  2 +-
 go.sum               |  2 ++
 matrix/matrix.go     | 22 +++++++++++++++++++++-
 matrix/rooms/room.go | 11 +++++++++++
 matrix/sync.go       |  9 +++++----
 6 files changed, 41 insertions(+), 6 deletions(-)

(limited to 'matrix')

diff --git a/config/config.go b/config/config.go
index 8234edc..e9e1864 100644
--- a/config/config.go
+++ b/config/config.go
@@ -118,6 +118,7 @@ func (config *Config) DeleteSession() {
 	config.AuthCache.NextBatch = ""
 	config.AuthCache.InitialSyncDone = false
 	config.AccessToken = ""
+	config.DeviceID = ""
 	config.Rooms = rooms.NewRoomCache(config.RoomListPath, config.StateDir, config.RoomCacheSize, config.RoomCacheAge, config.GetUserID)
 	config.PushRules = nil
 
diff --git a/go.mod b/go.mod
index 8564081..95879d3 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
 	gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2
 	gopkg.in/yaml.v2 v2.2.8
-	maunium.net/go/mautrix v0.2.0-beta.4.0.20200426213554-b07cb6dc1f6b
+	maunium.net/go/mautrix v0.2.0-beta.4.0.20200427215704-fe82e2b914c8
 	maunium.net/go/mauview v0.1.0
 	maunium.net/go/tcell v0.1.0
 )
diff --git a/go.sum b/go.sum
index 9d0874b..f3ca71b 100644
--- a/go.sum
+++ b/go.sum
@@ -84,6 +84,8 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200426213554-b07cb6dc1f6b h1:s3+wlMmmtpPUoOGVyS5nyR62htnwD/TEfA0NVbDk7zc=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200426213554-b07cb6dc1f6b/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200427215704-fe82e2b914c8 h1:xflYDdpEonVTaw1Diq4z3ZK72Y8/TutiQgKOrHgfOCA=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200427215704-fe82e2b914c8/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mauview v0.1.0 h1:x2WdkKI2zdriJuPAB0CKlwmnHGE7W9xfM5z6RgG+IIg=
 maunium.net/go/mauview v0.1.0/go.mod h1:og9WbzmWe9SNYNyOFlCv8qa9zMcOvG2nzRJ5vYyud9U=
 maunium.net/go/tcell v0.1.0 h1:XzsEoGCvOw5nac+tlkSLzQcliLYTN4PrtA7ar2ptjSM=
diff --git a/matrix/matrix.go b/matrix/matrix.go
index 8804103..3d1b279 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -870,8 +870,28 @@ func (c *Container) Redact(roomID id.RoomID, eventID id.EventID, reason string)
 func (c *Container) SendEvent(evt *muksevt.Event) (id.EventID, error) {
 	defer debug.Recover()
 
-	c.client.UserTyping(evt.RoomID, false, 0)
+	_, _ = c.client.UserTyping(evt.RoomID, false, 0)
 	c.typing = 0
+	room := c.GetRoom(evt.RoomID)
+	if room != nil && room.Encrypted {
+		encrypted, err := c.crypto.EncryptMegolmEvent(evt.RoomID, evt.Type, evt.Content)
+		if err != nil {
+			if err != crypto.SessionExpired && err != crypto.SessionNotShared && err != crypto.NoGroupSession {
+				return "", err
+			}
+			debug.Print("Got", err, "while trying to encrypt message, sharing group session and trying again...")
+			err = c.crypto.ShareGroupSession(room.ID, room.GetMemberList())
+			if err != nil {
+				return "", err
+			}
+			encrypted, err = c.crypto.EncryptMegolmEvent(evt.RoomID, evt.Type, evt.Content)
+			if err != nil {
+				return "", err
+			}
+		}
+		evt.Type = event.EventEncrypted
+		evt.Content = event.Content{Parsed: encrypted}
+	}
 	resp, err := c.client.SendMessageEvent(evt.RoomID, evt.Type, &evt.Content, mautrix.ReqSendEvent{TransactionID: evt.Unsigned.TransactionID})
 	if err != nil {
 		return "", err
diff --git a/matrix/rooms/room.go b/matrix/rooms/room.go
index 45222e1..d5d1d8f 100644
--- a/matrix/rooms/room.go
+++ b/matrix/rooms/room.go
@@ -650,6 +650,17 @@ func (room *Room) GetMembers() map[id.UserID]*Member {
 	return room.memberCache
 }
 
+func (room *Room) GetMemberList() []id.UserID {
+	members := room.GetMembers()
+	memberList := make([]id.UserID, len(members))
+	index := 0
+	for userID, _ := range members {
+		memberList[index] = userID
+		index++
+	}
+	return memberList
+}
+
 // GetMember returns the member with the given MXID.
 // If the member doesn't exist, nil is returned.
 func (room *Room) GetMember(userID id.UserID) *Member {
diff --git a/matrix/sync.go b/matrix/sync.go
index 415748e..2136088 100644
--- a/matrix/sync.go
+++ b/matrix/sync.go
@@ -83,7 +83,7 @@ func (es EventSource) String() string {
 }
 
 type EventHandler func(source EventSource, event *event.Event)
-type SyncHandler func(resp *mautrix.RespSync)
+type SyncHandler func(resp *mautrix.RespSync, since string)
 
 type GomuksSyncer struct {
 	rooms             *rooms.RoomCache
@@ -122,7 +122,7 @@ func (s *GomuksSyncer) ProcessResponse(res *mautrix.RespSync, since string) (err
 		s.Progress.Step()
 	}
 	wait.Add(len(s.globalListeners))
-	s.notifyGlobalListeners(res, callback)
+	s.notifyGlobalListeners(res, since, callback)
 	wait.Wait()
 
 	s.processSyncEvents(nil, res.Presence.Events, EventSourcePresence)
@@ -158,10 +158,10 @@ func (s *GomuksSyncer) ProcessResponse(res *mautrix.RespSync, since string) (err
 	return
 }
 
-func (s *GomuksSyncer) notifyGlobalListeners(res *mautrix.RespSync, callback func()) {
+func (s *GomuksSyncer) notifyGlobalListeners(res *mautrix.RespSync, since string, callback func()) {
 	for _, listener := range s.globalListeners {
 		go func(listener SyncHandler) {
-			listener(res)
+			listener(res, since)
 			callback()
 		}(listener)
 	}
@@ -288,6 +288,7 @@ func (s *GomuksSyncer) GetFilterJSON(_ id.UserID) *mautrix.Filter {
 					event.StateCanonicalAlias,
 					event.StatePowerLevels,
 					event.StateTombstone,
+					event.StateEncryption,
 				},
 			},
 			Timeline: mautrix.FilterPart{
-- 
cgit v1.2.3-70-g09d2


From fa04323daffb8bf783ba438065a5ce47b2994bea Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 28 Apr 2020 22:00:37 +0300
Subject: Update mautrix-go and move crypto store to XDG_DATA_HOME

---
 config/config.go | 11 +++++++-
 go.mod           |  2 +-
 go.sum           |  2 ++
 gomuks.go        |  4 +--
 main.go          | 86 +++++++++++++++++++++++++++++++++++++-------------------
 matrix/matrix.go | 10 +++++--
 6 files changed, 79 insertions(+), 36 deletions(-)

(limited to 'matrix')

diff --git a/config/config.go b/config/config.go
index e9e1864..a958b1c 100644
--- a/config/config.go
+++ b/config/config.go
@@ -65,6 +65,7 @@ type Config struct {
 	NotifySound bool `yaml:"notify_sound"`
 
 	Dir          string `yaml:"-"`
+	DataDir      string `yaml:"data_dir"`
 	CacheDir     string `yaml:"cache_dir"`
 	HistoryPath  string `yaml:"history_path"`
 	RoomListPath string `yaml:"room_list_path"`
@@ -81,9 +82,10 @@ type Config struct {
 }
 
 // NewConfig creates a config that loads data from the given directory.
-func NewConfig(configDir, cacheDir, downloadDir string) *Config {
+func NewConfig(configDir, dataDir, cacheDir, downloadDir string) *Config {
 	return &Config{
 		Dir:          configDir,
+		DataDir:      dataDir,
 		CacheDir:     cacheDir,
 		DownloadDir:  downloadDir,
 		HistoryPath:  filepath.Join(cacheDir, "history.db"),
@@ -108,8 +110,14 @@ func (config *Config) Clear() {
 	config.nosave = true
 }
 
+// ClearData clears non-temporary session data.
+func (config *Config) ClearData() {
+	_ = os.RemoveAll(config.DataDir)
+}
+
 func (config *Config) CreateCacheDirs() {
 	_ = os.MkdirAll(config.CacheDir, 0700)
+	_ = os.MkdirAll(config.DataDir, 0700)
 	_ = os.MkdirAll(config.StateDir, 0700)
 	_ = os.MkdirAll(config.MediaDir, 0700)
 }
@@ -122,6 +130,7 @@ func (config *Config) DeleteSession() {
 	config.Rooms = rooms.NewRoomCache(config.RoomListPath, config.StateDir, config.RoomCacheSize, config.RoomCacheAge, config.GetUserID)
 	config.PushRules = nil
 
+	config.ClearData()
 	config.Clear()
 	config.nosave = false
 	config.CreateCacheDirs()
diff --git a/go.mod b/go.mod
index 95879d3..aafb5a4 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
 	gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2
 	gopkg.in/yaml.v2 v2.2.8
-	maunium.net/go/mautrix v0.2.0-beta.4.0.20200427215704-fe82e2b914c8
+	maunium.net/go/mautrix v0.2.0-beta.4.0.20200428185931-73915bafb538
 	maunium.net/go/mauview v0.1.0
 	maunium.net/go/tcell v0.1.0
 )
diff --git a/go.sum b/go.sum
index f3ca71b..821afdd 100644
--- a/go.sum
+++ b/go.sum
@@ -86,6 +86,8 @@ maunium.net/go/mautrix v0.2.0-beta.4.0.20200426213554-b07cb6dc1f6b h1:s3+wlMmmtp
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200426213554-b07cb6dc1f6b/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200427215704-fe82e2b914c8 h1:xflYDdpEonVTaw1Diq4z3ZK72Y8/TutiQgKOrHgfOCA=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200427215704-fe82e2b914c8/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200428185931-73915bafb538 h1:E/6URkgRmxhNid8mA+PV25Bi8F/4Yg5nmsxIi/MWDrU=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200428185931-73915bafb538/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mauview v0.1.0 h1:x2WdkKI2zdriJuPAB0CKlwmnHGE7W9xfM5z6RgG+IIg=
 maunium.net/go/mauview v0.1.0/go.mod h1:og9WbzmWe9SNYNyOFlCv8qa9zMcOvG2nzRJ5vYyud9U=
 maunium.net/go/tcell v0.1.0 h1:XzsEoGCvOw5nac+tlkSLzQcliLYTN4PrtA7ar2ptjSM=
diff --git a/gomuks.go b/gomuks.go
index 6dde8f5..d61fe57 100644
--- a/gomuks.go
+++ b/gomuks.go
@@ -38,12 +38,12 @@ type Gomuks struct {
 
 // NewGomuks creates a new Gomuks instance with everything initialized,
 // but does not start it.
-func NewGomuks(uiProvider ifc.UIProvider, configDir, cacheDir, downloadDir string) *Gomuks {
+func NewGomuks(uiProvider ifc.UIProvider, configDir, dataDir, cacheDir, downloadDir string) *Gomuks {
 	gmx := &Gomuks{
 		stop: make(chan bool, 1),
 	}
 
-	gmx.config = config.NewConfig(configDir, cacheDir, downloadDir)
+	gmx.config = config.NewConfig(configDir, dataDir, cacheDir, downloadDir)
 	gmx.ui = uiProvider(gmx)
 	gmx.matrix = matrix.NewContainer(gmx)
 
diff --git a/main.go b/main.go
index 3b4a499..2db06b2 100644
--- a/main.go
+++ b/main.go
@@ -48,24 +48,32 @@ func main() {
 	debug.Initialize()
 	defer debug.Recover()
 
-	configDir, err := UserConfigDir()
+	var configDir, dataDir, cacheDir, downloadDir string
+	var err error
+
+	configDir, err = UserConfigDir()
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "Failed to get config directory:", err)
+		_, _ = fmt.Fprintln(os.Stderr, "Failed to get config directory:", err)
 		os.Exit(3)
 	}
-	cacheDir, err := UserCacheDir()
+	dataDir, err = UserDataDir()
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "Failed to get cache directory:", err)
+		_, _ = fmt.Fprintln(os.Stderr, "Failed to get data directory:", err)
 		os.Exit(3)
 	}
-	downloadDir, err := UserDownloadDir()
+	cacheDir, err = UserCacheDir()
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "Failed to get download directory:", err)
+		_, _ = fmt.Fprintln(os.Stderr, "Failed to get cache directory:", err)
+		os.Exit(3)
+	}
+	downloadDir, err = UserDownloadDir()
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, "Failed to get download directory:", err)
 		os.Exit(3)
 	}
 
 
-	gmx := NewGomuks(MainUIProvider, configDir, cacheDir, downloadDir)
+	gmx := NewGomuks(MainUIProvider, configDir, dataDir, cacheDir, downloadDir)
 	gmx.Start()
 
 	// We use os.Exit() everywhere, so exiting by returning from Start() shouldn't happen.
@@ -74,8 +82,19 @@ func main() {
 	os.Exit(2)
 }
 
+func getRootDir(subdir string) string {
+	rootDir := os.Getenv("GOMUKS_ROOT")
+	if rootDir == "" {
+		return ""
+	}
+	return filepath.Join(rootDir, subdir)
+}
+
 func UserCacheDir() (dir string, err error) {
 	dir = os.Getenv("GOMUKS_CACHE_HOME")
+	if dir == "" {
+		dir = getRootDir("cache")
+	}
 	if dir == "" {
 		dir, err = os.UserCacheDir()
 		dir = filepath.Join(dir, "gomuks")
@@ -83,34 +102,43 @@ func UserCacheDir() (dir string, err error) {
 	return
 }
 
-func UserDownloadDir() (dir string, err error) {
-	dir = os.Getenv("HOME")
-	return filepath.Join(dir, "Downloads"), nil
-}
-
-func UserConfigDir() (dir string, err error) {
-	dir = os.Getenv("GOMUKS_CONFIG_HOME")
+func UserDataDir() (dir string, err error) {
+	dir = os.Getenv("GOMUKS_DATA_HOME")
 	if dir != "" {
 		return
 	}
-	if runtime.GOOS == "windows" {
-		dir = os.Getenv("AppData")
-		if dir == "" {
-			err = errors.New("%AppData% is not defined")
-		}
-	} else {
-		dir = os.Getenv("XDG_CONFIG_HOME")
+	if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
+		return UserConfigDir()
+	}
+	dir = os.Getenv("XDG_DATA_HOME")
+	if dir == "" {
+		dir = getRootDir("data")
+	}
+	if dir == "" {
+		dir = os.Getenv("HOME")
 		if dir == "" {
-			dir = os.Getenv("HOME")
-			if dir == "" {
-				err = errors.New("neither $XDG_CONFIG_HOME nor $HOME are defined")
-			} else if runtime.GOOS == "darwin" {
-				dir = filepath.Join(dir, "Library", "Application Support")
-			} else {
-				dir = filepath.Join(dir, ".config")
-			}
+			return "", errors.New("neither $XDG_CACHE_HOME nor $HOME are defined")
 		}
+		dir = filepath.Join(dir, ".local", "share")
 	}
 	dir = filepath.Join(dir, "gomuks")
 	return
 }
+
+func UserDownloadDir() (dir string, err error) {
+	dir, err = os.UserHomeDir()
+	dir = filepath.Join(dir, "Downloads")
+	return
+}
+
+func UserConfigDir() (dir string, err error) {
+	dir = os.Getenv("GOMUKS_CONFIG_HOME")
+	if dir == "" {
+		dir = getRootDir("cache")
+	}
+	if dir == "" {
+		dir, err = os.UserConfigDir()
+		dir = filepath.Join(dir, "gomuks")
+	}
+	return
+}
diff --git a/matrix/matrix.go b/matrix/matrix.go
index 3d1b279..8d7595e 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -135,7 +135,7 @@ func (c *Container) InitClient() error {
 	c.client.Logger = mxLogger{}
 	c.client.DeviceID = c.config.DeviceID
 
-	cryptoStore, err := crypto.NewGobStore(filepath.Join(c.config.CacheDir, "crypto.gob"))
+	cryptoStore, err := crypto.NewGobStore(filepath.Join(c.config.DataDir, "crypto.gob"))
 	if err != nil {
 		return err
 	}
@@ -281,8 +281,8 @@ func (c *Container) Login(user, password string) error {
 // Logout revokes the access token, stops the syncer and calls the OnLogout() method of the UI.
 func (c *Container) Logout() {
 	c.client.Logout()
-	c.config.DeleteSession()
 	c.Stop()
+	c.config.DeleteSession()
 	c.client = nil
 	c.crypto = nil
 	c.ui.OnLogout()
@@ -300,6 +300,11 @@ func (c *Container) Stop() {
 			debug.Print("Error closing history manager:", err)
 		}
 		c.history = nil
+		debug.Print("Flushing crypto store")
+		err = c.crypto.Store.Flush()
+		if err != nil {
+			debug.Print("Error flushing crypto store:", err)
+		}
 	}
 }
 
@@ -558,7 +563,6 @@ func (c *Container) HandleEncrypted(source EventSource, mxEvent *event.Event) {
 		debug.Print("Failed to decrypt event:", err)
 		return
 	}
-	debug.Print("!!!!!", evt)
 	c.HandleMessage(source, evt)
 }
 
-- 
cgit v1.2.3-70-g09d2


From a9dff6da7391297b64bb5be473b76c3c590f34a1 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 29 Apr 2020 02:45:54 +0300
Subject: Add support for encrypted files

---
 go.mod                     |  2 +-
 go.sum                     |  2 ++
 interface/matrix.go        |  5 ++--
 matrix/matrix.go           | 42 ++++++++++++++++++++-------------
 ui/messages/filemessage.go | 59 +++++++++++++++++++++++++++++-----------------
 ui/messages/parser.go      |  4 ++--
 ui/room-view.go            | 11 ++++++---
 7 files changed, 80 insertions(+), 45 deletions(-)

(limited to 'matrix')

diff --git a/go.mod b/go.mod
index aafb5a4..3e77dfa 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
 	gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2
 	gopkg.in/yaml.v2 v2.2.8
-	maunium.net/go/mautrix v0.2.0-beta.4.0.20200428185931-73915bafb538
+	maunium.net/go/mautrix v0.2.0-beta.4.0.20200428234424-a14b55c5445f
 	maunium.net/go/mauview v0.1.0
 	maunium.net/go/tcell v0.1.0
 )
diff --git a/go.sum b/go.sum
index 821afdd..3da2ad7 100644
--- a/go.sum
+++ b/go.sum
@@ -88,6 +88,8 @@ maunium.net/go/mautrix v0.2.0-beta.4.0.20200427215704-fe82e2b914c8 h1:xflYDdpEon
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200427215704-fe82e2b914c8/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200428185931-73915bafb538 h1:E/6URkgRmxhNid8mA+PV25Bi8F/4Yg5nmsxIi/MWDrU=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200428185931-73915bafb538/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200428234424-a14b55c5445f h1:kYrIUjr2v6fuVZfs5QnzRJ2YzbZVH21aP77a5ynFHNk=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200428234424-a14b55c5445f/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mauview v0.1.0 h1:x2WdkKI2zdriJuPAB0CKlwmnHGE7W9xfM5z6RgG+IIg=
 maunium.net/go/mauview v0.1.0/go.mod h1:og9WbzmWe9SNYNyOFlCv8qa9zMcOvG2nzRJ5vYyud9U=
 maunium.net/go/tcell v0.1.0 h1:XzsEoGCvOw5nac+tlkSLzQcliLYTN4PrtA7ar2ptjSM=
diff --git a/interface/matrix.go b/interface/matrix.go
index 7895957..f4f46ef 100644
--- a/interface/matrix.go
+++ b/interface/matrix.go
@@ -18,6 +18,7 @@ package ifc
 
 import (
 	"maunium.net/go/mautrix"
+	"maunium.net/go/mautrix/crypto/attachment"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
 
@@ -59,8 +60,8 @@ type MatrixContainer interface {
 	GetRoom(roomID id.RoomID) *rooms.Room
 	GetOrCreateRoom(roomID id.RoomID) *rooms.Room
 
-	Download(uri id.ContentURI) ([]byte, error)
-	DownloadToDisk(uri id.ContentURI, target string) (string, error)
+	Download(uri id.ContentURI, file *attachment.EncryptedFile) ([]byte, error)
+	DownloadToDisk(uri id.ContentURI, file *attachment.EncryptedFile, target string) (string, error)
 	GetDownloadURL(uri id.ContentURI) string
 	GetCachePath(uri id.ContentURI) string
 }
diff --git a/matrix/matrix.go b/matrix/matrix.go
index 8d7595e..27ed053 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -17,7 +17,6 @@
 package matrix
 
 import (
-	"bytes"
 	"context"
 	"crypto/tls"
 	"encoding/gob"
@@ -38,6 +37,7 @@ import (
 
 	"maunium.net/go/mautrix"
 	"maunium.net/go/mautrix/crypto"
+	"maunium.net/go/mautrix/crypto/attachment"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/format"
 	"maunium.net/go/mautrix/id"
@@ -1061,7 +1061,7 @@ func cp(src, dst string) error {
 	return out.Close()
 }
 
-func (c *Container) DownloadToDisk(uri id.ContentURI, target string) (fullPath string, err error) {
+func (c *Container) DownloadToDisk(uri id.ContentURI, file *attachment.EncryptedFile, target string) (fullPath string, err error) {
 	cachePath := c.GetCachePath(uri)
 	if target == "" {
 		fullPath = cachePath
@@ -1072,21 +1072,27 @@ func (c *Container) DownloadToDisk(uri id.ContentURI, target string) (fullPath s
 	}
 
 	if _, statErr := os.Stat(cachePath); os.IsNotExist(statErr) {
-		var file *os.File
-		file, err = os.OpenFile(cachePath, os.O_CREATE|os.O_WRONLY, 0600)
+		var body io.ReadCloser
+		body, err = c.client.Download(uri)
 		if err != nil {
 			return
 		}
-		defer file.Close()
 
-		var body io.ReadCloser
-		body, err = c.client.Download(uri)
+		var data []byte
+		data, err = ioutil.ReadAll(body)
+		_ = body.Close()
 		if err != nil {
 			return
 		}
-		defer body.Close()
 
-		_, err = io.Copy(file, body)
+		if file != nil {
+			data, err = file.Decrypt(data)
+			if err != nil {
+				return
+			}
+		}
+
+		err = ioutil.WriteFile(cachePath, data, 0600)
 		if err != nil {
 			return
 		}
@@ -1106,7 +1112,7 @@ func (c *Container) DownloadToDisk(uri id.ContentURI, target string) (fullPath s
 // Download fetches the given Matrix content (mxc) URL and returns the data, homeserver, file ID and potential errors.
 //
 // The file will be either read from the media cache (if found) or downloaded from the server.
-func (c *Container) Download(uri id.ContentURI) (data []byte, err error) {
+func (c *Container) Download(uri id.ContentURI, file *attachment.EncryptedFile) (data []byte, err error) {
 	cacheFile := c.GetCachePath(uri)
 	var info os.FileInfo
 	if info, err = os.Stat(cacheFile); err == nil && !info.IsDir() {
@@ -1116,7 +1122,7 @@ func (c *Container) Download(uri id.ContentURI) (data []byte, err error) {
 		}
 	}
 
-	data, err = c.download(uri, cacheFile)
+	data, err = c.download(uri, file, cacheFile)
 	return
 }
 
@@ -1124,21 +1130,25 @@ func (c *Container) GetDownloadURL(uri id.ContentURI) string {
 	return c.client.GetDownloadURL(uri)
 }
 
-func (c *Container) download(uri id.ContentURI, cacheFile string) (data []byte, err error) {
+func (c *Container) download(uri id.ContentURI, file *attachment.EncryptedFile, cacheFile string) (data []byte, err error) {
 	var body io.ReadCloser
 	body, err = c.client.Download(uri)
 	if err != nil {
 		return
 	}
-	defer body.Close()
 
-	var buf bytes.Buffer
-	_, err = io.Copy(&buf, body)
+	data, err = ioutil.ReadAll(body)
+	_ = body.Close()
 	if err != nil {
 		return
 	}
 
-	data = buf.Bytes()
+	if file != nil {
+		data, err = file.Decrypt(data)
+		if err != nil {
+			return
+		}
+	}
 
 	err = ioutil.WriteFile(cacheFile, data, 0600)
 	return
diff --git a/ui/messages/filemessage.go b/ui/messages/filemessage.go
index 7422146..d2455ab 100644
--- a/ui/messages/filemessage.go
+++ b/ui/messages/filemessage.go
@@ -22,7 +22,7 @@ import (
 	"image"
 	"image/color"
 
-	"maunium.net/go/gomuks/matrix/muksevt"
+	"maunium.net/go/mautrix/crypto/attachment"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
 	"maunium.net/go/mauview"
@@ -32,14 +32,19 @@ import (
 	"maunium.net/go/gomuks/debug"
 	"maunium.net/go/gomuks/interface"
 	"maunium.net/go/gomuks/lib/ansimage"
+	"maunium.net/go/gomuks/matrix/muksevt"
 	"maunium.net/go/gomuks/ui/messages/tstring"
 )
 
 type FileMessage struct {
-	Type      event.MessageType
-	Body      string
-	URL       id.ContentURI
-	Thumbnail id.ContentURI
+	Type event.MessageType
+	Body string
+
+	URL           id.ContentURI
+	File          *attachment.EncryptedFile
+	Thumbnail     id.ContentURI
+	ThumbnailFile *attachment.EncryptedFile
+
 	imageData []byte
 	buffer    []tstring.TString
 
@@ -49,14 +54,23 @@ type FileMessage struct {
 // NewFileMessage creates a new FileMessage object with the provided values and the default state.
 func NewFileMessage(matrix ifc.MatrixContainer, evt *muksevt.Event, displayname string) *UIMessage {
 	content := evt.Content.AsMessage()
-	url, _ := content.URL.Parse()
-	thumbnail, _ := content.GetInfo().ThumbnailURL.Parse()
+	var file, thumbnailFile *attachment.EncryptedFile
+	if content.File != nil {
+		file = &content.File.EncryptedFile
+		content.URL = content.File.URL
+	}
+	if content.GetInfo().ThumbnailFile != nil {
+		thumbnailFile = &content.Info.ThumbnailFile.EncryptedFile
+		content.Info.ThumbnailURL = content.Info.ThumbnailFile.URL
+	}
 	return newUIMessage(evt, displayname, &FileMessage{
-		Type:      content.MsgType,
-		Body:      content.Body,
-		URL:       url,
-		Thumbnail: thumbnail,
-		matrix:    matrix,
+		Type:          content.MsgType,
+		Body:          content.Body,
+		URL:           content.URL,
+		File:          file,
+		Thumbnail:     content.GetInfo().ThumbnailURL,
+		ThumbnailFile: thumbnailFile,
+		matrix:        matrix,
 	})
 }
 
@@ -96,17 +110,20 @@ func (msg *FileMessage) String() string {
 }
 
 func (msg *FileMessage) DownloadPreview() {
-	url := msg.Thumbnail
-	if url.IsEmpty() {
-		if msg.Type == event.MsgImage && !msg.URL.IsEmpty() {
-			msg.Thumbnail = msg.URL
-			url = msg.Thumbnail
-		} else {
-			return
-		}
+	var url id.ContentURI
+	var file *attachment.EncryptedFile
+	if !msg.Thumbnail.IsEmpty() {
+		url = msg.Thumbnail
+		file = msg.ThumbnailFile
+	} else if msg.Type == event.MsgImage && !msg.URL.IsEmpty() {
+		msg.Thumbnail = msg.URL
+		url = msg.URL
+		file = msg.File
+	} else {
+		return
 	}
 	debug.Print("Loading file:", url)
-	data, err := msg.matrix.Download(url)
+	data, err := msg.matrix.Download(url, file)
 	if err != nil {
 		debug.Printf("Failed to download file %s: %v", url, err)
 		return
diff --git a/ui/messages/parser.go b/ui/messages/parser.go
index 9e44647..8cc6209 100644
--- a/ui/messages/parser.go
+++ b/ui/messages/parser.go
@@ -20,13 +20,13 @@ import (
 	"fmt"
 	"strings"
 
-	"maunium.net/go/gomuks/debug"
-	"maunium.net/go/gomuks/matrix/muksevt"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
 	"maunium.net/go/tcell"
 
+	"maunium.net/go/gomuks/debug"
 	"maunium.net/go/gomuks/interface"
+	"maunium.net/go/gomuks/matrix/muksevt"
 	"maunium.net/go/gomuks/matrix/rooms"
 	"maunium.net/go/gomuks/ui/messages/html"
 	"maunium.net/go/gomuks/ui/messages/tstring"
diff --git a/ui/room-view.go b/ui/room-view.go
index 5792626..09e1965 100644
--- a/ui/room-view.go
+++ b/ui/room-view.go
@@ -26,6 +26,7 @@ import (
 	"github.com/kyokomi/emoji"
 	"github.com/mattn/go-runewidth"
 
+	"maunium.net/go/mautrix/crypto/attachment"
 	"maunium.net/go/mauview"
 	"maunium.net/go/tcell"
 
@@ -122,6 +123,10 @@ func NewRoomView(parent *MainView, room *rooms.Room) *RoomView {
 		SetPressKeyUpAtStartFunc(view.EditPrevious).
 		SetPressKeyDownAtEndFunc(view.EditNext)
 
+	if room.Encrypted {
+		view.input.SetPlaceholder("Send an encrypted message...")
+	}
+
 	view.topic.
 		SetTextColor(tcell.ColorWhite).
 		SetBackgroundColor(tcell.ColorDarkGreen)
@@ -202,7 +207,7 @@ func (view *RoomView) OnSelect(message *messages.UIMessage) {
 			} else if view.selectReason == SelectDownload {
 				path = msg.Body
 			}
-			go view.Download(msg.URL, path, view.selectReason == SelectOpen)
+			go view.Download(msg.URL, msg.File, path, view.selectReason == SelectOpen)
 		}
 	}
 	view.selecting = false
@@ -624,8 +629,8 @@ func (view *RoomView) InputSubmit(text string) {
 	view.SetInputText("")
 }
 
-func (view *RoomView) Download(url id.ContentURI, filename string, openFile bool) {
-	path, err := view.parent.matrix.DownloadToDisk(url, filename)
+func (view *RoomView) Download(url id.ContentURI, file *attachment.EncryptedFile, filename string, openFile bool) {
+	path, err := view.parent.matrix.DownloadToDisk(url, file, filename)
 	if err != nil {
 		view.AddServiceMessage(fmt.Sprintf("Failed to download media: %v", err))
 		view.parent.parent.Render()
-- 
cgit v1.2.3-70-g09d2


From 22681875f32fa97f65c9a52e2ee666932706ce95 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 5 May 2020 18:39:28 +0300
Subject: Update mautrix-go and give crypto module access to state store

---
 go.mod                     |  2 +-
 go.sum                     |  2 ++
 matrix/matrix.go           | 18 +++++++++++++++---
 matrix/rooms/roomcache.go  | 21 +++++++++++++++++++++
 ui/messages/filemessage.go |  4 ++--
 5 files changed, 41 insertions(+), 6 deletions(-)

(limited to 'matrix')

diff --git a/go.mod b/go.mod
index a3248dc..1cf74ae 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
 	gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2
 	gopkg.in/yaml.v2 v2.2.8
-	maunium.net/go/mautrix v0.2.0-beta.4.0.20200429002157-8c3bc8eb8f22
+	maunium.net/go/mautrix v0.2.0-beta.4.0.20200505153708-a120e7a70f5a
 	maunium.net/go/mauview v0.1.0
 	maunium.net/go/tcell v0.1.0
 )
diff --git a/go.sum b/go.sum
index e9acded..03a0f71 100644
--- a/go.sum
+++ b/go.sum
@@ -92,6 +92,8 @@ maunium.net/go/mautrix v0.2.0-beta.4.0.20200428234424-a14b55c5445f h1:kYrIUjr2v6
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200428234424-a14b55c5445f/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200429002157-8c3bc8eb8f22 h1:hN7gAmWJqII5aiTnVUHA/QM56ImYJvmQJEGwfMos0ts=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200429002157-8c3bc8eb8f22/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200505153708-a120e7a70f5a h1:5cXujK/NGwGDdllVebkfTfUq/yjfF+lc56Wjjikwl50=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200505153708-a120e7a70f5a/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mauview v0.1.0 h1:x2WdkKI2zdriJuPAB0CKlwmnHGE7W9xfM5z6RgG+IIg=
 maunium.net/go/mauview v0.1.0/go.mod h1:og9WbzmWe9SNYNyOFlCv8qa9zMcOvG2nzRJ5vYyud9U=
 maunium.net/go/tcell v0.1.0 h1:XzsEoGCvOw5nac+tlkSLzQcliLYTN4PrtA7ar2ptjSM=
diff --git a/matrix/matrix.go b/matrix/matrix.go
index 27ed053..fe1aaa5 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -139,7 +139,7 @@ func (c *Container) InitClient() error {
 	if err != nil {
 		return err
 	}
-	c.crypto = crypto.NewOlmMachine(c.client, cryptoLogger{}, cryptoStore)
+	c.crypto = crypto.NewOlmMachine(c.client, cryptoLogger{}, cryptoStore, c.config.Rooms)
 	err = c.crypto.Load()
 	if err != nil {
 		return err
@@ -301,7 +301,7 @@ func (c *Container) Stop() {
 		}
 		c.history = nil
 		debug.Print("Flushing crypto store")
-		err = c.crypto.Store.Flush()
+		err = c.crypto.CryptoStore.Flush()
 		if err != nil {
 			debug.Print("Error flushing crypto store:", err)
 		}
@@ -356,6 +356,9 @@ func (c *Container) OnLogin() {
 	debug.Print("Initializing syncer")
 	c.syncer = NewGomuksSyncer(c.config.Rooms)
 	c.syncer.OnSync(c.crypto.ProcessSyncResponse)
+	c.syncer.OnEventType(event.StateMember, func(source EventSource, evt *event.Event) {
+		c.crypto.HandleMemberEvent(evt)
+	})
 	c.syncer.OnEventType(event.EventMessage, c.HandleMessage)
 	c.syncer.OnEventType(event.EventEncrypted, c.HandleEncrypted)
 	c.syncer.OnEventType(event.EventSticker, c.HandleMessage)
@@ -993,11 +996,20 @@ func (c *Container) GetHistory(room *rooms.Room, limit int) ([]*muksevt.Event, e
 		return nil, err
 	}
 	debug.Printf("Loaded %d events for %s from server from %s to %s", len(resp.Chunk), room.ID, resp.Start, resp.End)
-	for _, evt := range resp.Chunk {
+	for i, evt := range resp.Chunk {
 		err := evt.Content.ParseRaw(evt.Type)
 		if err != nil {
 			debug.Printf("Failed to unmarshal content of event %s (type %s) by %s in %s: %v\n%s", evt.ID, evt.Type.Repr(), evt.Sender, evt.RoomID, err, string(evt.Content.VeryRaw))
 		}
+
+		if evt.Type == event.EventEncrypted {
+			decrypted, err := c.crypto.DecryptMegolmEvent(evt)
+			if err != nil {
+				debug.Print("Failed to decrypt event:", err)
+			} else {
+				resp.Chunk[i] = decrypted
+			}
+		}
 	}
 	for _, evt := range resp.State {
 		room.UpdateState(evt)
diff --git a/matrix/rooms/roomcache.go b/matrix/rooms/roomcache.go
index ffdcad1..d66078c 100644
--- a/matrix/rooms/roomcache.go
+++ b/matrix/rooms/roomcache.go
@@ -27,6 +27,7 @@ import (
 	sync "github.com/sasha-s/go-deadlock"
 
 	"maunium.net/go/gomuks/debug"
+	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
 )
 
@@ -67,6 +68,26 @@ func (cache *RoomCache) EnableUnloading() {
 	cache.noUnload = false
 }
 
+func (cache *RoomCache) IsEncrypted(roomID id.RoomID) bool {
+	room := cache.Get(roomID)
+	return room != nil && room.Encrypted
+}
+
+func (cache *RoomCache) FindSharedRooms(userID id.UserID) (shared []id.RoomID) {
+	cache.Lock()
+	for _, room := range cache.Map {
+		if !room.Encrypted {
+			continue
+		}
+		member, ok := room.GetMembers()[userID]
+		if ok && member.Membership == event.MembershipJoin {
+			shared = append(shared, room.ID)
+		}
+	}
+	cache.Unlock()
+	return
+}
+
 func (cache *RoomCache) LoadList() error {
 	cache.Lock()
 	defer cache.Unlock()
diff --git a/ui/messages/filemessage.go b/ui/messages/filemessage.go
index d2455ab..3d5e554 100644
--- a/ui/messages/filemessage.go
+++ b/ui/messages/filemessage.go
@@ -66,9 +66,9 @@ func NewFileMessage(matrix ifc.MatrixContainer, evt *muksevt.Event, displayname
 	return newUIMessage(evt, displayname, &FileMessage{
 		Type:          content.MsgType,
 		Body:          content.Body,
-		URL:           content.URL,
+		URL:           content.URL.ParseOrIgnore(),
 		File:          file,
-		Thumbnail:     content.GetInfo().ThumbnailURL,
+		Thumbnail:     content.GetInfo().ThumbnailURL.ParseOrIgnore(),
 		ThumbnailFile: thumbnailFile,
 		matrix:        matrix,
 	})
-- 
cgit v1.2.3-70-g09d2


From 9d4fffb259f0809cd9eae1d77e3e80f4335a4b39 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 5 May 2020 19:16:25 +0300
Subject: Don't encrypt outgoing reactions

---
 go.mod           |  2 +-
 go.sum           |  2 ++
 matrix/matrix.go | 23 +++++++++++++++--------
 3 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'matrix')

diff --git a/go.mod b/go.mod
index 1cf74ae..765d0b9 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
 	gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2
 	gopkg.in/yaml.v2 v2.2.8
-	maunium.net/go/mautrix v0.2.0-beta.4.0.20200505153708-a120e7a70f5a
+	maunium.net/go/mautrix v0.2.0-beta.4.0.20200505161530-e9e56523da93
 	maunium.net/go/mauview v0.1.0
 	maunium.net/go/tcell v0.1.0
 )
diff --git a/go.sum b/go.sum
index 03a0f71..efb3117 100644
--- a/go.sum
+++ b/go.sum
@@ -94,6 +94,8 @@ maunium.net/go/mautrix v0.2.0-beta.4.0.20200429002157-8c3bc8eb8f22 h1:hN7gAmWJqI
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200429002157-8c3bc8eb8f22/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200505153708-a120e7a70f5a h1:5cXujK/NGwGDdllVebkfTfUq/yjfF+lc56Wjjikwl50=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200505153708-a120e7a70f5a/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200505161530-e9e56523da93 h1:kaf3m/X4QckuNZZjfUdFpaW4E+FnsqsO7UpKT9Rn+kA=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200505161530-e9e56523da93/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mauview v0.1.0 h1:x2WdkKI2zdriJuPAB0CKlwmnHGE7W9xfM5z6RgG+IIg=
 maunium.net/go/mauview v0.1.0/go.mod h1:og9WbzmWe9SNYNyOFlCv8qa9zMcOvG2nzRJ5vYyud9U=
 maunium.net/go/tcell v0.1.0 h1:XzsEoGCvOw5nac+tlkSLzQcliLYTN4PrtA7ar2ptjSM=
diff --git a/matrix/matrix.go b/matrix/matrix.go
index fe1aaa5..abbd9c6 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -569,6 +569,10 @@ func (c *Container) HandleEncrypted(source EventSource, mxEvent *event.Event) {
 	c.HandleMessage(source, evt)
 }
 
+type Relatable interface {
+	GetRelatesTo() *event.RelatesTo
+}
+
 // HandleMessage is the event handler for the m.room.message timeline event.
 func (c *Container) HandleMessage(source EventSource, mxEvent *event.Event) {
 	room := c.GetOrCreateRoom(mxEvent.RoomID)
@@ -579,13 +583,16 @@ func (c *Container) HandleMessage(source EventSource, mxEvent *event.Event) {
 		return
 	}
 
-	rel := mxEvent.Content.AsMessage().GetRelatesTo()
-	if editID := rel.GetReplaceID(); len(editID) > 0 {
-		c.HandleEdit(room, editID, muksevt.Wrap(mxEvent))
-		return
-	} else if reactionID := rel.GetAnnotationID(); mxEvent.Type == event.EventReaction && len(reactionID) > 0 {
-		c.HandleReaction(room, reactionID, muksevt.Wrap(mxEvent))
-		return
+	relatable, ok := mxEvent.Content.Parsed.(Relatable)
+	if ok {
+		rel := relatable.GetRelatesTo()
+		if editID := rel.GetReplaceID(); len(editID) > 0 {
+			c.HandleEdit(room, editID, muksevt.Wrap(mxEvent))
+			return
+		} else if reactionID := rel.GetAnnotationID(); mxEvent.Type == event.EventReaction && len(reactionID) > 0 {
+			c.HandleReaction(room, reactionID, muksevt.Wrap(mxEvent))
+			return
+		}
 	}
 
 	events, err := c.history.Append(room, []*event.Event{mxEvent})
@@ -880,7 +887,7 @@ func (c *Container) SendEvent(evt *muksevt.Event) (id.EventID, error) {
 	_, _ = c.client.UserTyping(evt.RoomID, false, 0)
 	c.typing = 0
 	room := c.GetRoom(evt.RoomID)
-	if room != nil && room.Encrypted {
+	if room != nil && room.Encrypted && evt.Type != event.EventReaction {
 		encrypted, err := c.crypto.EncryptMegolmEvent(evt.RoomID, evt.Type, evt.Content)
 		if err != nil {
 			if err != crypto.SessionExpired && err != crypto.SessionNotShared && err != crypto.NoGroupSession {
-- 
cgit v1.2.3-70-g09d2


From 9b2b164108cc516ee4a8f49539c3beef22006a6d Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 5 May 2020 19:37:35 +0300
Subject: Update mautrix-go

---
 go.mod           | 2 +-
 go.sum           | 2 ++
 matrix/matrix.go | 6 +-----
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'matrix')

diff --git a/go.mod b/go.mod
index 765d0b9..aeda64b 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
 	gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2
 	gopkg.in/yaml.v2 v2.2.8
-	maunium.net/go/mautrix v0.2.0-beta.4.0.20200505161530-e9e56523da93
+	maunium.net/go/mautrix v0.2.0-beta.4.0.20200505163640-61b3fde37bf4
 	maunium.net/go/mauview v0.1.0
 	maunium.net/go/tcell v0.1.0
 )
diff --git a/go.sum b/go.sum
index efb3117..2f0a58e 100644
--- a/go.sum
+++ b/go.sum
@@ -96,6 +96,8 @@ maunium.net/go/mautrix v0.2.0-beta.4.0.20200505153708-a120e7a70f5a h1:5cXujK/NGw
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200505153708-a120e7a70f5a/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200505161530-e9e56523da93 h1:kaf3m/X4QckuNZZjfUdFpaW4E+FnsqsO7UpKT9Rn+kA=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200505161530-e9e56523da93/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200505163640-61b3fde37bf4 h1:iGxePGtVVBYSni/GQpQHWMiISIFndJK3+GKajZJCSXo=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200505163640-61b3fde37bf4/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mauview v0.1.0 h1:x2WdkKI2zdriJuPAB0CKlwmnHGE7W9xfM5z6RgG+IIg=
 maunium.net/go/mauview v0.1.0/go.mod h1:og9WbzmWe9SNYNyOFlCv8qa9zMcOvG2nzRJ5vYyud9U=
 maunium.net/go/tcell v0.1.0 h1:XzsEoGCvOw5nac+tlkSLzQcliLYTN4PrtA7ar2ptjSM=
diff --git a/matrix/matrix.go b/matrix/matrix.go
index abbd9c6..a4501f3 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -569,10 +569,6 @@ func (c *Container) HandleEncrypted(source EventSource, mxEvent *event.Event) {
 	c.HandleMessage(source, evt)
 }
 
-type Relatable interface {
-	GetRelatesTo() *event.RelatesTo
-}
-
 // HandleMessage is the event handler for the m.room.message timeline event.
 func (c *Container) HandleMessage(source EventSource, mxEvent *event.Event) {
 	room := c.GetOrCreateRoom(mxEvent.RoomID)
@@ -583,7 +579,7 @@ func (c *Container) HandleMessage(source EventSource, mxEvent *event.Event) {
 		return
 	}
 
-	relatable, ok := mxEvent.Content.Parsed.(Relatable)
+	relatable, ok := mxEvent.Content.Parsed.(event.Relatable)
 	if ok {
 		rel := relatable.GetRelatesTo()
 		if editID := rel.GetReplaceID(); len(editID) > 0 {
-- 
cgit v1.2.3-70-g09d2


From 0988b0590cf9c2909131e86a56a1ad9ed1745431 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 5 May 2020 20:38:58 +0300
Subject: Make e2ee optional

---
 go.mod                |  2 +-
 go.sum                |  2 ++
 matrix/crypto.go      | 61 ++++++++++++++++++++++++++++++++++++++++++++++
 matrix/matrix.go      | 67 ++++++++++++++++++++++++---------------------------
 matrix/nocrypto.go    | 13 ++++++++++
 ui/messages/parser.go |  2 +-
 6 files changed, 109 insertions(+), 38 deletions(-)
 create mode 100644 matrix/crypto.go
 create mode 100644 matrix/nocrypto.go

(limited to 'matrix')

diff --git a/go.mod b/go.mod
index aeda64b..c9536a2 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
 	gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2
 	gopkg.in/yaml.v2 v2.2.8
-	maunium.net/go/mautrix v0.2.0-beta.4.0.20200505163640-61b3fde37bf4
+	maunium.net/go/mautrix v0.2.0-beta.4.0.20200505170605-f82efbca9632
 	maunium.net/go/mauview v0.1.0
 	maunium.net/go/tcell v0.1.0
 )
diff --git a/go.sum b/go.sum
index 2f0a58e..9b347bc 100644
--- a/go.sum
+++ b/go.sum
@@ -98,6 +98,8 @@ maunium.net/go/mautrix v0.2.0-beta.4.0.20200505161530-e9e56523da93 h1:kaf3m/X4Qc
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200505161530-e9e56523da93/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200505163640-61b3fde37bf4 h1:iGxePGtVVBYSni/GQpQHWMiISIFndJK3+GKajZJCSXo=
 maunium.net/go/mautrix v0.2.0-beta.4.0.20200505163640-61b3fde37bf4/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200505170605-f82efbca9632 h1:oPTIlRE5S6QMmumnxV/fZREhwMKJcbMEj67J143EY+U=
+maunium.net/go/mautrix v0.2.0-beta.4.0.20200505170605-f82efbca9632/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y=
 maunium.net/go/mauview v0.1.0 h1:x2WdkKI2zdriJuPAB0CKlwmnHGE7W9xfM5z6RgG+IIg=
 maunium.net/go/mauview v0.1.0/go.mod h1:og9WbzmWe9SNYNyOFlCv8qa9zMcOvG2nzRJ5vYyud9U=
 maunium.net/go/tcell v0.1.0 h1:XzsEoGCvOw5nac+tlkSLzQcliLYTN4PrtA7ar2ptjSM=
diff --git a/matrix/crypto.go b/matrix/crypto.go
new file mode 100644
index 0000000..1fc5674
--- /dev/null
+++ b/matrix/crypto.go
@@ -0,0 +1,61 @@
+// gomuks - A terminal Matrix client written in Go.
+// Copyright (C) 2020 Tulir Asokan
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+// +build cgo
+
+package matrix
+
+import (
+	"path/filepath"
+
+	"maunium.net/go/gomuks/debug"
+	"maunium.net/go/mautrix/crypto"
+)
+
+type cryptoLogger struct{}
+
+func (c cryptoLogger) Error(message string, args ...interface{}) {
+	debug.Printf("[Crypto/Error] "+message, args...)
+}
+
+func (c cryptoLogger) Warn(message string, args ...interface{}) {
+	debug.Printf("[Crypto/Warn] "+message, args...)
+}
+
+func (c cryptoLogger) Debug(message string, args ...interface{}) {
+	debug.Printf("[Crypto/Debug] "+message, args...)
+}
+
+func (c cryptoLogger) Trace(message string, args ...interface{}) {
+	debug.Printf("[Crypto/Trace] "+message, args...)
+}
+
+func isBadEncryptError(err error) bool {
+	return err != crypto.SessionExpired && err != crypto.SessionNotShared && err != crypto.NoGroupSession
+}
+
+func (c *Container) initCrypto() error {
+	cryptoStore, err := crypto.NewGobStore(filepath.Join(c.config.DataDir, "crypto.gob"))
+	if err != nil {
+		return err
+	}
+	c.crypto = crypto.NewOlmMachine(c.client, cryptoLogger{}, cryptoStore, c.config.Rooms)
+	err = c.crypto.Load()
+	if err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/matrix/matrix.go b/matrix/matrix.go
index a4501f3..4ea6bd2 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -36,7 +36,6 @@ import (
 	"github.com/pkg/errors"
 
 	"maunium.net/go/mautrix"
-	"maunium.net/go/mautrix/crypto"
 	"maunium.net/go/mautrix/crypto/attachment"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/format"
@@ -56,7 +55,7 @@ import (
 // It is used for all Matrix calls from the UI and Matrix event handlers.
 type Container struct {
 	client  *mautrix.Client
-	crypto  *crypto.OlmMachine
+	crypto  CryptoInterface
 	syncer  *GomuksSyncer
 	gmx     ifc.Gomuks
 	ui      ifc.GomuksUI
@@ -90,22 +89,14 @@ func (log mxLogger) Debugfln(message string, args ...interface{}) {
 	debug.Printf("[Matrix] "+message, args...)
 }
 
-type cryptoLogger struct{}
-
-func (c cryptoLogger) Error(message string, args ...interface{}) {
-	debug.Printf("[Crypto/Error] "+message, args...)
-}
-
-func (c cryptoLogger) Warn(message string, args ...interface{}) {
-	debug.Printf("[Crypto/Warn] "+message, args...)
-}
-
-func (c cryptoLogger) Debug(message string, args ...interface{}) {
-	debug.Printf("[Crypto/Debug] "+message, args...)
-}
-
-func (c cryptoLogger) Trace(message string, args ...interface{}) {
-	debug.Printf("[Crypto/Trace] "+message, args...)
+type CryptoInterface interface {
+	Load() error
+	FlushStore() error
+	ProcessSyncResponse(resp *mautrix.RespSync, since string)
+	HandleMemberEvent(*event.Event)
+	DecryptMegolmEvent(*event.Event) (*event.Event, error)
+	EncryptMegolmEvent(id.RoomID, event.Type, event.Content) (*event.EncryptedEventContent, error)
+	ShareGroupSession(id.RoomID, []id.UserID) error
 }
 
 // InitClient initializes the mautrix client and connects to the homeserver specified in the config.
@@ -135,12 +126,7 @@ func (c *Container) InitClient() error {
 	c.client.Logger = mxLogger{}
 	c.client.DeviceID = c.config.DeviceID
 
-	cryptoStore, err := crypto.NewGobStore(filepath.Join(c.config.DataDir, "crypto.gob"))
-	if err != nil {
-		return err
-	}
-	c.crypto = crypto.NewOlmMachine(c.client, cryptoLogger{}, cryptoStore, c.config.Rooms)
-	err = c.crypto.Load()
+	err = c.initCrypto()
 	if err != nil {
 		return err
 	}
@@ -300,10 +286,12 @@ func (c *Container) Stop() {
 			debug.Print("Error closing history manager:", err)
 		}
 		c.history = nil
-		debug.Print("Flushing crypto store")
-		err = c.crypto.CryptoStore.Flush()
-		if err != nil {
-			debug.Print("Error flushing crypto store:", err)
+		if c.crypto != nil {
+			debug.Print("Flushing crypto store")
+			err = c.crypto.FlushStore()
+			if err != nil {
+				debug.Print("Error flushing crypto store:", err)
+			}
 		}
 	}
 }
@@ -355,12 +343,16 @@ func (c *Container) OnLogin() {
 
 	debug.Print("Initializing syncer")
 	c.syncer = NewGomuksSyncer(c.config.Rooms)
-	c.syncer.OnSync(c.crypto.ProcessSyncResponse)
-	c.syncer.OnEventType(event.StateMember, func(source EventSource, evt *event.Event) {
-		c.crypto.HandleMemberEvent(evt)
-	})
+	if c.crypto != nil {
+		c.syncer.OnSync(c.crypto.ProcessSyncResponse)
+		c.syncer.OnEventType(event.StateMember, func(source EventSource, evt *event.Event) {
+			c.crypto.HandleMemberEvent(evt)
+		})
+		c.syncer.OnEventType(event.EventEncrypted, c.HandleEncrypted)
+	} else {
+		c.syncer.OnEventType(event.EventEncrypted, c.HandleMessage)
+	}
 	c.syncer.OnEventType(event.EventMessage, c.HandleMessage)
-	c.syncer.OnEventType(event.EventEncrypted, c.HandleEncrypted)
 	c.syncer.OnEventType(event.EventSticker, c.HandleMessage)
 	c.syncer.OnEventType(event.EventReaction, c.HandleMessage)
 	c.syncer.OnEventType(event.EventRedaction, c.HandleRedaction)
@@ -564,6 +556,8 @@ func (c *Container) HandleEncrypted(source EventSource, mxEvent *event.Event) {
 	evt, err := c.crypto.DecryptMegolmEvent(mxEvent)
 	if err != nil {
 		debug.Print("Failed to decrypt event:", err)
+		// TODO add decryption failed message instead of passing through directly
+		c.HandleMessage(source, mxEvent)
 		return
 	}
 	c.HandleMessage(source, evt)
@@ -883,10 +877,10 @@ func (c *Container) SendEvent(evt *muksevt.Event) (id.EventID, error) {
 	_, _ = c.client.UserTyping(evt.RoomID, false, 0)
 	c.typing = 0
 	room := c.GetRoom(evt.RoomID)
-	if room != nil && room.Encrypted && evt.Type != event.EventReaction {
+	if room != nil && room.Encrypted && c.crypto != nil && evt.Type != event.EventReaction {
 		encrypted, err := c.crypto.EncryptMegolmEvent(evt.RoomID, evt.Type, evt.Content)
 		if err != nil {
-			if err != crypto.SessionExpired && err != crypto.SessionNotShared && err != crypto.NoGroupSession {
+			if isBadEncryptError(err) {
 				return "", err
 			}
 			debug.Print("Got", err, "while trying to encrypt message, sharing group session and trying again...")
@@ -1005,10 +999,11 @@ func (c *Container) GetHistory(room *rooms.Room, limit int) ([]*muksevt.Event, e
 			debug.Printf("Failed to unmarshal content of event %s (type %s) by %s in %s: %v\n%s", evt.ID, evt.Type.Repr(), evt.Sender, evt.RoomID, err, string(evt.Content.VeryRaw))
 		}
 
-		if evt.Type == event.EventEncrypted {
+		if c.crypto != nil && evt.Type == event.EventEncrypted {
 			decrypted, err := c.crypto.DecryptMegolmEvent(evt)
 			if err != nil {
 				debug.Print("Failed to decrypt event:", err)
+				// TODO add decryption failed message instead of passing through directly
 			} else {
 				resp.Chunk[i] = decrypted
 			}
diff --git a/matrix/nocrypto.go b/matrix/nocrypto.go
new file mode 100644
index 0000000..979afda
--- /dev/null
+++ b/matrix/nocrypto.go
@@ -0,0 +1,13 @@
+// This contains no-op stubs of the methods in crypto.go for non-cgo builds with crypto disabled.
+
+// +build !cgo
+
+package matrix
+
+func isBadEncryptError(err error) bool {
+	return false
+}
+
+func (c *Container) initCrypto() error {
+	return nil
+}
diff --git a/ui/messages/parser.go b/ui/messages/parser.go
index 8cc6209..4a214f1 100644
--- a/ui/messages/parser.go
+++ b/ui/messages/parser.go
@@ -82,7 +82,7 @@ func directParseEvent(matrix ifc.MatrixContainer, room *rooms.Room, evt *muksevt
 		}
 		return ParseMessage(matrix, room, evt, displayname)
 	case *event.EncryptedEventContent:
-		return NewExpandedTextMessage(evt, displayname, tstring.NewStyleTString("Encrypted messages are not yet supported", tcell.StyleDefault.Italic(true)))
+		return NewExpandedTextMessage(evt, displayname, tstring.NewStyleTString("Decryption failed or gomuks not built with encryption support", tcell.StyleDefault.Italic(true)))
 	case *event.TopicEventContent, *event.RoomNameEventContent, *event.CanonicalAliasEventContent:
 		return ParseStateEvent(evt, displayname)
 	case *event.MemberEventContent:
-- 
cgit v1.2.3-70-g09d2


From cfd5f7ae54fa2f4a21236665c9e685a3fabde5b6 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 5 May 2020 21:15:53 +0300
Subject: Random changes

---
 matrix/crypto.go | 3 ++-
 matrix/matrix.go | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'matrix')

diff --git a/matrix/crypto.go b/matrix/crypto.go
index 1fc5674..8eab355 100644
--- a/matrix/crypto.go
+++ b/matrix/crypto.go
@@ -21,8 +21,9 @@ package matrix
 import (
 	"path/filepath"
 
-	"maunium.net/go/gomuks/debug"
 	"maunium.net/go/mautrix/crypto"
+
+	"maunium.net/go/gomuks/debug"
 )
 
 type cryptoLogger struct{}
diff --git a/matrix/matrix.go b/matrix/matrix.go
index 4ea6bd2..30e28fb 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -346,7 +346,11 @@ func (c *Container) OnLogin() {
 	if c.crypto != nil {
 		c.syncer.OnSync(c.crypto.ProcessSyncResponse)
 		c.syncer.OnEventType(event.StateMember, func(source EventSource, evt *event.Event) {
-			c.crypto.HandleMemberEvent(evt)
+			// Don't spam the crypto module with member events of an initial sync
+			// TODO invalidate all group sessions when clearing cache?
+			if c.config.AuthCache.InitialSyncDone {
+				c.crypto.HandleMemberEvent(evt)
+			}
 		})
 		c.syncer.OnEventType(event.EventEncrypted, c.HandleEncrypted)
 	} else {
-- 
cgit v1.2.3-70-g09d2


From 4052ec532b7f963ef738f8c5fb0b32759571e8f5 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 6 May 2020 18:43:35 +0300
Subject: Fix potential double locking when finding shared rooms

---
 matrix/rooms/roomcache.go | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'matrix')

diff --git a/matrix/rooms/roomcache.go b/matrix/rooms/roomcache.go
index d66078c..067cbb6 100644
--- a/matrix/rooms/roomcache.go
+++ b/matrix/rooms/roomcache.go
@@ -74,6 +74,8 @@ func (cache *RoomCache) IsEncrypted(roomID id.RoomID) bool {
 }
 
 func (cache *RoomCache) FindSharedRooms(userID id.UserID) (shared []id.RoomID) {
+	// FIXME this disables unloading so TouchNode wouldn't try to double-lock
+	cache.DisableUnloading()
 	cache.Lock()
 	for _, room := range cache.Map {
 		if !room.Encrypted {
@@ -85,6 +87,7 @@ func (cache *RoomCache) FindSharedRooms(userID id.UserID) (shared []id.RoomID) {
 		}
 	}
 	cache.Unlock()
+	cache.EnableUnloading()
 	return
 }
 
-- 
cgit v1.2.3-70-g09d2