Attachment #108134 for bug #194418

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 194418
Collapse All | Expand All




import org.netbeans.modules.masterfs.providers.ProvidedExtensions;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileSystem;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.Utilities;

        }  else {
            name = (name.startsWith("/")) ? name : ("/"+name);    
        }               
        if (name.contains("..")) {
            name = FileUtil.normalizePath(name);
        }
        File f = new File(name);
        if (name.contains("..")) {
            try {
                f = f.getCanonicalFile();
            } catch (IOException ex) {
                LOG.log(Level.WARNING, "Cannot canonicalize " + f, ex);
            }
        }
        return getFileObject(f);
    }





import org.openide.filesystems.FileChangeListener;
import org.openide.filesystems.FileLock;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Mutex;


        }
        File file = new File(getFileName().getFile(), relativePath);
        if (relativePath.contains("..")) {
            file = FileUtil.normalizeFile(file);
                file = file.getCanonicalFile();
            } catch (IOException ex) {
                LOG.log(Level.WARNING, "Cannot canonicalize " + file, ex);
            }
        }
        
        FileObjectFactory factory = getFactory();

Return to bug 194418

Lines 65-70 Link Here

(-)a/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/FileBasedFileSystem.java (-7 / +4 lines)
65	import org.netbeans.modules.masterfs.providers.ProvidedExtensions;	65	import org.netbeans.modules.masterfs.providers.ProvidedExtensions;
66	import org.openide.filesystems.FileObject;	66	import org.openide.filesystems.FileObject;
67	import org.openide.filesystems.FileSystem;	67	import org.openide.filesystems.FileSystem;
		68	import org.openide.filesystems.FileUtil;
68	import org.openide.util.Exceptions;	69	import org.openide.util.Exceptions;
69	import org.openide.util.Lookup;	70	import org.openide.util.Lookup;
70	import org.openide.util.Utilities;	71	import org.openide.util.Utilities;
Lines 204-217 Link Here
204	} else {	205	} else {
205	name = (name.startsWith("/")) ? name : ("/"+name);	206	name = (name.startsWith("/")) ? name : ("/"+name);
206	}	207	}
		208	if (name.contains("..")) {
		209	name = FileUtil.normalizePath(name);
		210	}
207	File f = new File(name);	211	File f = new File(name);
208	if (name.contains("..")) {
209	try {
210	f = f.getCanonicalFile();
211	} catch (IOException ex) {
212	LOG.log(Level.WARNING, "Cannot canonicalize " + f, ex);
213	}
214	}
215	return getFileObject(f);	212	return getFileObject(f);
216	}	213	}
217		214

Lines 74-79 Link Here

(-)a/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObj.java (-5 / +2 lines)
74	import org.openide.filesystems.FileChangeListener;	74	import org.openide.filesystems.FileChangeListener;
75	import org.openide.filesystems.FileLock;	75	import org.openide.filesystems.FileLock;
76	import org.openide.filesystems.FileObject;	76	import org.openide.filesystems.FileObject;
		77	import org.openide.filesystems.FileUtil;
77	import org.openide.util.Exceptions;	78	import org.openide.util.Exceptions;
78	import org.openide.util.Mutex;	79	import org.openide.util.Mutex;
79		80
Lines 111-121 Link Here
111	}	112	}
112	File file = new File(getFileName().getFile(), relativePath);	113	File file = new File(getFileName().getFile(), relativePath);
113	if (relativePath.contains("..")) {	114	if (relativePath.contains("..")) {
114	try {	115	file = FileUtil.normalizeFile(file);
115	file = file.getCanonicalFile();
116	} catch (IOException ex) {
117	LOG.log(Level.WARNING, "Cannot canonicalize " + file, ex);
118	}
119	}	116	}
120		117
121	FileObjectFactory factory = getFactory();	118	FileObjectFactory factory = getFactory();