mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Ensure decoded archive fs paths are never empty (#648)

Browse Source 
Empty paths should be replaced as '/'. This is a fix for a bug
introduced in 899f988df8.
This commit is contained in:
Andrew Eisenberg
2020-10-27 11:38:31 -07:00
committed by GitHub
parent ef5d7bf684
commit 2ac44b188c
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/ql-vscode/src/archive-filesystem-provider.ts
View File

@@ -117,7 +117,7 @@ export function decodeSourceArchiveUri(uri: vscode.Uri): ZipFileReference {
// Uri is malformed, but this is recoverable
logger.log(`Warning: ${new InvalidSourceArchiveUriError(uri).message}`);
return {
pathWithinSourceArchive: '',
pathWithinSourceArchive: '/',
sourceArchiveZipPath: uri.path
};
}
@@ -129,7 +129,7 @@ export function decodeSourceArchiveUri(uri: vscode.Uri): ZipFileReference {
if (isNaN(zipPathStartIndex) || isNaN(zipPathEndIndex))
throw new InvalidSourceArchiveUriError(uri);
return {
pathWithinSourceArchive: uri.path.substring(zipPathEndIndex),
pathWithinSourceArchive: uri.path.substring(zipPathEndIndex) || '/',
sourceArchiveZipPath: uri.path.substring(zipPathStartIndex, zipPathEndIndex),
};
}

17
extensions/ql-vscode/src/vscode-tests/no-workspace/archive-filesystem-provider.test.ts
View File

@@ -142,7 +142,7 @@ describe('source archive uri encoding', function() {
name: 'Empty path',
input: {
sourceArchiveZipPath: '/home/folder/src.zip',
pathWithinSourceArchive: ''
pathWithinSourceArchive: '/'
}
}
];
@@ -153,11 +153,22 @@ describe('source archive uri encoding', function() {
});
}
it('should decode an empty path as a "/"', () => {
const uri = encodeSourceArchiveUri({
pathWithinSourceArchive: '',
sourceArchiveZipPath: 'a/b/c'
});
expect(decodeSourceArchiveUri(uri)).to.deep.eq({
pathWithinSourceArchive: '/',
sourceArchiveZipPath: 'a/b/c'
});
});
it('should encode a uri at the root of the archive', () => {
const path = '/a/b/c/src.zip';
const uri = encodeArchiveBasePath(path);
expect(uri.path).to.eq(path);
expect(decodeSourceArchiveUri(uri).pathWithinSourceArchive).to.eq('');
expect(decodeSourceArchiveUri(uri).pathWithinSourceArchive).to.eq('/');
expect(decodeSourceArchiveUri(uri).sourceArchiveZipPath).to.eq(path);
expect(uri.authority).to.eq('0-14');
});
@@ -168,7 +179,7 @@ describe('source archive uri encoding', function() {
expect(uri.authority).to.eq('');
expect(decodeSourceArchiveUri(uri)).to.deep.eq({
sourceArchiveZipPath: '/a/b/c/src.zip',
pathWithinSourceArchive: ''
pathWithinSourceArchive: '/'
});
});
});