Skip to content

fix(http): ensure query parameters are inserted before URL fragments #69152

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
atscott merged 1 commit into from
Jun 4, 2026
+32 −3
Merged

fix(http): ensure query parameters are inserted before URL fragments #69152

Show file tree
Hide file tree
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
18 changes: 15 additions & 3 deletions packages/common/http/src/request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,17 +408,29 @@ export class HttpRequest<T> implements HttpRequestOptions {
// No parameters, the visible URL is just the URL given at creation time.
this.urlWithParams = url;
} else {
// Strip the fragment (e.g. #bypass) from the URL before checking for existing query parameters.
// This ensures that new query parameters are inserted before the fragment, preventing
// situations where parameters are mistakenly appended after the fragment and thus
// only exposed to the frontend, which could bypass security checks.
let urlWithoutFragment = url;
let fragment = '';
const hashIdx = url.indexOf('#');
if (hashIdx !== -1) {
fragment = url.substring(hashIdx);
urlWithoutFragment = url.substring(0, hashIdx);
}

// Does the URL already have query parameters? Look for '?'.
const qIdx = url.indexOf('?');
const qIdx = urlWithoutFragment.indexOf('?');
// There are 3 cases to handle:
// 1) No existing parameters -> append '?' followed by params.
// 2) '?' exists and is followed by existing query string ->
// append '&' followed by params.
// 3) '?' exists at the end of the url -> append params directly.
// This basically amounts to determining the character, if any, with
// which to join the URL and parameters.
const sep: string = qIdx === -1 ? '?' : qIdx < url.length - 1 ? '&' : '';
this.urlWithParams = url + sep + params;
const sep: string = qIdx === -1 ? '?' : qIdx < urlWithoutFragment.length - 1 ? '&' : '';
this.urlWithParams = urlWithoutFragment + sep + params + fragment;
}
}
}
Expand Down
17 changes: 17 additions & 0 deletions packages/common/http/test/request_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,5 +286,22 @@ describe('HttpRequest', () => {
const req = baseReq.clone({setParams: {'test': 'false'}});
expect(req.urlWithParams).toEqual('/test?test=false');
});
it('appends parameters before a fragment', () => {
const fragmentParams = new HttpParams({fromString: 'auth_token=secret'});
const req = baseReq.clone({params: fragmentParams, url: '/api/data/123#bypass'});
expect(req.urlWithParams).toEqual('/api/data/123?auth_token=secret#bypass');
});
it('appends parameters before a URL fragment', () => {
const req = baseReq.clone({params, url: '/test#fragment'});
expect(req.urlWithParams).toEqual('/test?test=true#fragment');
});
it('appends parameters before a URL fragment when URL has a query string', () => {
const req = baseReq.clone({params, url: '/test?other=false#fragment'});
expect(req.urlWithParams).toEqual('/test?other=false&test=true#fragment');
});
it('appends parameters before a URL fragment when URL has multiple hash characters', () => {
const req = baseReq.clone({params, url: '/test#frag1#frag2'});
expect(req.urlWithParams).toEqual('/test?test=true#frag1#frag2');
});
});
});
Loading