Skip to content

feat: validate origins based on hostnames #224

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

Merged
vcnainala merged 2 commits into from
Aug 14, 2024
Merged

feat: validate origins based on hostnames #224

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
57edf5c
feat: validate origins based on hostnames
hamed-musallam Aug 1, 2024
5d32319
fix: correct invalid url in the whitelist
hamed-musallam Aug 1, 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
2 changes: 1 addition & 1 deletion src/allowed-origins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"https://chemotion-t-02.zdv.uni-mainz.de",
"https://pregl.ac.rwth-aachen.de",
"https://schindler-ag.rwth-aachen.de",
"10.195.9.248",
"http://10.195.9.248",
"https://dev1.zit.ph.tum.de",
"https://org2619.chemie.uni-leipzig.de",
"https://chemotion.ac.chemie.intern.uni-leipzig.de",
Expand Down
17 changes: 16 additions & 1 deletion src/events/event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ function on<T extends EventType>(
} = {},
) {
const { eventOptions, allowedOrigins = [] } = options;
const allowedHostnames = new Set(
allowedOrigins.map(getHostName).filter(Boolean),
);

function listener(event: MessageEvent) {
const {
Expand All @@ -27,7 +30,7 @@ function on<T extends EventType>(
const skipOriginCheck =
allowedOrigins.length === 0 || allowedOrigins.includes('*');

if (!skipOriginCheck && !allowedOrigins.includes(url.origin)) {
if (!skipOriginCheck && !allowedHostnames.has(getHostName(url.origin))) {
throw new Error(`Invalid Origin ${origin}`);
}

Expand All @@ -40,4 +43,16 @@ function on<T extends EventType>(
return () => window.removeEventListener(`message`, listener);
}

function getHostName(origin: string) {
try {
const { hostname } = new URL(origin);
return hostname;
} catch (error) {
// eslint-disable-next-line no-console
console.log(error);
// return null If the URL is invalid
return null;
}
}

export default { trigger, on };