Add toggle to only send to verified devices

7 files changed, 42 insertions, 15 deletions

diff --git a/config/config.go b/config/config.go
index a958b1c..03e186f 100644
--- a/config/config.go
+++ b/config/config.go
@@ -62,7 +62,8 @@ type Config struct {
 	RoomCacheSize int   `yaml:"room_cache_size"`
 	RoomCacheAge  int64 `yaml:"room_cache_age"`
 
-	NotifySound bool `yaml:"notify_sound"`
+	NotifySound        bool `yaml:"notify_sound"`
+	SendToVerifiedOnly bool `yaml:"send_to_verified_only"`
 
 	Dir          string `yaml:"-"`
 	DataDir      string `yaml:"data_dir"`
@@ -96,7 +97,8 @@ func NewConfig(configDir, dataDir, cacheDir, downloadDir string) *Config {
 		RoomCacheSize: 32,
 		RoomCacheAge:  1 * 60,
 
-		NotifySound: true,
+		NotifySound:        true,
+		SendToVerifiedOnly: false,
 	}
 }
 
diff --git a/go.mod b/go.mod
index 9b50058..3e89c1e 100644
--- a/go.mod
+++ b/go.mod
@@ -28,4 +28,4 @@ require (
 	maunium.net/go/tcell v0.2.0
 )
 
-replace maunium.net/go/mautrix => github.com/nikofil/mautrix-go v0.5.2-0.20200725145808-be3336827da7
+replace maunium.net/go/mautrix => github.com/nikofil/mautrix-go v0.5.2-0.20200725175335-dd3f90913c4d
diff --git a/go.sum b/go.sum
index 33fe477..089c3ab 100644
--- a/go.sum
+++ b/go.sum
@@ -33,6 +33,10 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
 github.com/nikofil/mautrix-go v0.5.2-0.20200725145808-be3336827da7 h1:w5IiIpetgAwalLPFkxiVbxBXJtcB9zLhoGLkyouQb4k=
 github.com/nikofil/mautrix-go v0.5.2-0.20200725145808-be3336827da7/go.mod h1:Va/74MijqaS0DQ3aUqxmFO54/PMfr1LVsCOcGRHbYmo=
+github.com/nikofil/mautrix-go v0.5.2-0.20200725165923-cae799088b7e h1:K8D+9n29FP1Utrv2joUhjcuDL1zC+Qq9rEFdV5kPgTQ=
+github.com/nikofil/mautrix-go v0.5.2-0.20200725165923-cae799088b7e/go.mod h1:Va/74MijqaS0DQ3aUqxmFO54/PMfr1LVsCOcGRHbYmo=
+github.com/nikofil/mautrix-go v0.5.2-0.20200725175335-dd3f90913c4d h1:tsCIy4CvvAeFEoBhet7zGoZXc+lr/e2YogoPaEGdMN8=
+github.com/nikofil/mautrix-go v0.5.2-0.20200725175335-dd3f90913c4d/go.mod h1:Va/74MijqaS0DQ3aUqxmFO54/PMfr1LVsCOcGRHbYmo=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
diff --git a/matrix/crypto.go b/matrix/crypto.go
index 158a1f2..c549e8a 100644
--- a/matrix/crypto.go
+++ b/matrix/crypto.go
@@ -55,7 +55,9 @@ func (c *Container) initCrypto() error {
 	if err != nil {
 		return errors.Wrap(err, "failed to open crypto store")
 	}
-	c.crypto = crypto.NewOlmMachine(c.client, cryptoLogger{}, cryptoStore, c.config.Rooms)
+	crypt := crypto.NewOlmMachine(c.client, cryptoLogger{}, cryptoStore, c.config.Rooms)
+	crypt.AllowUnverifiedDevices = !c.config.SendToVerifiedOnly
+	c.crypto = crypt
 	err = c.crypto.Load()
 	if err != nil {
 		return errors.Wrap(err, "failed to create olm machine")
diff --git a/ui/command-processor.go b/ui/command-processor.go
index 1b30cbe..514d67b 100644
--- a/ui/command-processor.go
+++ b/ui/command-processor.go
@@ -152,12 +152,13 @@ func NewCommandProcessor(parent *MainView) *CommandProcessor {
 			"cprof":      cmdCPUProfile,
 			"trace":      cmdTrace,
 
-			"fingerprint": cmdFingerprint,
-			"devices":     cmdDevices,
-			"verify":      cmdVerify,
-			"device":      cmdDevice,
-			"unverify":    cmdUnverify,
-			"blacklist":   cmdBlacklist,
+			"fingerprint":   cmdFingerprint,
+			"devices":       cmdDevices,
+			"verify":        cmdVerify,
+			"device":        cmdDevice,
+			"unverify":      cmdUnverify,
+			"blacklist":     cmdBlacklist,
+			"reset-session": cmdResetSession,
 		},
 	}
 }
diff --git a/ui/commands.go b/ui/commands.go
index a6309fd..1877c89 100644
--- a/ui/commands.go
+++ b/ui/commands.go
@@ -475,7 +475,7 @@ func cmdDevices(cmd *Command) {
 		_, _ = fmt.Fprintf(&buf, "%s (%s) - %s\n    Fingerprint: %s\n", device.DeviceID, device.Name, device.Trust.String(), device.Fingerprint())
 	}
 	resp := buf.String()
-	cmd.Reply(resp[:len(resp)-1])
+	cmd.Reply("%s", resp[:len(resp)-1])
 }
 
 func cmdDevice(cmd *Command) {
@@ -561,6 +561,15 @@ func cmdBlacklist(cmd *Command) {
 	putDevice(cmd, device, action)
 }
 
+func cmdResetSession(cmd *Command) {
+	err := cmd.Matrix.Crypto().(*crypto.OlmMachine).CryptoStore.RemoveOutboundGroupSession(cmd.Room.Room.ID)
+	if err != nil {
+		cmd.Reply("Failed to remove outbound group session: %v", err)
+	} else {
+		cmd.Reply("Removed outbound group session for this room")
+	}
+}
+
 // endregion
 
 func cmdHeapProfile(cmd *Command) {
@@ -638,7 +647,7 @@ func cmdHelp(cmd *Command) {
 /logout         - Log out of Matrix.
 /toggle <thing> - Temporary command to toggle various UI features.
 
-Things: rooms, users, baremessages, images, typingnotif
+Things: rooms, users, baremessages, images, typingnotif, unverified
 
 # Sending special messages
 /me <message>        - Send an emote message.
@@ -919,6 +928,7 @@ var toggleMsg = map[string]ToggleMessage{
 	"markdown":      SimpleToggleMessage("markdown input"),
 	"downloads":     SimpleToggleMessage("automatic downloads"),
 	"notifications": SimpleToggleMessage("desktop notifications"),
+	"unverified":    SimpleToggleMessage("sending messages to unverified devices"),
 }
 
 func makeUsage() string {
@@ -959,6 +969,8 @@ func cmdToggle(cmd *Command) {
 			val = &cmd.Config.Preferences.DisableDownloads
 		case "notifications":
 			val = &cmd.Config.Preferences.DisableNotifications
+		case "unverified":
+			val = &cmd.Config.SendToVerifiedOnly
 		default:
 			cmd.Reply("Unknown toggle %s. Use /toggle without arguments for a list of togglable things.", thing)
 			return
diff --git a/ui/verification-modal.go b/ui/verification-modal.go
index e47006e..54c2ecf 100644
--- a/ui/verification-modal.go
+++ b/ui/verification-modal.go
@@ -96,7 +96,9 @@ func NewVerificationModal(mainView *MainView, device *crypto.DeviceIdentity, tim
 
 	vm.emojiText = &EmojiView{}
 
-	vm.inputBar = mauview.NewInputField().SetBackgroundColor(tcell.ColorDefault)
+	vm.inputBar = mauview.NewInputField().
+		SetBackgroundColor(tcell.ColorDefault).
+		SetPlaceholderTextColor(tcell.ColorWhite)
 
 	flex := mauview.NewFlex().
 		SetDirection(mauview.FlexRow).
@@ -176,7 +178,7 @@ func (vm *VerificationModal) OnCancel(cancelledByUs bool, reason string, _ event
 	} else {
 		vm.infoText.SetText(fmt.Sprintf("Verification cancelled by %s: %s", vm.device.UserID, reason))
 	}
-	vm.inputBar.SetPlaceholder("Press enter to close dialog")
+	vm.inputBar.SetPlaceholder("Press enter to close the dialog")
 	vm.done = true
 	vm.parent.parent.Render()
 }
@@ -185,9 +187,13 @@ func (vm *VerificationModal) OnSuccess() {
 	vm.waitingBar.SetIndeterminate(false).SetMax(100).SetProgress(100)
 	vm.parent.parent.app.SetRedrawTicker(1 * time.Minute)
 	vm.infoText.SetText(fmt.Sprintf("Successfully verified %s (%s) of %s", vm.device.Name, vm.device.DeviceID, vm.device.UserID))
-	vm.inputBar.SetPlaceholder("Press enter to close dialog")
+	vm.inputBar.SetPlaceholder("Press enter to close the dialog")
 	vm.done = true
 	vm.parent.parent.Render()
+	if vm.parent.config.SendToVerifiedOnly {
+		// Hacky way to make new group sessions after verified
+		vm.parent.matrix.Crypto().(*crypto.OlmMachine).OnDevicesChanged(vm.device.UserID)
+	}
 }
 
 func (vm *VerificationModal) OnKeyEvent(event mauview.KeyEvent) bool {