Skip to content

Fix request table crash on invalid sender URLs #161

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
james-yusuke wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix request table crash on invalid sender URLs #161

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
27 changes: 25 additions & 2 deletions admin/src/lib/components/RequestsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,29 @@ interface Props {
onContextMenu?: (e: React.MouseEvent, id: string) => void;
}

function decodeURLPart(value: string): string {
try {
return decodeURIComponent(value);
} catch {
return value;
}
}

function parseURLForDisplay(url: string): { origin: string; path: string } {
try {
const { origin, pathname, search, hash } = new URL(url);
return {
origin,
path: decodeURLPart(pathname + search + hash),
};
} catch {
return {
origin: "",
path: url,
};
}
}

export default function RequestsTable(props: Props): JSX.Element {
const { requests, activeRowId, actionsCell, onRowClick, onContextMenu } = props;

Expand All @@ -84,7 +107,7 @@ export default function RequestsTable(props: Props): JSX.Element {
</TableHead>
<TableBody>
{requests.map(({ id, method, url, response }) => {
const { origin, pathname, search, hash } = new URL(url);
const { origin, path } = parseURLForDisplay(url);

return (
<RequestTableRow
Expand All @@ -102,7 +125,7 @@ export default function RequestsTable(props: Props): JSX.Element {
<code>{method}</code>
</MethodTableCell>
<OriginTableCell>{origin}</OriginTableCell>
<PathTableCell>{decodeURIComponent(pathname + search + hash)}</PathTableCell>
<PathTableCell>{path}</PathTableCell>
<StatusTableCell>
{response && <Status code={response.statusCode} reason={response.statusReason} />}
</StatusTableCell>
Expand Down