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

Jump to bottom

Cross extensions messaging feature #935

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+21 −2
Open

Cross extensions messaging feature #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51a4aa3
Implement addListener for chrome external connections
LaurentTrk Dec 21, 2021
5399dc5
Authorize chrome extension urls
LaurentTrk Dec 21, 2021
76571ae
[OPTIONAL] Add website/extension origin when displaying websites access
LaurentTrk Dec 21, 2021
d60bc67
Authorize firefox extension url
LaurentTrk Dec 21, 2021
7da8924
Merge branch 'master' into CrossExtensionMessagingFeature
LaurentTrk Jan 3, 2022
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
14 changes: 13 additions & 1 deletion packages/extension-base/src/background/handlers/State.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ export enum NotificationOptions {

const AUTH_URLS_KEY = 'authUrls';

const AUTHORIZED_URL_SCHEMES = ['http', 'https', 'ipfs', 'ipns', 'chrome-extension', 'moz-extension'];

function extractMetadata (store: MetadataStore): void {
store.allMap((map): void => {
const knownEntries = Object.entries(knownGenesis);
Expand Down Expand Up @@ -290,13 +292,23 @@ export default class State {
};

private stripUrl (url: string): string {
assert(url && (url.startsWith('http:') || url.startsWith('https:') || url.startsWith('ipfs:') || url.startsWith('ipns:')), `Invalid url ${url}, expected to start with http: or https: or ipfs: or ipns:`);
assert(url && this.urlIsAuthorized(url), `Invalid url ${url}, expected to start with http: or https: or ipfs: or ipns:`);

const parts = url.split('/');

return parts[2];
}

private urlIsAuthorized (url: string): boolean {
for (const authorizedScheme of AUTHORIZED_URL_SCHEMES) {
if (url.startsWith(`${authorizedScheme}:`)) {
return true;
}
}

return false;
}

private updateIcon (shouldClose?: boolean): void {
const authCount = this.numAuthRequests;
const metaCount = this.numMetaRequests;
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-ui/src/Popup/AuthManagement/WebsiteEntry.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function WebsiteEntry ({ className = '', info, toggleAuth, url }: Props): React.
return (
<div className={`${className} ${info.isAllowed ? 'allowed' : 'denied'}`}>
<div className='url'>
{url}
{info.origin} ({url})
Copy link
Author

Choose a reason for hiding this comment

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

Optional change: that improves the website listing when using extensions (extension url is the extension id which means nothing to the user)

</div>
<Switch
checked={info.isAllowed}
Expand Down
7 changes: 7 additions & 0 deletions packages/extension/src/background.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ chrome.runtime.onConnect.addListener((port): void => {
port.onDisconnect.addListener(() => console.log(`Disconnected from ${port.name}`));
});

// listen to external requests coming from other extensions
chrome.runtime.onConnectExternal.addListener((port): void => {
// message and disconnect handlers
port.onMessage.addListener((data: TransportRequestMessage<keyof RequestSignatures>) => handlers(data, port));
port.onDisconnect.addListener(() => console.log(`Disconnected from ${port.name}`));
});

// initial setup
cryptoWaitReady()
.then((): void => {
Expand Down