Skip to content

fix: trust ring get salt fails for 2% users causing cred store fails #2657

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

Closed
abose wants to merge 2 commits into from
+6 −15
Closed

fix: trust ring get salt fails for 2% users causing cred store fails #2657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c54e0a0
fix: trust ring get salt fails for 2% users causing cred store fails
abose Feb 5, 2026
3d16bc9
chore: update pro deps
abose Feb 6, 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 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.

4 changes: 2 additions & 2 deletions src-node/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.

11 changes: 1 addition & 10 deletions src/phoenix/trust_ring.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@ function _selectKeys() {
}

const CRED_KEY_API = Phoenix.isTestWindow ? "API_KEY_TEST" : "API_KEY";
const CRED_KEY_PROMO = Phoenix.isTestWindow ? "PROMO_GRANT_KEY_TEST" : "PROMO_GRANT_KEY";
const SIGNATURE_SALT_KEY = Phoenix.isTestWindow ? "SIGNATURE_SALT_KEY_TEST" : "SIGNATURE_SALT_KEY";
const CRED_KEY_PROMO = Phoenix.isTestWindow ? "PROMO_GRANT_KEY_TEST" : "PROMO_GRANT_KEY_1";
const VERSION_PORTER_KEY = Phoenix.isTestWindow ? "VERSION_PORTER_TEST" : "VERSION_PORTER";
const { key, iv } = _selectKeys();

Expand Down Expand Up @@ -278,7 +277,6 @@ async function reinstallCreds() {
// Read current credential values
const apiKey = await getCredential(CRED_KEY_API);
const promoKey = await getCredential(CRED_KEY_PROMO);
const saltKey = await getCredential(SIGNATURE_SALT_KEY);

// Remove credentials from keychain
if(apiKey) {
Expand All @@ -287,9 +285,6 @@ async function reinstallCreds() {
if(promoKey) {
await removeCredential(CRED_KEY_PROMO);
}
if(saltKey) {
await removeCredential(SIGNATURE_SALT_KEY);
}

// Re-set credentials to refresh keychain access
if(apiKey) {
Expand All @@ -298,9 +293,6 @@ async function reinstallCreds() {
if(promoKey) {
await setCredential(CRED_KEY_PROMO, promoKey);
}
if(saltKey) {
await setCredential(SIGNATURE_SALT_KEY, saltKey);
}

const currentVersion = Phoenix.metadata.version;
await setCredential(VERSION_PORTER_KEY, currentVersion);
Expand Down Expand Up @@ -383,7 +375,6 @@ async function validateDataSignature(data, signature, salt) {
window.KernalModeTrust = {
CRED_KEY_API,
CRED_KEY_PROMO,
SIGNATURE_SALT_KEY,
aesKeys: { key, iv },
setCredential,
getCredential,
Expand Down
2 changes: 1 addition & 1 deletion tracking-repos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"phoenixPro": {
"commitID": "5a18f02c59ee3fc8d70b637117fcdfdda66fa9bb"
"commitID": "775eb2660a4e912cd603ee85e8da7ef031b5c688"
}
}
Loading