Skip to content

[fix] Unhandled exception when parsing invalid captive portal action url in status.js #1066

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

Open
Ontiomacer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix] Unhandled exception when parsing invalid captive portal action url in status.js #1066

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 15 additions & 5 deletions client/components/status/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,16 +745,26 @@ export default class Status extends React.Component {
setPlanExhausted,
} = this.props;
const {setLoading} = this.context;
const {message, type, warningMessage, showUpgradeBtn} = event.data;
const {message, type, warningMessage, showUpgradeBtn} = event.data || {};

// Only accept messages from trusted origins,
// For more info read: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage#security_concern
const trustedOrigin =
event.origin === new URL(captivePortalLoginForm.action).origin ||
event.origin === window.location.origin;

let actionOrigin = null;

try {
if (captivePortalLoginForm.action?.trim()) {
actionOrigin = new URL(captivePortalLoginForm.action).origin;
}
} catch {
// invalid URL, ignore
}

const isTrustedOrigin =
event.origin === actionOrigin || event.origin === window.location.origin;

if (
!trustedOrigin ||
!isTrustedOrigin ||
!type ||
// internet-mode will not contain message, but message
// is required for authError and authMessage type
Expand Down
Loading