Skip to content

Commit

Permalink
fix(core): malformed URIs will not throw exception
Browse files Browse the repository at this point in the history
  • Loading branch information
sean-perkins committed May 9, 2024
1 parent 704765e commit 96f4eba
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
8 changes: 7 additions & 1 deletion core/src/global/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,13 @@ export const configFromURL = (win: Window) => {
.slice(1)
.split('&')
.map((entry) => entry.split('='))
.map(([key, value]) => [decodeURIComponent(key), decodeURIComponent(value)])
.map(([key, value]) => {
try {
return [decodeURIComponent(key), decodeURIComponent(value)];
} catch (e) {
return ['', ''];
}
})
.filter(([key]) => startsWith(key, IONIC_PREFIX))
.map(([key, value]) => [key.slice(IONIC_PREFIX.length), value])
.forEach(([key, value]) => {
Expand Down
14 changes: 13 additions & 1 deletion core/src/global/test/config-controller.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { IonicConfig } from '../../interface';
import { Config } from '../config';
import { Config, configFromURL } from '../config';

describe('Config', () => {
it('should get a value from the config', () => {
Expand Down Expand Up @@ -82,4 +82,16 @@ describe('Config', () => {
config.set('text0' as any, 'hola');
expect(config.get('text0' as any, 'HEY')).toEqual('hola');
});

it('should not throw an exception with a malformed URI', () => {
// https://github.com/ionic-team/ionic-framework/issues/29479

expect(
configFromURL({
location: {
search: '?test=%',
},
} as unknown as Window)
).toEqual({});
});
});

0 comments on commit 96f4eba

Please sign in to comment.