mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-03-10 22:21:22 -07:00
fix(gitIgnore): prevent crash/error when processing malformed file paths in GitIgnoreParser (#7553)
Co-authored-by: Srinath Padmanabhan <17151014+srithreepo@users.noreply.github.com>
This commit is contained in:
@@ -181,6 +181,16 @@ src/*.tmp
|
||||
expect(() => parser.isIgnored('/node_modules')).not.toThrow();
|
||||
expect(parser.isIgnored('/node_modules')).toBe(false);
|
||||
});
|
||||
|
||||
it('should handle backslash-prefixed files without crashing', () => {
|
||||
expect(() => parser.isIgnored('\\backslash-file-test.txt')).not.toThrow();
|
||||
expect(parser.isIgnored('\\backslash-file-test.txt')).toBe(false);
|
||||
});
|
||||
|
||||
it('should handle files with absolute-like names', () => {
|
||||
expect(() => parser.isIgnored('/backslash-file-test.txt')).not.toThrow();
|
||||
expect(parser.isIgnored('/backslash-file-test.txt')).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getIgnoredPatterns', () => {
|
||||
|
||||
@@ -57,16 +57,37 @@ export class GitIgnoreParser implements GitIgnoreFilter {
|
||||
}
|
||||
|
||||
isIgnored(filePath: string): boolean {
|
||||
const resolved = path.resolve(this.projectRoot, filePath);
|
||||
const relativePath = path.relative(this.projectRoot, resolved);
|
||||
|
||||
if (relativePath === '' || relativePath.startsWith('..')) {
|
||||
if (!filePath || typeof filePath !== 'string') {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Even in windows, Ignore expects forward slashes.
|
||||
const normalizedPath = relativePath.replace(/\\/g, '/');
|
||||
return this.ig.ignores(normalizedPath);
|
||||
if (
|
||||
filePath.startsWith('\\') ||
|
||||
filePath === '/' ||
|
||||
filePath.includes('\0')
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
const resolved = path.resolve(this.projectRoot, filePath);
|
||||
const relativePath = path.relative(this.projectRoot, resolved);
|
||||
|
||||
if (relativePath === '' || relativePath.startsWith('..')) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Even in windows, Ignore expects forward slashes.
|
||||
const normalizedPath = relativePath.replace(/\\/g, '/');
|
||||
|
||||
if (normalizedPath.startsWith('/') || normalizedPath === '') {
|
||||
return false;
|
||||
}
|
||||
|
||||
return this.ig.ignores(normalizedPath);
|
||||
} catch (_error) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
getPatterns(): string[] {
|
||||
|
||||
Reference in New Issue
Block a user