Fix accidental duress stash creation in loginWithKey

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- fixed: Bug causing duress account creation from `loginWithKey` while in duress mode.
 - fixed: Clean the Android build folder, so leftover files don't get published.
 
 ## 2.27.2 (2025-05-08)

src/core/context/context-api.ts

@@ -150,6 +150,13 @@ export function makeContextApi(ai: ApiInput): EdgeContext {
         throw new Error(`Cannot find requested appId: "${appId}"`)
       }
 
+      // Get the duress stash for existence check:
+      const duressAppId = appId + '.duress'
+      const duressStash = searchTree(
+        stashTree,
+        stash => stash.appId === duressAppId
+      )
+
       let sessionKey: SessionKey
       try {
         sessionKey = {
@@ -161,9 +168,6 @@ export function makeContextApi(ai: ApiInput): EdgeContext {
         makeAuthJson(stashTree, sessionKey)
       } catch (error) {
         if (error instanceof Error && error.message === 'Invalid checksum') {
-          const duressStash = searchTree(stashTree, stash =>
-            stash.appId.endsWith('.duress')
-          )
           if (duressStash == null) {
             throw error
           }
@@ -188,7 +192,8 @@ export function makeContextApi(ai: ApiInput): EdgeContext {
 
       return await makeAccount(ai, sessionKey, 'keyLogin', {
         ...opts,
-        duressMode: inDuressMode
+        // We must require that the duress account exists:
+        duressMode: inDuressMode && duressStash != null
       })
     },
 

test/core/login/login.test.ts

@@ -523,6 +523,50 @@ describe('duress', function () {
     expect(topicAccount.isDuressAccount).equals(true)
   })
 
+  it('Avoid creating duress account when using loginWithPassword', async function () {
+    const world = await makeFakeEdgeWorld([fakeUser], quiet)
+    const context = await world.makeEdgeContext(contextOptions)
+    const otherAccount = await context.createAccount({
+      username: 'new-user',
+      pin: '1111'
+    })
+    // Create duress account:
+    await otherAccount.changePin({ pin: '0000', forDuressAccount: true })
+    await otherAccount.logout()
+    // Activate duress mode:
+    const duressAccount = await context.loginWithPIN('new-user', '0000')
+    await duressAccount.logout()
+
+    // Login to the main account using password:
+    const topicAccount = await context.loginWithPassword(
+      fakeUser.username,
+      fakeUser.password
+    )
+    expect(topicAccount.isDuressAccount).equals(false)
+  })
+
+  it('Avoid creating duress account when using loginWithPIN', async function () {
+    const world = await makeFakeEdgeWorld([fakeUser], quiet)
+    const context = await world.makeEdgeContext(contextOptions)
+    const otherAccount = await context.createAccount({
+      username: 'new-user',
+      pin: '1111'
+    })
+    // Create duress account:
+    await otherAccount.changePin({ pin: '0000', forDuressAccount: true })
+    await otherAccount.logout()
+    // Activate duress mode:
+    const duressAccount = await context.loginWithPIN('new-user', '0000')
+    await duressAccount.logout()
+
+    // Login to the main account using password:
+    const topicAccount = await context.loginWithPIN(
+      fakeUser.username,
+      fakeUser.pin
+    )
+    expect(topicAccount.isDuressAccount).equals(false)
+  })
+
   it('persist duress mode when using loginWithKey', async function () {
     const world = await makeFakeEdgeWorld([fakeUser], quiet)
     const context = await world.makeEdgeContext(contextOptions)
@@ -547,6 +591,28 @@ describe('duress', function () {
     expect(topicAccount2.isDuressAccount).equals(true)
   })
 
+  it('Avoid creating duress account when using loginWithKey', async function () {
+    const world = await makeFakeEdgeWorld([fakeUser], quiet)
+    const context = await world.makeEdgeContext(contextOptions)
+    const otherAccount = await context.createAccount({
+      username: 'new-user',
+      pin: '1111'
+    })
+    const loginKey = await otherAccount.getLoginKey()
+    await otherAccount.logout()
+    const account = await context.loginWithPIN(fakeUser.username, fakeUser.pin)
+    // Create duress account:
+    await account.changePin({ pin: '0000', forDuressAccount: true })
+    await account.logout()
+    // Activate duress mode:
+    const duressAccount = await context.loginWithPIN(fakeUser.username, '0000')
+    await duressAccount.logout()
+
+    // Login to the main account using the loginKey:
+    const topicAccount = await context.loginWithKey('new-user', loginKey)
+    expect(topicAccount.isDuressAccount).equals(false)
+  })
+
   it('check password', async function () {
     const world = await makeFakeEdgeWorld([fakeUser], quiet)
     const context = await world.makeEdgeContext(contextOptions)