SELF-1190: patch turnkey to prevent keychain deletes #1388
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| diff --git a/node_modules/@turnkey/core/dist/__clients__/core.js b/node_modules/@turnkey/core/dist/__clients__/core.js | ||
| index 3400c3d..324097a 100644 | ||
| --- a/node_modules/@turnkey/core/dist/__clients__/core.js | ||
| +++ b/node_modules/@turnkey/core/dist/__clients__/core.js | ||
| @@ -2903,6 +2903,25 @@ class TurnkeyClient { | ||
| if (!publicKeys || publicKeys.length === 0) { | ||
| return; | ||
| } | ||
| + // PATCH: Filter out non-Turnkey keychain services to avoid deleting app data | ||
| + // Turnkey uses P256 keys: compressed (66 hex chars) or uncompressed (130 hex chars) | ||
| + // App services: 'secret', 'documentCatalog', 'document-{64-char-hash}', etc. | ||
| + console.log('[Turnkey Patch] All keychain services:', publicKeys); | ||
| + const filteredPublicKeys = publicKeys.filter(key => { | ||
| + // Only process keys that look like P256 public key hex strings (66 or 130 chars) | ||
| + // This excludes document hashes (64 chars) and service names with non-hex chars | ||
| + const isTurnkeyKey = typeof key === 'string' && | ||
| + (key.length === 66 || key.length === 130) && | ||
| + /^[0-9a-fA-F]+$/.test(key); | ||
| + if (!isTurnkeyKey && key) { | ||
| + console.log('[Turnkey Patch] Skipping non-Turnkey service:', key); | ||
| + } | ||
| + return isTurnkeyKey; | ||
| + }); | ||
| + console.log('[Turnkey Patch] Filtered Turnkey keys:', filteredPublicKeys); | ||
coderabbitai[bot] marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| + if (filteredPublicKeys.length === 0) { | ||
| + return; | ||
| + } | ||
| const sessionKeys = await this.storageManager?.listSessionKeys(); | ||
| const sessionTokensMap = {}; | ||
| for (const sessionKey of sessionKeys) { | ||
| @@ -2911,7 +2930,7 @@ class TurnkeyClient { | ||
| sessionTokensMap[session.publicKey] = sessionKey; | ||
| } | ||
| } | ||
| - for (const publicKey of publicKeys) { | ||
| + for (const publicKey of filteredPublicKeys) { | ||
| if (!sessionTokensMap[publicKey]) { | ||
| try { | ||
| await this.apiKeyStamper?.deleteKeyPair(publicKey); | ||
| diff --git a/node_modules/@turnkey/core/dist/__clients__/core.mjs b/node_modules/@turnkey/core/dist/__clients__/core.mjs | ||
| index 09353bc..11f895c 100644 | ||
| --- a/node_modules/@turnkey/core/dist/__clients__/core.mjs | ||
| +++ b/node_modules/@turnkey/core/dist/__clients__/core.mjs | ||
| @@ -2901,6 +2901,25 @@ class TurnkeyClient { | ||
| if (!publicKeys || publicKeys.length === 0) { | ||
| return; | ||
| } | ||
| + // PATCH: Filter out non-Turnkey keychain services to avoid deleting app data | ||
| + // Turnkey uses P256 keys: compressed (66 hex chars) or uncompressed (130 hex chars) | ||
| + // App services: 'secret', 'documentCatalog', 'document-{64-char-hash}', etc. | ||
| + console.log('[Turnkey Patch] All keychain services:', publicKeys); | ||
| + const filteredPublicKeys = publicKeys.filter(key => { | ||
| + // Only process keys that look like P256 public key hex strings (66 or 130 chars) | ||
| + // This excludes document hashes (64 chars) and service names with non-hex chars | ||
| + const isTurnkeyKey = typeof key === 'string' && | ||
| + (key.length === 66 || key.length === 130) && | ||
| + /^[0-9a-fA-F]+$/.test(key); | ||
| + if (!isTurnkeyKey && key) { | ||
| + console.log('[Turnkey Patch] Skipping non-Turnkey service:', key); | ||
| + } | ||
| + return isTurnkeyKey; | ||
| + }); | ||
| + console.log('[Turnkey Patch] Filtered Turnkey keys:', filteredPublicKeys); | ||
| + if (filteredPublicKeys.length === 0) { | ||
| + return; | ||
| + } | ||
| const sessionKeys = await this.storageManager?.listSessionKeys(); | ||
| const sessionTokensMap = {}; | ||
| for (const sessionKey of sessionKeys) { | ||
| @@ -2909,7 +2928,7 @@ class TurnkeyClient { | ||
| sessionTokensMap[session.publicKey] = sessionKey; | ||
| } | ||
| } | ||
| - for (const publicKey of publicKeys) { | ||
| + for (const publicKey of filteredPublicKeys) { | ||
| if (!sessionTokensMap[publicKey]) { | ||
| try { | ||
| await this.apiKeyStamper?.deleteKeyPair(publicKey); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5888,7 +5888,7 @@ __metadata: | |
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "@peculiar/asn1-schema@npm:^2.3.13, @peculiar/asn1-schema@npm:^2.5.0": | ||
| version: 2.5.0 | ||
| resolution: "@peculiar/asn1-schema@npm:2.5.0" | ||
| dependencies: | ||
|
|
@@ -5923,28 +5923,6 @@ __metadata: | |
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "@peculiar/x509@npm:1.12.3": | ||
| version: 1.12.3 | ||
| resolution: "@peculiar/x509@npm:1.12.3" | ||
|
|
@@ -7413,8 +7391,9 @@ __metadata: | |
| "@testing-library/react-native": "npm:^13.3.3" | ||
| "@tsconfig/react-native": "npm:^3.0.6" | ||
| "@turnkey/api-key-stamper": "npm:^0.5.0" | ||
| "@turnkey/core": "npm:1.7.0" | ||
| "@turnkey/encoding": "npm:^0.6.0" | ||
| "@turnkey/react-native-wallet-kit": "npm:1.1.5" | ||
| "@types/bn.js": "npm:^5.2.0" | ||
| "@types/dompurify": "npm:^3.2.0" | ||
| "@types/elliptic": "npm:^6.4.18" | ||
|
|
@@ -11487,15 +11466,15 @@ __metadata: | |
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "@turnkey/core@npm:1.7.0": | ||
| version: 1.7.0 | ||
| resolution: "@turnkey/core@npm:1.7.0" | ||
| dependencies: | ||
| "@turnkey/api-key-stamper": "npm:0.5.0" | ||
| "@turnkey/crypto": "npm:2.8.5" | ||
| "@turnkey/encoding": "npm:0.6.0" | ||
| "@turnkey/http": "npm:3.15.0" | ||
| "@turnkey/sdk-types": "npm:0.8.0" | ||
| "@turnkey/webauthn-stamper": "npm:0.6.0" | ||
| "@wallet-standard/app": "npm:^1.1.0" | ||
| "@wallet-standard/base": "npm:^1.1.0" | ||
|
|
@@ -11508,7 +11487,7 @@ __metadata: | |
| viem: "npm:^2.33.1" | ||
| peerDependencies: | ||
| "@react-native-async-storage/async-storage": ^2.2.0 | ||
| "@turnkey/react-native-passkey-stamper": 1.2.5 | ||
| react-native-keychain: ^8.1.0 || ^9.2.2 || ^10.0.0 | ||
| peerDependenciesMeta: | ||
| "@react-native-async-storage/async-storage": | ||
|
|
@@ -11517,24 +11496,23 @@ __metadata: | |
| optional: true | ||
| react-native-keychain: | ||
| optional: true | ||
| checksum: 10c0/f8b54d61271b36842ec741e811c8be0e05b24fcbb0e1a263fe333744b785e5b7dcbc8a902f8550120f418be830e65000536644dfb2e29d9271fb2c9573229549 | ||
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "@turnkey/crypto@npm:2.8.5": | ||
| version: 2.8.5 | ||
| resolution: "@turnkey/crypto@npm:2.8.5" | ||
| dependencies: | ||
| "@noble/ciphers": "npm:1.3.0" | ||
| "@noble/curves": "npm:1.9.0" | ||
| "@noble/hashes": "npm:1.8.0" | ||
| "@peculiar/x509": "npm:1.12.3" | ||
| "@turnkey/encoding": "npm:0.6.0" | ||
| "@turnkey/sdk-types": "npm:0.8.0" | ||
| borsh: "npm:2.0.0" | ||
| cbor-js: "npm:0.1.0" | ||
| checksum: 10c0/b03719ef40f1b9850816858ff79596489bbcb877e5ae95b8bf596fa1f1c78828aa155bf55fb3dd85ea70910439f59a7c53287fc638bfc4577dc2dddebc2abda9 | ||
| languageName: node | ||
| linkType: hard | ||
|
|
||
|
|
@@ -11548,42 +11526,42 @@ __metadata: | |
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "@turnkey/http@npm:3.15.0": | ||
| version: 3.15.0 | ||
| resolution: "@turnkey/http@npm:3.15.0" | ||
| dependencies: | ||
| "@turnkey/api-key-stamper": "npm:0.5.0" | ||
| "@turnkey/encoding": "npm:0.6.0" | ||
| "@turnkey/webauthn-stamper": "npm:0.6.0" | ||
| cross-fetch: "npm:^3.1.5" | ||
| checksum: 10c0/edc5ea44bb702fd85ad92d4d4af0ee84accf1a230506bcfbe5a9530c7b15ace36aa037b77842a6dd953a5aab9488ada92110c1c9e69086e355077b7db7533340 | ||
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "@turnkey/react-native-passkey-stamper@npm:1.2.5": | ||
| version: 1.2.5 | ||
| resolution: "@turnkey/react-native-passkey-stamper@npm:1.2.5" | ||
| dependencies: | ||
| "@turnkey/encoding": "npm:0.6.0" | ||
| "@turnkey/http": "npm:3.15.0" | ||
| buffer: "npm:^6.0.3" | ||
| react-native-passkey: "npm:^3.0.0" | ||
| sha256-uint8array: "npm:^0.10.7" | ||
| checksum: 10c0/8f5856a0d046c71be962a3f390abfcfd1ce9c0052f96f9d408edfbd6e05d62cda34be27ebb2084bb0287f278f9da585b71852f53c39f453d67bfa9296a01c305 | ||
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "@turnkey/react-native-wallet-kit@npm:1.1.5": | ||
| version: 1.1.5 | ||
| resolution: "@turnkey/react-native-wallet-kit@npm:1.1.5" | ||
| dependencies: | ||
| "@noble/hashes": "npm:^1.8.0" | ||
| "@react-native-async-storage/async-storage": "npm:^2.2.0" | ||
| "@turnkey/core": "npm:1.7.0" | ||
| "@turnkey/crypto": "npm:2.8.5" | ||
| "@turnkey/encoding": "npm:0.6.0" | ||
| "@turnkey/react-native-passkey-stamper": "npm:1.2.5" | ||
| "@turnkey/sdk-types": "npm:0.8.0" | ||
| react-native-device-info: "npm:^11.1.0" | ||
| peerDependencies: | ||
| "@types/react": ">=16.8.0 <20" | ||
|
|
@@ -11596,14 +11574,14 @@ __metadata: | |
| peerDependenciesMeta: | ||
| "@types/react": | ||
| optional: true | ||
| checksum: 10c0/552c962a0a8df347d3342fa6d2d5210867c8c8aaac61936fc55e06e23607dfccbb007f3e7e60442e46d5f598d13ebbd7b90f47288e77d1d88c2c60cb8fcb1e91 | ||
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "@turnkey/sdk-types@npm:0.8.0": | ||
| version: 0.8.0 | ||
| resolution: "@turnkey/sdk-types@npm:0.8.0" | ||
| checksum: 10c0/16d88fe7b1f9ed04063d59f2895371ce89295486ec569543055a2ccc92bcb31ab4a7f3cab58930261b362f2a09f2b7fc5f400e4e036f449f003f859ec29cfdf3 | ||
| languageName: node | ||
| linkType: hard | ||
|
|
||
|
|
@@ -15403,16 +15381,6 @@ __metadata: | |
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "buffer@npm:^5.4.3, buffer@npm:^5.5.0": | ||
| version: 5.7.1 | ||
| resolution: "buffer@npm:5.7.1" | ||
|
|
@@ -15423,6 +15391,16 @@ __metadata: | |
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "buffer@npm:^6.0.3": | ||
| version: 6.0.3 | ||
| resolution: "buffer@npm:6.0.3" | ||
| dependencies: | ||
| base64-js: "npm:^1.3.1" | ||
| ieee754: "npm:^1.2.1" | ||
| checksum: 10c0/2a905fbbcde73cc5d8bd18d1caa23715d5f83a5935867c2329f0ac06104204ba7947be098fe1317fbd8830e26090ff8e764f08cd14fefc977bb248c3487bcbd0 | ||
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "bundle-name@npm:^4.1.0": | ||
| version: 4.1.0 | ||
| resolution: "bundle-name@npm:4.1.0" | ||
|
|
@@ -29430,7 +29408,7 @@ __metadata: | |
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "sha256-uint8array@npm:^0.10.7": | ||
| version: 0.10.7 | ||
| resolution: "sha256-uint8array@npm:0.10.7" | ||
| checksum: 10c0/b48dd49be908906d8a148ce023994e567977795f489a22a7837eede2ebab59399c8ba37d65a2b65fc43704a435e0c4add74661d4fbff31f4a07b81a35c5343ea | ||
|
|
@@ -31465,7 +31443,7 @@ __metadata: | |
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "tslib@npm:2.8.1, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.6.0, tslib@npm:^2.6.3, tslib@npm:^2.7.0, tslib@npm:^2.8.0, tslib@npm:^2.8.1": | ||
| version: 2.8.1 | ||
| resolution: "tslib@npm:2.8.1" | ||
| checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62 | ||
|
|
@@ -32746,19 +32724,6 @@ __metadata: | |
| languageName: node | ||
| linkType: hard | ||
|
|
||
| "webdriver-bidi-protocol@npm:0.2.11": | ||
| version: 0.2.11 | ||
| resolution: "webdriver-bidi-protocol@npm:0.2.11" | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.