Skip to content
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

Sign in with Ethereum: re-enable warning UI for mismatched domains / disable domain binding #18200

Merged
merged 8 commits into from
Mar 17, 2023
Merged

Sign in with Ethereum: re-enable warning UI for mismatched domains / disable domain binding #18200

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d924916
siwe: re-enable warning UI for mismatched domains
digiwand Mar 16, 2023
9fb40be
siwe: fix mismatch domain warning msg UI
digiwand Mar 16, 2023
da120ff
lint: rm whitespace EOL
digiwand Mar 16, 2023
c80a4a2
siwe: rm unit test
digiwand Mar 16, 2023
bdbc997
lint: fix whitespace
digiwand Mar 16, 2023
185213d
Merge branch 'develop' into fix-siwe-unblock-mismatch-domain-with-war…
legobeat Mar 16, 2023
412a91a
Revert "siwe: rm unit test"
digiwand Mar 17, 2023
e11c2fc
Merge branch 'develop' into fix-siwe-unblock-mismatch-domain-with-war…
digiwand Mar 17, 2023
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
9 changes: 0 additions & 9 deletions app/scripts/lib/personal-message-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,6 @@ export default class PersonalMessageManager extends EventEmitter {
const siwe = detectSIWE(msgParams);
msgParams.siwe = siwe;

if (siwe.isSIWEMessage && req.origin) {
const { host } = new URL(req.origin);
if (siwe.parsedMessage.domain !== host) {
throw new Error(
`SIWE domain is not valid: "${host}" !== "${siwe.parsedMessage.domain}"`,
);
}
}

// create txData obj with parameters and meta data
const time = new Date().getTime();
const msgId = createId();
Expand Down
41 changes: 0 additions & 41 deletions app/scripts/lib/personal-message-manager.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,45 +148,4 @@ describe('Personal Message Manager', () => {
expect(output).toStrictEqual('0x12');
});
});

describe('#addUnapprovedMessage', () => {
const origin = 'http://localhost:8080';
const from = '0xFb2C15004343904e5f4082578c4e8e11105cF7e3';
const msgParams = {
from,
data: '0x6c6f63616c686f73743a383038302077616e747320796f7520746f207369676e20696e207769746820796f757220457468657265756d206163636f756e743a0a3078466232433135303034333433393034653566343038323537386334653865313131303563463765330a0a436c69636b20746f207369676e20696e20616e642061636365707420746865205465726d73206f6620536572766963653a2068747470733a2f2f636f6d6d756e6974792e6d6574616d61736b2e696f2f746f730a0a5552493a20687474703a2f2f6c6f63616c686f73743a383038300a56657273696f6e3a20310a436861696e2049443a20310a4e6f6e63653a2053544d74364b514d7777644f58453330360a4973737565642041743a20323032322d30332d31385432313a34303a34302e3832335a0a5265736f75726365733a0a2d20697066733a2f2f516d653773733341525667787636725871565069696b4d4a3875324e4c676d67737a673133705972444b456f69750a2d2068747470733a2f2f6578616d706c652e636f6d2f6d792d776562322d636c61696d2e6a736f6e',
};

it('should detect SIWE messages', async () => {
const request = { origin };
const nonSiweMsgParams = {
from,
data: '0x879a053d4800c6354e76c7985a865d2922c82fb5b3f4577b2fe08b998954f2e0',
};
// siwe message
const msgId = await messageManager.addUnapprovedMessage(
msgParams,
request,
);
const result = messageManager.getMsg(msgId);
expect(result.msgParams.siwe.isSIWEMessage).toStrictEqual(true);
// non-siwe message
const msgId2 = await messageManager.addUnapprovedMessage(
nonSiweMsgParams,
request,
);
const result2 = messageManager.getMsg(msgId2);
expect(result2.msgParams.siwe.isSIWEMessage).toStrictEqual(false);
});
digiwand marked this conversation as resolved.
Show resolved Hide resolved

it("should throw an error if the SIWE message's domain doesn't match", async () => {
const request = { origin: 'https://mismatched-domain.com' };
const { host: siweDomain } = new URL(origin);
const { host: browserDomain } = new URL(request.origin);
const expectedError = `SIWE domain is not valid: "${browserDomain}" !== "${siweDomain}"`;
await expect(async () => {
await messageManager.addUnapprovedMessage(msgParams, request);
}).rejects.toThrow(expectedError);
});
});
});
15 changes: 11 additions & 4 deletions ui/components/app/signature-request-siwe/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,25 @@
box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
}

/** @todo replace ActionableMessage or remove overwritten code. */
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is addressed in this follow-up PR: #18207

.signature-request-siwe__actionable-message {
margin: 0 16px 16px;
margin: 0 16px;
flex-direction: row;
align-items: initial;

.icon {
position: absolute;
left: 17px;
top: 13px;
}
}

.actionable-message--with-icon.actionable-message--with-right-button {
padding-left: 48px;
.actionable-message__message {
padding-left: 16px;
}

&.actionable-message--with-icon {
padding-left: 16px;
}
}
}

Expand Down
1 change: 0 additions & 1 deletion ui/components/app/signature-request-siwe/signature-request-siwe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ export default function SignatureRequestSIWE({
}
iconFillColor="var(--color-error-default)"
useIcon
withRightButton
icon={<Icon name="danger" color={IconColor.errorDefault} />}
/>
)}
Expand Down