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

fix(extension): #107: allow http for localhost #153

Merged
merged 5 commits into from
Aug 13, 2024
Merged

fix(extension): #107: allow http for localhost #153

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae0c09d
fix(extension): #107: allow http for localhost
VanishMax Jul 26, 2024
f0198bb
fix(extension): #107: allow http for localhost only for dev environment
VanishMax Jul 29, 2024
a179d84
Merge remote-tracking branch 'origin/main' into fix/#107-allow-http-f…
VanishMax Aug 12, 2024
e792473
fix(extension): #107: fix matching urls in the manifest
VanishMax Aug 12, 2024
e0840f5
fix(extension): #107: add more test cases
VanishMax Aug 13, 2024
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 apps/extension/public/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
},
"content_scripts": [
{
"matches": ["https://*/*"],
"matches": ["https://*/*", "http://localhost/*"],
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 line, instead of the previously used one, must work correctly according to the docs: https://developer.chrome.com/docs/extensions/develop/concepts/match-patterns#special

Copy link
Contributor

Choose a reason for hiding this comment

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

Just checked a test upload, it works 👍

"js": ["injected-connection-port.js", "injected-request-listener.js"],
"run_at": "document_start"
},
{
"matches": ["https://*/*"],
"matches": ["https://*/*", "http://localhost/*"],
"js": ["injected-penumbra-global.js"],
"run_at": "document_start",
"world": "MAIN"
Expand Down
18 changes: 12 additions & 6 deletions apps/extension/src/senders/validate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ type ValidSender = chrome.runtime.MessageSender & {
frameId: 0;
documentId: string;
tab: chrome.tabs.Tab & { id: number };

// the relationship between origin and url is pretty complex.
// just rely on the browser's tools.
origin: `${ValidProtocol}//${string}`;
url: `${ValidProtocol}//${string}/${string}`;
origin: string;
url: string;
};

const isHttpLocalhost = (url: URL): boolean =>
url.protocol === 'http:' && url.hostname === 'localhost';

export const assertValidSender = (sender?: chrome.runtime.MessageSender) => {
if (!sender) {
throw new Error('Sender undefined');
Expand All @@ -34,7 +34,13 @@ export const assertValidSender = (sender?: chrome.runtime.MessageSender) => {
if (parsedOrigin.origin !== sender.origin) {
throw new Error('Sender origin is invalid');
}
if (!(parsedOrigin.protocol in ValidProtocol)) {

if (
!(
parsedOrigin.protocol in ValidProtocol ||
(globalThis.__DEV__ && isHttpLocalhost(parsedOrigin))
Copy link
Contributor

Choose a reason for hiding this comment

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

Stumbled upon this today. I was trying to connect a production Prax to the dev Dex explorer and it would silently fail. Think we should drop the requirement that the dev version of Prax is needed to connect to localhost sites:

parsedOrigin.protocol in ValidProtocol ||
- (globalThis.__DEV__ && isHttpLocalhost(parsedOrigin))
+ isHttpLocalhost(parsedOrigin)

@VanishMax can you open a follow PR on this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@grod220 no problem! #208

)
) {
Comment on lines +38 to +43
Copy link
Contributor

Choose a reason for hiding this comment

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

todo: we should have a test for this in validate.test.ts. Also, could you check that test suite to ensure we've covered all cases for this function?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@grod220 thanks for pointing this out. I should pay more attention to the tests

throw new Error(`Sender protocol is not ${Object.values(ValidProtocol).join(',')}`);
}

Expand Down