Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into jetty-9.1 

Conflicts:
	jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
This commit is contained in:
Jan Bartel 2013-08-09 15:59:29 +10:00
parent 34cfc3ed10 b17696325b
commit 06ef5b7930
3 changed files with 123 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
View File

@ -753,6 +753,7 @@ public class AnnotationParser
public void parseDir (Resource dir, ClassNameResolver resolver)
throws Exception
{
//skip dirs whose name start with . (ie hidden)
if (!dir.isDirectory() || !dir.exists() || dir.getName().startsWith("."))
return;
@ -766,16 +767,21 @@ public class AnnotationParser
Resource res = dir.addPath(files[f]);
if (res.isDirectory())
parseDir(res, resolver);
String name = res.getName();
if (isValidClassFileName(name))
else
{
if ((resolver == null)|| (!resolver.isExcluded(name) && (!isParsed(name) || resolver.shouldOverride(name))))
//we've already verified the directories, so just verify the class file name
String filename = res.getFile().getName();
if (isValidClassFileName(filename))
{
Resource r = Resource.newResource(res.getURL());
if (LOG.isDebugEnabled()) {LOG.debug("Scanning class {}", r);};
scanClass(r.getInputStream());
}
String name = res.getName();
if ((resolver == null)|| (!resolver.isExcluded(name) && (!isParsed(name) || resolver.shouldOverride(name))))
{
Resource r = Resource.newResource(res.getURL());
if (LOG.isDebugEnabled()) {LOG.debug("Scanning class {}", r);};
scanClass(r.getInputStream());
}
}
}
}
catch (Exception ex)
@ -812,27 +818,11 @@ public class AnnotationParser
{
try
{
//skip directories
if (entry.isDirectory())
return;
String name = entry.getName();
if (isValidClassFileName(name))
{
String shortName = name.replace('/', '.').substring(0,name.length()-6);
if ((resolver == null)
||
(!resolver.isExcluded(shortName) && (!isParsed(shortName) || resolver.shouldOverride(shortName))))
{
Resource clazz = Resource.newResource("jar:"+jarUri+"!/"+name);
scanClass(clazz.getInputStream());
}
}
parseJarEntry(jarUri, entry, resolver);
}
catch (Exception e)
{
LOG.warn("Problem processing jar entry "+entry, e);
LOG.warn("Problem parsing jar entry: {}", entry.getName());
}
}
@ -900,6 +890,8 @@ public class AnnotationParser
scanClass(r.getInputStream());
return;
}
if (LOG.isDebugEnabled()) LOG.warn("Resource not scannable for classes: {}", uri);
}
@ -933,34 +925,8 @@ public class AnnotationParser
{
JarEntry entry = jar_in.getNextJarEntry();
while (entry!=null)
{
//skip directories
if (!entry.isDirectory())
{
try
{
String name = entry.getName();
//skip any class files that are in a hidden directory (ie dirname starts with .)
if (isValidClassFileName(name))
{
String shortName = name.replace('/', '.').substring(0,name.length()-6);
if ((resolver == null)
||
(!resolver.isExcluded(shortName) && (!isParsed(shortName) || resolver.shouldOverride(shortName))))
{
Resource clazz = Resource.newResource("jar:"+uri+"!/"+name);
if (LOG.isDebugEnabled()) {LOG.debug("Scanning class from jar {}", clazz);};
scanClass(clazz.getInputStream());
}
}
}
catch (Exception e)
{
LOG.warn("Problem processing jar entry "+entry, e);
}
}
{
parseJarEntry(uri, entry, resolver);
entry = jar_in.getNextJarEntry();
}
}
@ -970,8 +936,44 @@ public class AnnotationParser
}
}
}
/**
* Parse a single entry in a jar file
* @param jar
* @param entry
* @param resolver
* @throws Exception
*/
protected void parseJarEntry (URI jar, JarEntry entry, final ClassNameResolver resolver)
throws Exception
{
if (jar == null || entry == null)
return;
//skip directories
if (entry.isDirectory())
return;
String name = entry.getName();
//check file is a valid class file name
if (isValidClassFileName(name) && isValidClassFilePath(name))
{
String shortName = name.replace('/', '.').substring(0,name.length()-6);
if ((resolver == null)
||
(!resolver.isExcluded(shortName) && (!isParsed(shortName) || resolver.shouldOverride(shortName))))
{
Resource clazz = Resource.newResource("jar:"+jar+"!/"+name);
if (LOG.isDebugEnabled()) {LOG.debug("Scanning class from jar {}", clazz);};
scanClass(clazz.getInputStream());
}
}
}
/**
* Use ASM on a class
*
@ -993,27 +995,56 @@ public class AnnotationParser
* <li> it isn't a dot file or in a hidden directory </li>
* <li> the name of the class at least begins with a valid identifier for a class name </li>
* </ul>
* @param name
* @return
*/
private boolean isValidClassFileName (String name)
{
//no name cannot be valid
if (name == null || name.length()==0)
return false;
//skip anything that is not a class file
if (!name.toLowerCase(Locale.ENGLISH).endsWith(".class"))
{
if (LOG.isDebugEnabled()) LOG.debug("Not a class: {}",name);
return false;
}
//skip any classfiles that are not a valid java identifier
int c0 = 0;
int ldir = name.lastIndexOf('/', name.length()-6);
c0 = (ldir > -1 ? ldir+1 : c0);
if (!Character.isJavaIdentifierStart(name.charAt(c0)))
{
if (LOG.isDebugEnabled()) LOG.debug("Not a java identifier: {}"+name);
return false;
}
return true;
}
/**
* Check that the given path does not contain hidden directories
*
* @param path
* @return
*/
private boolean isValidClassFileName (String path)
private boolean isValidClassFilePath (String path)
{
//skip anything that is not a class file
if (!path.toLowerCase(Locale.ENGLISH).endsWith(".class"))
//no path is not valid
if (path == null || path.length()==0)
return false;
//skip any classfiles that are not a valid name
int c0 = 0;
int ldir = path.lastIndexOf('/', path.length()-6);
c0 = (ldir > -1 ? ldir+1 : c0);
if (!Character.isJavaIdentifierStart(path.charAt(c0)))
return false;
//skip any classfiles that are in a hidden directory
if (path.startsWith(".") || path.contains("/."))
{
if (LOG.isDebugEnabled()) LOG.debug("Contains hidden dirs: {}"+path);
return false;
}
return true;
}
}

34
jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
View File

@ -39,7 +39,7 @@ import org.eclipse.jetty.toolchain.test.IO;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.toolchain.test.TestingDir;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Rule;
import org.junit.Test;
@ -119,22 +119,6 @@ public class TestAnnotationParser
public void handleMethod(String className, String methodName, int access, String desc, String signature, String[] exceptions, String annotation,
List<Value> values)
{
System.err.println("Sample annotated method : classname=" + className + " methodName=" + methodName + " access=" + access + " desc=" + desc
+ " signature=" + signature);
org.objectweb.asm.Type retType = org.objectweb.asm.Type.getReturnType(desc);
System.err.println("REturn type = " + retType);
org.objectweb.asm.Type[] params = org.objectweb.asm.Type.getArgumentTypes(desc);
if (params == null)
System.err.println("No params");
else
System.err.println(params.length + " params");
if (exceptions == null)
System.err.println("No exceptions");
else
System.err.println(exceptions.length + " exceptions");
assertEquals("org.eclipse.jetty.annotations.ClassA",className);
assertTrue(methods.contains(methodName));
assertEquals("org.eclipse.jetty.annotations.Sample",annotation);
@ -149,7 +133,7 @@ public class TestAnnotationParser
parser.registerHandler(new SampleAnnotationHandler());
long start = System.currentTimeMillis();
//long start = System.currentTimeMillis();
parser.parse(classNames,new ClassNameResolver()
{
public boolean isExcluded(String name)
@ -163,9 +147,9 @@ public class TestAnnotationParser
}
});
long end = System.currentTimeMillis();
//long end = System.currentTimeMillis();
System.err.println("Time to parse class: " + ((end - start)));
//System.err.println("Time to parse class: " + ((end - start)));
}
@Test
@ -181,11 +165,6 @@ public class TestAnnotationParser
List<Value> values)
{
assertTrue("org.eclipse.jetty.annotations.ClassB".equals(className));
for (Value anv : values)
{
System.err.println(anv.toString());
}
}
public void handleField(String className, String fieldName, int access, String fieldType, String signature, Object value, String annotation,
@ -200,10 +179,6 @@ public class TestAnnotationParser
{
assertTrue("org.eclipse.jetty.annotations.ClassB".equals(className));
assertTrue("a".equals(methodName));
for (Value anv : values)
{
System.err.println(anv.toString());
}
}
@Override
@ -228,7 +203,6 @@ public class TestAnnotationParser
}
@Test
@Ignore
public void testBasedirExclusion() throws Exception
{
// Build up basedir, which itself has a path segment that violates java package and classnaming.

24
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
View File

@ -516,7 +516,8 @@ write completed - - - ASYNC READY->owp
/* ------------------------------------------------------------ */
/** Asynchronous send of content.
* @param in The content to send
* @param in The content to send as a stream. The stream will be closed
* after reading all content.
* @param callback The callback to use to notify success or failure
*/
public void sendContent(InputStream in, Callback callback)
@ -526,7 +527,8 @@ write completed - - - ASYNC READY->owp
/* ------------------------------------------------------------ */
/** Asynchronous send of content.
* @param in The content to send
* @param in The content to send as a channel. The channel will be closed
* after reading all content.
* @param callback The callback to use to notify success or failure
*/
public void sendContent(ReadableByteChannel in, Callback callback)
@ -836,6 +838,7 @@ write completed - - - ASYNC READY->owp
{
eof=true;
len=0;
_in.close();
}
else if (len<_buffer.capacity())
{
@ -868,6 +871,14 @@ write completed - - - ASYNC READY->owp
{
super.failed(x);
_channel.getByteBufferPool().release(_buffer);
try
{
_in.close();
}
catch (IOException e)
{
LOG.ignore(e);
}
}
}
@ -904,6 +915,7 @@ write completed - - - ASYNC READY->owp
{
eof=true;
len=0;
_in.close();
}
else if (len<_buffer.capacity())
{
@ -935,6 +947,14 @@ write completed - - - ASYNC READY->owp
{
super.failed(x);
_channel.getByteBufferPool().release(_buffer);
try
{
_in.close();
}
catch (IOException e)
{
LOG.ignore(e);
}
}
}