MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed file pointer hangs for not quite canonical files, e.g. "x..txt"

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-03-02 17:51:54 +03:00
parent 5c46bf5399
commit 458bc4cd16
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePointerPartNode.java
+6 -1
View File
@@ -172,7 +172,12 @@ class FilePointerPartNode {
}
private void doCheckConsistency(boolean dotDotOccurred) {
dotDotOccurred |= part.contains(".."); // part must not contain ".." (except when the file pointer was created from URL with ".." inside)
int ddi = part.indexOf("..");
if (ddi != -1) {
// part must not contain "/.." nor "../" nor be just ".."
// (except when the pointer was created from URL of non-existing file with ".." inside)
dotDotOccurred |= part.equals("..") || ddi != 0 && part.charAt(ddi-1) == '/' || ddi < part.length() - 2 && part.charAt(ddi+2) == '/';
}
int childSum = 0;
for (FilePointerPartNode child : children) {
childSum += child.pointersUnder;
platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java
+26 -8
View File
@@ -690,14 +690,11 @@ public class VirtualFilePointerTest extends PlatformTestCase {
// ptr is now null, cached as map
VirtualFile v = PlatformTestUtil.notNull(LocalFileSystem.getInstance().findFileByIoFile(ioSandPtr));
new WriteCommandAction.Simple(getProject()) {
@Override
protected void run() throws Throwable {
v.delete(this); //inc FS modCount
VirtualFile file = PlatformTestUtil.notNull(LocalFileSystem.getInstance().findFileByIoFile(ioSand));
file.createChildData(this, ioSandPtr.getName());
}
}.execute().throwException();
WriteCommandAction.writeCommandAction(getProject()).run(() -> {
v.delete(this); //inc FS modCount
VirtualFile file = PlatformTestUtil.notNull(LocalFileSystem.getInstance().findFileByIoFile(ioSand));
file.createChildData(this, ioSandPtr.getName());
});
// ptr is still null
@@ -1049,4 +1046,25 @@ public class VirtualFilePointerTest extends PlatformTestCase {
createChildData(deep, "1");
assertEquals("[before:true, after:true]", listener.getLog().toString());
}
public void testNotQuiteCanonicalPath() throws Exception {
final File dir = createTempDirectory();
VirtualFile vDir = LocalFileSystem.getInstance().findFileByIoFile(dir);
assertNotNull(vDir);
VirtualFile deep = createChildDirectory(vDir, "deep");
VirtualFile file = createChildData(deep, "x..txt");
VirtualFilePointer ptr = myVirtualFilePointerManager.create(file, disposable, null);
assertTrue(ptr.isValid());
assertTrue(ptr.getUrl(), ptr.getUrl().contains(".."));
VirtualFile existing = createChildData(vDir, "existing.txt");
assertNotNull(existing);
VirtualFilePointer ptr2 = myVirtualFilePointerManager.create(deep.getUrl()+"/../existing.txt", disposable, null);
assertTrue(ptr2.isValid());
assertFalse(ptr2.getUrl(), ptr2.getUrl().contains(".."));
VirtualFilePointer ptr3 = myVirtualFilePointerManager.create(deep.getUrl()+"/../madeup.txt", disposable, null);
assertFalse(ptr3.isValid());
assertTrue(ptr3.getUrl(), ptr3.getUrl().contains(".."));
}
}