mirror of https://github.com/vector-im/riot-web
Remove display of key backup signatures from backup settings (#11333)
* Remove display of Key backup signatures This is *fiddly* to support in Element-R, and we don't really think it's offering any value. * update snapshot * clean up i18npull/28788/head^2
Richard van der Hoff
GitHub
parent
202af87b2e
commit
f6fc5cad5c
|
|
@ -15,23 +15,6 @@ See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.mx_SecureBackupPanel_sigValid,
|
|
||||||
.mx_SecureBackupPanel_sigInvalid,
|
|
||||||
.mx_SecureBackupPanel_deviceVerified,
|
|
||||||
.mx_SecureBackupPanel_deviceNotVerified {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_SecureBackupPanel_sigValid,
|
|
||||||
.mx_SecureBackupPanel_deviceVerified {
|
|
||||||
color: $e2e-verified-color;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_SecureBackupPanel_sigInvalid,
|
|
||||||
.mx_SecureBackupPanel_deviceNotVerified {
|
|
||||||
color: $e2e-warning-color;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_SecureBackupPanel_deviceName {
|
.mx_SecureBackupPanel_deviceName {
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -295,105 +295,6 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
let backupSigStatuses: React.ReactNode | undefined = backupSigStatus?.sigs?.map((sig, i) => {
|
|
||||||
const deviceName = sig.device ? sig.device.getDisplayName() || sig.device.deviceId : null;
|
|
||||||
const validity = (sub: string): JSX.Element => (
|
|
||||||
<span className={sig.valid ? "mx_SecureBackupPanel_sigValid" : "mx_SecureBackupPanel_sigInvalid"}>
|
|
||||||
{sub}
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
const verify = (sub: string): JSX.Element => (
|
|
||||||
<span
|
|
||||||
className={
|
|
||||||
sig.device && sig.deviceTrust?.isVerified()
|
|
||||||
? "mx_SecureBackupPanel_deviceVerified"
|
|
||||||
: "mx_SecureBackupPanel_deviceNotVerified"
|
|
||||||
}
|
|
||||||
>
|
|
||||||
{sub}
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
const device = (sub: string): JSX.Element => (
|
|
||||||
<span className="mx_SecureBackupPanel_deviceName">{deviceName}</span>
|
|
||||||
);
|
|
||||||
const fromThisDevice =
|
|
||||||
sig.device && sig.device.getFingerprint() === MatrixClientPeg.safeGet().getDeviceEd25519Key();
|
|
||||||
const fromThisUser =
|
|
||||||
sig.crossSigningId && sig.deviceId === MatrixClientPeg.safeGet().getCrossSigningId();
|
|
||||||
let sigStatus;
|
|
||||||
if (sig.valid && fromThisUser) {
|
|
||||||
sigStatus = _t(
|
|
||||||
"Backup has a <validity>valid</validity> signature from this user",
|
|
||||||
{},
|
|
||||||
{ validity },
|
|
||||||
);
|
|
||||||
} else if (!sig.valid && fromThisUser) {
|
|
||||||
sigStatus = _t(
|
|
||||||
"Backup has a <validity>invalid</validity> signature from this user",
|
|
||||||
{},
|
|
||||||
{ validity },
|
|
||||||
);
|
|
||||||
} else if (sig.crossSigningId) {
|
|
||||||
sigStatus = _t(
|
|
||||||
"Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s",
|
|
||||||
{ deviceId: sig.deviceId },
|
|
||||||
{ verify },
|
|
||||||
);
|
|
||||||
} else if (!sig.device) {
|
|
||||||
sigStatus = _t(
|
|
||||||
"Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s",
|
|
||||||
{ deviceId: sig.deviceId },
|
|
||||||
{ verify },
|
|
||||||
);
|
|
||||||
} else if (sig.valid && fromThisDevice) {
|
|
||||||
sigStatus = _t(
|
|
||||||
"Backup has a <validity>valid</validity> signature from this session",
|
|
||||||
{},
|
|
||||||
{ validity },
|
|
||||||
);
|
|
||||||
} else if (!sig.valid && fromThisDevice) {
|
|
||||||
// it can happen...
|
|
||||||
sigStatus = _t(
|
|
||||||
"Backup has an <validity>invalid</validity> signature from this session",
|
|
||||||
{},
|
|
||||||
{ validity },
|
|
||||||
);
|
|
||||||
} else if (sig.valid && sig.deviceTrust?.isVerified()) {
|
|
||||||
sigStatus = _t(
|
|
||||||
"Backup has a <validity>valid</validity> signature from " +
|
|
||||||
"<verify>verified</verify> session <device></device>",
|
|
||||||
{},
|
|
||||||
{ validity, verify, device },
|
|
||||||
);
|
|
||||||
} else if (sig.valid && !sig.deviceTrust?.isVerified()) {
|
|
||||||
sigStatus = _t(
|
|
||||||
"Backup has a <validity>valid</validity> signature from " +
|
|
||||||
"<verify>unverified</verify> session <device></device>",
|
|
||||||
{},
|
|
||||||
{ validity, verify, device },
|
|
||||||
);
|
|
||||||
} else if (!sig.valid && sig.deviceTrust?.isVerified()) {
|
|
||||||
sigStatus = _t(
|
|
||||||
"Backup has an <validity>invalid</validity> signature from " +
|
|
||||||
"<verify>verified</verify> session <device></device>",
|
|
||||||
{},
|
|
||||||
{ validity, verify, device },
|
|
||||||
);
|
|
||||||
} else if (!sig.valid && !sig.deviceTrust?.isVerified()) {
|
|
||||||
sigStatus = _t(
|
|
||||||
"Backup has an <validity>invalid</validity> signature from " +
|
|
||||||
"<verify>unverified</verify> session <device></device>",
|
|
||||||
{},
|
|
||||||
{ validity, verify, device },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return <div key={i}>{sigStatus}</div>;
|
|
||||||
});
|
|
||||||
if (!backupSigStatus?.sigs?.length) {
|
|
||||||
backupSigStatuses = _t("Backup is not signed by any of your sessions");
|
|
||||||
}
|
|
||||||
|
|
||||||
let trustedLocally: string | undefined;
|
let trustedLocally: string | undefined;
|
||||||
if (backupSigStatus?.trusted_locally) {
|
if (backupSigStatus?.trusted_locally) {
|
||||||
trustedLocally = _t("This backup is trusted because it has been restored on this session");
|
trustedLocally = _t("This backup is trusted because it has been restored on this session");
|
||||||
|
|
@ -415,7 +316,6 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
|
||||||
extraDetails = (
|
extraDetails = (
|
||||||
<>
|
<>
|
||||||
{uploadStatus}
|
{uploadStatus}
|
||||||
<div>{backupSigStatuses}</div>
|
|
||||||
<div>{trustedLocally}</div>
|
<div>{trustedLocally}</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1472,17 +1472,6 @@
|
||||||
"Connect this session to Key Backup": "Connect this session to Key Backup",
|
"Connect this session to Key Backup": "Connect this session to Key Backup",
|
||||||
"Backing up %(sessionsRemaining)s keys…": "Backing up %(sessionsRemaining)s keys…",
|
"Backing up %(sessionsRemaining)s keys…": "Backing up %(sessionsRemaining)s keys…",
|
||||||
"All keys backed up": "All keys backed up",
|
"All keys backed up": "All keys backed up",
|
||||||
"Backup has a <validity>valid</validity> signature from this user": "Backup has a <validity>valid</validity> signature from this user",
|
|
||||||
"Backup has a <validity>invalid</validity> signature from this user": "Backup has a <validity>invalid</validity> signature from this user",
|
|
||||||
"Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s",
|
|
||||||
"Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s",
|
|
||||||
"Backup has a <validity>valid</validity> signature from this session": "Backup has a <validity>valid</validity> signature from this session",
|
|
||||||
"Backup has an <validity>invalid</validity> signature from this session": "Backup has an <validity>invalid</validity> signature from this session",
|
|
||||||
"Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>",
|
|
||||||
"Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>",
|
|
||||||
"Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>",
|
|
||||||
"Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>",
|
|
||||||
"Backup is not signed by any of your sessions": "Backup is not signed by any of your sessions",
|
|
||||||
"This backup is trusted because it has been restored on this session": "This backup is trusted because it has been restored on this session",
|
"This backup is trusted because it has been restored on this session": "This backup is trusted because it has been restored on this session",
|
||||||
"Backup version:": "Backup version:",
|
"Backup version:": "Backup version:",
|
||||||
"Algorithm:": "Algorithm:",
|
"Algorithm:": "Algorithm:",
|
||||||
|
|
|
||||||
|
|
@ -93,9 +93,6 @@ exports[`<SecureBackupPanel /> suggests connecting session to key backup when ba
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<div>
|
|
||||||
Backup is not signed by any of your sessions
|
|
||||||
</div>
|
|
||||||
<div />
|
<div />
|
||||||
</details>
|
</details>
|
||||||
<div
|
<div
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue