Skip to content

fix: update path matching regex to be stricter to ensure no history leakage #839

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
tjholm merged 2 commits into from
Jan 8, 2025
Merged

fix: update path matching regex to be stricter to ensure no history leakage #839

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d44d53d
update path matching regex to be stricter to ensure no history leakage
HomelessDinosaur Jan 6, 2025
699f550
Update pkg/dashboard/frontend/src/components/apis/APIHistory.tsx
HomelessDinosaur Jan 7, 2025
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
15 changes: 10 additions & 5 deletions pkg/dashboard/frontend/src/components/apis/APIHistory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,18 @@ interface Props {
}

const checkEquivalentPaths = (matcher: string, path: string): boolean => {
// If the paths are equal regardless of query params
if (path.split('?').length > 1 && matcher.split('?').length > 1) {
return path.split('?')[0] === matcher.split('?')[0]
// Split both the matcher and path by "?" to separate query parameters
const [matcherBase] = matcher.split('?')
const [pathBase] = path.split('?')

// If both have query parameters, compare only the base paths
if (matcher.includes('?') && path.includes('?')) {
return matcherBase === pathBase
}

const regex = matcher.replace(/{(.*)}/, '(.*)')
return path.match(regex) !== null
const regex = new RegExp(`^${matcherBase.replace(/{[^/]+}/g, '[^/]+')}$`)

return regex.test(pathBase)
}

const APIHistory: React.FC<Props> = ({
Expand Down
Loading