Resolve multiple CVEs

RiotRobot · RiotRobot · commit 66b21e96ca11 · 2022-09-28T13:57:36.000+01:00
CVE-2022-39249 CVE-2022-39250 CVE-2022-39251 CVE-2022-39236
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
@@ -628,9 +628,11 @@ export class UnwrappedEventTile extends React.Component<IProps, IState> {
         }
 
         if (!userTrust.isCrossSigningVerified()) {
-            // user is not verified, so default to everything is normal
+            // If the message is unauthenticated, then display a grey
+            // shield, otherwise if the user isn't cross-signed then
+            // nothing's needed
             this.setState({
-                verified: E2EState.Normal,
+                verified: encryptionInfo.authenticated ? E2EState.Normal : E2EState.Unauthenticated,
             }, this.props.onHeightChanged); // Decryption may have caused a change in size
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -628,9 +628,11 @@ export class UnwrappedEventTile extends React.Component<IProps, IState> {`
`628`	`628`	`}`
`629`	`629`
`630`	`630`	`if (!userTrust.isCrossSigningVerified()) {`
`631`		`- // user is not verified, so default to everything is normal`
	`631`	`+ // If the message is unauthenticated, then display a grey`
	`632`	`+ // shield, otherwise if the user isn't cross-signed then`
	`633`	`+ // nothing's needed`
`632`	`634`	`this.setState({`
`633`		`- verified: E2EState.Normal,`
	`635`	`+ verified: encryptionInfo.authenticated ? E2EState.Normal : E2EState.Unauthenticated,`
`634`	`636`	`}, this.props.onHeightChanged); // Decryption may have caused a change in size`
`635`	`637`	`return;`
`636`	`638`	`}`