Skip to content

BE-7952 Wrap the platform.unwrapKey with try-catch block in the processKdFolderKeys to avoid complete sync down failure #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hleekeeper merged 4 commits into from
Jul 30, 2026
Merged

BE-7952 Wrap the platform.unwrapKey with try-catch block in the processKdFolderKeys to avoid complete sync down failure #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd5a656
Wrap the platform.unwrapKey with try-catch block in the processKdFold…
hleekeeper Jul 30, 2026
b36450e
formatter
hleekeeper Jul 30, 2026
7ef5abb
v18.0.7
hleekeeper Jul 30, 2026
e9159d6
replaced the console with logger in the vault.ts
hleekeeper Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions keeperapi/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion keeperapi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@keeper-security/keeperapi",
"description": "Keeper API Javascript SDK",
"version": "18.0.6",
"version": "18.0.7",
"browser": "dist/browser/index.js",
"main": "dist/index.cjs.js",
"types": "dist/node/index.d.ts",
Expand Down
10 changes: 3 additions & 7 deletions keeperapi/src/browser/platform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,13 +613,9 @@ export const browserPlatform: Platform = class {
}

static async importECCJsonWebKey(jwk: JsonWebKey, extractable = true): Promise<CryptoKey> {
return await crypto.subtle.importKey(
'jwk',
jwk,
{ name: 'ECDH', namedCurve: 'P-256' },
extractable,
['deriveBits']
)
return await crypto.subtle.importKey('jwk', jwk, { name: 'ECDH', namedCurve: 'P-256' }, extractable, [
Comment thread
hleekeeper marked this conversation as resolved.
'deriveBits',
])
}

static async ecdhComputeSharedSecret(
Expand Down
16 changes: 11 additions & 5 deletions keeperapi/src/vault.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,8 +1121,8 @@ const processKdRecordLinks = async (storage: VaultStorage, keeperDriveRecordLink
parentRecordUid,
})
} catch (e: any) {
console.error(
`[ks] The record link for ${childRecordUid} cannot be decrypted by ${parentRecordUid} (${e.message})`
logger.error(
`[kd] The record link for ${childRecordUid} cannot be decrypted by ${parentRecordUid} (${e.message})`
)
}
}
Expand Down Expand Up @@ -1182,7 +1182,13 @@ const processKdFolderKeys = async (storage: VaultStorage, folderKeys?: Folder.IF
if (!key.folderUid || !key.folderKey || !key.parentUid || isNil(key.encryptedBy)) continue
const folderUid = webSafe64FromBytes(key.folderUid)
const parentUid = webSafe64FromBytes(key.parentUid)
await platform.unwrapKey(key.folderKey, folderUid, parentUid, 'gcm', 'aes', storage)
try {
await platform.unwrapKey(key.folderKey, folderUid, parentUid, 'gcm', 'aes', storage)
Comment thread
hleekeeper marked this conversation as resolved.
} catch (e: any) {
logger.error(
`[kd] The folder key for ${folderUid} can't be decrypted by the parent key ${parentUid} (${e.message})`
)
}
}
}

Expand Down Expand Up @@ -1288,7 +1294,7 @@ const processKdFolders = async (storage: VaultStorage, keeperDriveFolders?: Fold
inheritUserPermissions: toOptional(folder.inheritUserPermissions),
})
} catch (err: any) {
console.error(`[ks] folder ${folderUid} cannot be decrypted (${err.message})`)
logger.error(`[kd] folder ${folderUid} cannot be decrypted (${err.message})`)
}
}
}
Expand Down Expand Up @@ -1423,7 +1429,7 @@ const processKdRecords = async (
isKeeperDriveData: true,
})
} catch (err: any) {
console.error(`[kd] record ${recordUid} cannot be decrypted: ${err.message}`)
logger.error(`[kd] record ${recordUid} cannot be decrypted: ${err.message}`)
}
}
}
Expand Down
Loading