From 54e235b0b9f47fd721d3ab556f6f35c29f9afca3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 18 Jun 2020 10:42:33 +0100 Subject: [PATCH 1/3] Remove labs option to cache 'passphrase' (which actually meant SSSS secrets) Fixes https://github.com/vector-im/riot-web/issues/1392 --- src/CrossSigningManager.js | 5 +---- .../views/settings/tabs/user/LabsUserSettingsTab.js | 1 - src/settings/Settings.js | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js index d40f820ac0..b8a17c0f0d 100644 --- a/src/CrossSigningManager.js +++ b/src/CrossSigningManager.js @@ -34,10 +34,7 @@ let secretStorageBeingAccessed = false; let passphraseOnlyOption = null; function isCachingAllowed() { - return ( - secretStorageBeingAccessed || - SettingsStore.getValue("keepSecretStoragePassphraseForSession") - ); + return secretStorageBeingAccessed; } export class AccessCancelledError extends Error { diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js index 3e69107159..9724b9934f 100644 --- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js @@ -66,7 +66,6 @@ export default class LabsUserSettingsTab extends React.Component { - ); diff --git a/src/settings/Settings.js b/src/settings/Settings.js index 225af15ec8..5e439a1d71 100644 --- a/src/settings/Settings.js +++ b/src/settings/Settings.js @@ -521,11 +521,6 @@ export const SETTINGS = { displayName: _td("Enable message search in encrypted rooms"), default: true, }, - "keepSecretStoragePassphraseForSession": { - supportedLevels: ['device', 'config'], - displayName: _td("Keep recovery passphrase in memory for this session"), - default: false, - }, "crawlerSleepTime": { supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS, displayName: _td("How fast should messages be downloaded."), From 793c6c549ea7f0971ac841c9a3f77a2c003a3887 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 18 Jun 2020 10:45:15 +0100 Subject: [PATCH 2/3] Unused import --- src/CrossSigningManager.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js index b8a17c0f0d..cf5df3c29e 100644 --- a/src/CrossSigningManager.js +++ b/src/CrossSigningManager.js @@ -20,7 +20,6 @@ import {MatrixClientPeg} from './MatrixClientPeg'; import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase'; import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey'; import { _t } from './languageHandler'; -import SettingsStore from './settings/SettingsStore'; import {encodeBase64} from "matrix-js-sdk/src/crypto/olmlib"; // This stores the secret storage private keys in memory for the JS SDK. This is From 3c268a31c8f0461203031bb2417945ad081df993 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 18 Jun 2020 10:48:18 +0100 Subject: [PATCH 3/3] i18n --- src/i18n/strings/en_EN.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 5de33ada55..c125ca6b6f 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -480,7 +480,6 @@ "Send read receipts for messages (requires compatible homeserver to disable)": "Send read receipts for messages (requires compatible homeserver to disable)", "Show previews/thumbnails for images": "Show previews/thumbnails for images", "Enable message search in encrypted rooms": "Enable message search in encrypted rooms", - "Keep recovery passphrase in memory for this session": "Keep recovery passphrase in memory for this session", "How fast should messages be downloaded.": "How fast should messages be downloaded.", "Manually verify all remote sessions": "Manually verify all remote sessions", "IRC display name width": "IRC display name width",