Page MenuHomePhabricator
Files F3540908

D14030.id46017.diff
No OneTemporary
Actions

D14030.id46017.diff
View Options

diff --git a/keyserver/src/socket/tunnelbroker.js b/keyserver/src/socket/tunnelbroker.js
--- a/keyserver/src/socket/tunnelbroker.js
+++ b/keyserver/src/socket/tunnelbroker.js
@@ -47,8 +47,13 @@
import sleep from 'lib/utils/sleep.js';
import { fetchOlmAccount } from '../updaters/olm-account-updater.js';
-import { fetchIdentityInfo, saveIdentityInfo } from '../user/identity.js';
+import {
+ clearIdentityInfo,
+ fetchIdentityInfo,
+ saveIdentityInfo,
+} from '../user/identity.js';
import type { IdentityInfo } from '../user/identity.js';
+import { verifyUserLoggedIn } from '../user/login.js';
import { encrypt, decrypt } from '../utils/aes-crypto-utils.js';
import {
getContentSigningKey,
@@ -83,15 +88,26 @@
getTBConnectionInfo(),
]);
const createNewTunnelbrokerSocket = async (
+ identityInfo: ?IdentityInfo,
shouldNotifyPrimaryAfterReopening: boolean,
primaryDeviceID: ?string,
) => {
- const identityInfo = await fetchIdentityInfo();
new TunnelbrokerSocket({
socketURL: tbConnectionInfo.url,
onClose: async (successfullyAuthed: boolean, primaryID: ?string) => {
await sleep(clientTunnelbrokerSocketReconnectDelay);
- await createNewTunnelbrokerSocket(successfullyAuthed, primaryID);
+
+ let newIdentityInfo = identityInfo;
+ if (!encryptionKey) {
+ // for non-QR flow we can retry login
+ newIdentityInfo = await verifyUserLoggedIn();
+ }
+
+ await createNewTunnelbrokerSocket(
+ newIdentityInfo,
+ successfullyAuthed,
+ primaryID,
+ );
},
identityInfo,
deviceID,
@@ -100,7 +116,8 @@
shouldNotifyPrimaryAfterReopening,
});
};
- await createNewTunnelbrokerSocket(false, null);
+ const identityInfo = await fetchIdentityInfo();
+ await createNewTunnelbrokerSocket(identityInfo, false, null);
}
type TunnelbrokerSocketParams = {
@@ -262,6 +279,11 @@
'received ConnectionInitializationResponse with status: Success for already connected socket',
);
} else {
+ if (message.status.data?.includes('UnauthorizedDevice')) {
+ await clearIdentityInfo();
+ this.closeConnection();
+ return;
+ }
this.connected = false;
console.error(
'creating session with Tunnelbroker error:',

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 27, 5:51 AM (3 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2710981
Default Alt Text
D14030.id46017.diff (2 KB)

Event Timeline