mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-08 06:39:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: help to handle @ when it is not encoded in url (#7609)

Browse Source 
* fix: help to handle @ when it is not escaped in url

* test: add tests and comments
This commit is contained in:
Hexxa 2024-06-28 21:02:59 +08:00 committed by GitHub
parent 25b60b44fa
commit cb4ec74a2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/insomnia-sdk/src/objects/__tests__/urls.test.ts
View File

@ -149,6 +149,22 @@ describe('test Url object', () => {
testName: 'hybrid of path params and tags',
url: '{{ baseUrl }}/:path_{{ _.pathSuffix }}',
},
{
testName: '@ is used in path',
url: '{{ baseUrl }}/tom@any.com',
},
{
testName: '@ is used in auth and path',
url: 'user:pass@a.com/tom@any.com',
},
{
testName: '@ is used in auth',
url: 'user:pass@a.com/',
},
{
testName: '@ is used in path with path params, targs and hash',
url: '{{ baseUrl }}/:path__{{ _.pathSuffix }}/tom@any.com#hash',
},
];
urlParsingTests.forEach(testCase => {

25
packages/insomnia-sdk/src/objects/urls.ts
View File

@ -188,20 +188,28 @@ export class Url extends PropertyBase {
static parse(urlStr: string): UrlOptions | undefined {
// the URL API (for web) is not leveraged here because the input string could contain tags for interpolation
// which will be encoded, then it would introduce confusion for users in manipulation
// TODO: but it still would be better to rely on the URL API
const endOfProto = urlStr.indexOf('://');
const protocol = endOfProto >= 0 ? urlStr.slice(0, endOfProto + 1) : '';
let auth: undefined | { username: string; password: string } = undefined;
const potentialStartOfAuth = protocol === '' ? 0 : endOfProto + 3;
const endOfAuth = urlStr.indexOf('@', potentialStartOfAuth);
let auth = undefined;
if (endOfAuth >= 0 && potentialStartOfAuth < endOfAuth) { // e.g., '@insomnia.com' will be ignored
const authStr = endOfAuth >= 0 ? urlStr.slice(potentialStartOfAuth, endOfAuth) : '';
const authParts = authStr?.split(':');
if (authParts.length < 2) {
throw Error('new Url(): failed to parse auth in url ${urlStr}');
let endOfAuth = urlStr.indexOf('@', potentialStartOfAuth);
const startOfPathname = urlStr.indexOf('/', endOfProto >= 0 ? endOfProto + 3 : 0);
const atCharIsBeforePath = endOfAuth < startOfPathname;
if (atCharIsBeforePath) { // this checks if unencoded '@' appears in path
if (endOfAuth >= 0 && potentialStartOfAuth < endOfAuth) { // e.g., '@insomnia.com' will be ignored
const authStr = endOfAuth >= 0 ? urlStr.slice(potentialStartOfAuth, endOfAuth) : '';
const authParts = authStr?.split(':');
if (authParts.length < 2) {
throw Error(`new Url(): failed to parse auth in url ${urlStr}`);
}
auth = { username: authParts[0], password: authParts[1] };
}
auth = { username: authParts[0], password: authParts[1] };
} else {
// don't do anything if @ appears in path
endOfAuth = -1;
}
const startOfHash = urlStr.indexOf('#');
@ -224,7 +232,6 @@ export class Url extends PropertyBase {
);
}
const startOfPathname = urlStr.indexOf('/', endOfProto >= 0 ? endOfProto + 3 : 0);
const path = new Array<string>();
if (startOfPathname >= 0) {
let endOfPathname = urlStr.length;