stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6502392: Invalid relative names for Filer.createResource and Filer.getResource

Browse Source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2010-09-29 14:01:37 -07:00
parent 55a531c45f
commit ef791d4adb
2 changed files with 121 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -605,7 +605,7 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
nullCheck(className);
nullCheck(kind);
if (!sourceOrClass.contains(kind))
throw new IllegalArgumentException("Invalid kind " + kind);
throw new IllegalArgumentException("Invalid kind: " + kind);
return getFileForInput(location, RelativeFile.forClass(className, kind));
}
@ -658,7 +658,7 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
nullCheck(className);
nullCheck(kind);
if (!sourceOrClass.contains(kind))
throw new IllegalArgumentException("Invalid kind " + kind);
throw new IllegalArgumentException("Invalid kind: " + kind);
return getFileForOutput(location, RelativeFile.forClass(className, kind), sibling);
}
@ -672,7 +672,7 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
// validatePackageName(packageName);
nullCheck(packageName);
if (!isRelativeUri(relativeName))
throw new IllegalArgumentException("relativeName is invalid");
throw new IllegalArgumentException("Invalid relative name: " + relativeName);
RelativeFile name = packageName.length() == 0
? new RelativeFile(relativeName)
: new RelativeFile(RelativeDirectory.forPackage(packageName), relativeName);
@ -806,6 +806,8 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
String path = uri.normalize().getPath();
if (path.length() == 0 /* isEmpty() is mustang API */)
return false;
if (!path.equals(uri.getPath())) // implicitly checks for embedded . and ..
return false;
char first = path.charAt(0);
return first != '.' && first != '/';
}

115
langtools/test/tools/javac/processing/filer/TestInvalidRelativeNames.java Normal file
View File

@ -0,0 +1,115 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 6502392
* @summary Invalid relative names for Filer.createResource and Filer.getResource
* @compile TestInvalidRelativeNames.java
* @compile/process -processor TestInvalidRelativeNames java.lang.Object
*/
import java.io.*;
import java.util.*;
import javax.annotation.processing.*;
import javax.lang.model.*;
import javax.lang.model.element.*;
import javax.tools.Diagnostic;
import javax.tools.StandardLocation;
@SupportedAnnotationTypes("*")
public class TestInvalidRelativeNames extends AbstractProcessor {
enum Kind { CREATE_WRITER, GET_READER, CREATE_OUTPUT_STREAM, GET_INPUT_STREAM };
static final String[] invalidRelativeNames = {
"/boo", "goo/../hoo", "./ioo", ""
};
@Override
public SourceVersion getSupportedSourceVersion() {
return SourceVersion.latest();
}
Filer filer;
Messager messager;
@Override
public void init(ProcessingEnvironment pEnv) {
super.init(pEnv);
filer = processingEnv.getFiler();
messager = processingEnv.getMessager();
}
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
if (roundEnv.processingOver()) {
for (String relative: invalidRelativeNames) {
for (Kind kind: Kind.values()) {
test(relative, kind);
}
}
}
return true;
}
void test(String relative, Kind kind) {
System.out.println("test relative path: " + relative + ", kind: " + kind);
try {
switch (kind) {
case CREATE_WRITER:
Writer writer = filer.createResource(
StandardLocation.SOURCE_OUTPUT, "", relative).openWriter();
writer.close();
break;
case GET_READER:
Reader reader = filer.getResource(
StandardLocation.SOURCE_OUTPUT, "", relative).openReader(true);
reader.close();
break;
case CREATE_OUTPUT_STREAM:
OutputStream out = filer.createResource(
StandardLocation.SOURCE_OUTPUT, "", relative).openOutputStream();
out.close();
break;
case GET_INPUT_STREAM:
InputStream in = filer.createResource(
StandardLocation.SOURCE_OUTPUT, "", relative).openInputStream();
in.close();
break;
}
} catch (IllegalArgumentException expected) {
System.out.println("expected exception thrown: " + expected);
return;
} catch (Exception e) {
messager.printMessage(Diagnostic.Kind.ERROR,
"relative path: " + relative + ", kind: " + kind + ", unexpected exception: " + e);
return;
}
messager.printMessage(Diagnostic.Kind.ERROR,
"relative path: " + relative + ", kind: " + kind + ", no exception thrown");
}
}