fb-contrib-commit Mailing List for fb-contrib (Page 42)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 816
          http://svn.sourceforge.net/fb-contrib/?rev=816&view=rev
Author:   dbrosius
Date:     2007-02-01 01:38:22 -0800 (Thu, 01 Feb 2007)

Log Message:
-----------
getting closer

Modified Paths:
--------------
    trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SuspiciousJDKVersionUse.java

Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SuspiciousJDKVersionUse.java
===================================================================

--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SuspiciousJDKVersionUse.java	2007-02-01 08:28:00 UTC (rev 815)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SuspiciousJDKVersionUse.java	2007-02-01 09:38:22 UTC (rev 816)
@@ -19,8 +19,8 @@
 package com.mebigfatguy.fbcontrib.detect;
 
 import java.io.File;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -35,6 +35,7 @@
 import org.apache.bcel.Constants;
 import org.apache.bcel.classfile.ClassParser;
 import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
 
 import com.mebigfatguy.fbcontrib.utils.Integer14;
 
@@ -47,18 +48,20 @@
 {
 	private static final Map<Integer, String> verRegEx = new HashMap<Integer, String>();
 	static {
-		verRegEx.put(Integer14.valueOf(Constants.MAJOR_1_1), "(jdk|jre)1.1");
-		verRegEx.put(Integer14.valueOf(Constants.MAJOR_1_2), "(jdk|jre)1.2");
-		verRegEx.put(Integer14.valueOf(Constants.MAJOR_1_3), "(jdk|jre)1.3");
-		verRegEx.put(Integer14.valueOf(Constants.MAJOR_1_4), "(jdk|jre)1.4");
-		verRegEx.put(Integer14.valueOf(Constants.MAJOR_1_5), "(jdk|jre)1.5");
-		verRegEx.put(Integer14.valueOf(50), "jdk1.6");
+		verRegEx.put(Integer14.valueOf(Constants.MAJOR_1_1), "(jdk|j2?re)1.1");
+		verRegEx.put(Integer14.valueOf(Constants.MAJOR_1_2), "(jdk|j2?re)1.2");
+		verRegEx.put(Integer14.valueOf(Constants.MAJOR_1_3), "(jdk|j2?re)1.3");
+		verRegEx.put(Integer14.valueOf(Constants.MAJOR_1_4), "(jdk|j2?re)1.4");
+		verRegEx.put(Integer14.valueOf(Constants.MAJOR_1_5), "(jdk|j2?re)1.5");
+		verRegEx.put(Integer14.valueOf(50), "(jdk|j2?re)1.6");
 	}
 	private static final Pattern jarPattern = Pattern.compile("jar:file:/*([^!]*)");
 	
 	private Map<String, File> versionPaths;
 	private Map<Integer, Map<String, Set<String>>> validMethodsByVersion;
+	private Map<String, String> superNames;
 	private File jdksRoot = null;
+	JavaClass cls;
 	private URLClassLoader jdkLoader;
 	private Integer clsMajorVersion;
 	private BugReporter bugReporter;	
@@ -67,25 +70,23 @@
 		this.bugReporter = bugReporter;
 		versionPaths = new HashMap<String, File>();
 		validMethodsByVersion = new HashMap<Integer, Map<String, Set<String>>>();
+		superNames = new HashMap<String, String>();
 	}
 
-	/*
-	 * Use BCEL to load class, not URLClassLoader
-	 * 
-	 *  ClassParser parser = new ClassParser(is, className);
-     *  JavaClass clazz = parser.parse();
-     */
 	@Override
 	public void visitClassContext(ClassContext classContext) {
 		try {
-			JavaClass cls = classContext.getJavaClass();
+			cls = classContext.getJavaClass();
 			clsMajorVersion = Integer14.valueOf(cls.getMajor());
 			File rtJar = getRTJarFile(cls);
-			jdkLoader = new URLClassLoader(new URL[] {rtJar.toURL()});
-			super.visitClassContext(classContext);
+			if (rtJar != null) {
+				jdkLoader = new URLClassLoader(new URL[] {rtJar.toURL()});
+				super.visitClassContext(classContext);
+			}
 		} catch (MalformedURLException mue) {
 			//Hmm, what to do
 		} finally {
+			cls = null;
 			jdkLoader = null;
 		}
 	}
@@ -94,6 +95,8 @@
 	public void sawOpcode(int seen) {
 		
 		String clsName = null;
+		InputStream is = null;
+		
 		try {
 			if ((seen == INVOKEVIRTUAL)
 			||  (seen == INVOKEINTERFACE)
@@ -107,42 +110,70 @@
 						validMethods = new HashMap<String, Set<String>>();
 						validMethodsByVersion.put(clsMajorVersion, validMethods);
 					}
-					Set<String> methodInfos = validMethods.get(clsName);
-					if (methodInfos == null) {
-						Class c = jdkLoader.loadClass(clsName.replace('/', '.'));
-						Method[] methods = c.getDeclaredMethods();
-						
-						methodInfos = new HashSet<String>();
-						validMethods.put(clsName, methodInfos);
-
-						for (Method m : methods) {
-							if ((m.getModifiers() & Modifier.PRIVATE) == 0) {
-								String[] mi = m.toString().split("\\(\\)");
-								int dotPos = mi[0].lastIndexOf('.');
-								String name = mi[0].substring(dotPos+1);
-								String sig;
-								if (mi.length == 1)
-									sig = "()";
-								else {
-									if (mi[1].trim().startsWith("throws"))
-										sig = "()";
-									else
-										sig = "(" + mi[1] + ")";
-								}
-								methodInfos.add(name + sig);
-							}
-						}
+					
+					if (!isValid(validMethods, clsName)) {
+						bugReporter.reportBug(new BugInstance(this, "SJVU_SUSPICIOUS_JDK_VERSION_USE", HIGH_PRIORITY)
+								   .addClass(this)
+								   .addMethod(this)
+								   .addSourceLine(this));
 					}
+				}
+			}
+		} catch (Exception e) {
+			// Hmm what to do
+		} finally {
+			if (is != null) {
+				try {
+					is.close();
+				} catch (IOException ioe) {
+				}
+			}
+		}
+	}
+	
+	private boolean isValid(Map<String, Set<String>> validMethods, String clsName) throws IOException, ClassNotFoundException {
+		InputStream is = null;
+		
+		try {
+			Set<String> methodInfos = validMethods.get(clsName);
+			if (methodInfos == null) {
+				is = jdkLoader.getResourceAsStream(clsName + ".class");
+				if (is != null) {
+					ClassParser parser = new ClassParser(is, clsName);
+					JavaClass calledClass = parser.parse();
 					
+					superNames.put(clsName, calledClass.getSuperclassName().replace('.', '/'));
+					Method[] methods = calledClass.getMethods();
 					
+					methodInfos = new HashSet<String>();
+					validMethods.put(clsName, methodInfos);
+	
+					for (Method m : methods) {
+						if (!m.isPrivate())
+							methodInfos.add(m.getName() + m.getSignature());
+					}
+					
 				}
+				else {
+					return true;
+				}
+				
 			}
-		} catch (ClassNotFoundException cnfe) {
-			if (clsName.startsWith("java/")) {
-				bugReporter.reportBug(new BugInstance(this, "SJVU_SUSPICIOUS_JDK_VERSION_USE", NORMAL_PRIORITY)
-						   .addClass(this)
-						   .addMethod(this)
-						   .addSourceLine(this));
+			
+			String wantedMethod = getNameConstantOperand() + getSigConstantOperand();
+			if (methodInfos.contains(wantedMethod))
+				return true;
+			else if ("java/lang/Object".equals(clsName))
+				return false;
+			else
+				return isValid(validMethods, superNames.get(clsName));
+		}
+		finally {
+			if (is != null) {
+				try {
+					is.close();
+				} catch (IOException ioe) {
+				}
 			}
 		}
 	}
@@ -175,25 +206,26 @@
 						return null;
 					
 					jdksRoot = new File(URLDecoder.decode(jdksRoot.getParentFile().getPath()));
-					
-					File[] possibleJdks = jdksRoot.listFiles();
-					for (File possibleJdk : possibleJdks) {
-						m = verPat.matcher(possibleJdk.getName());
-						if (m.find()) {
-							File wantedRtJar = new File(possibleJdk, "lib/rt.jar");
-							if (!wantedRtJar.exists()) {
-								wantedRtJar = new File(possibleJdk, "jre/lib/rt.jar");
-								if (!wantedRtJar.exists())
-									return null;
-							}
-							versionPaths.put(versionStr, wantedRtJar);
-							return wantedRtJar;
-						}
-					}
 				}
 			}
 		}
 		
+		File[] possibleJdks = jdksRoot.listFiles();
+		for (File possibleJdk : possibleJdks) {
+			Pattern verPat = Pattern.compile(versionStr);
+			Matcher m = verPat.matcher(possibleJdk.getName());
+			if (m.find()) {
+				File wantedRtJar = new File(possibleJdk, "lib/rt.jar");
+				if (!wantedRtJar.exists()) {
+					wantedRtJar = new File(possibleJdk, "jre/lib/rt.jar");
+					if (!wantedRtJar.exists())
+						return null;
+				}
+				versionPaths.put(versionStr, wantedRtJar);
+				return wantedRtJar;
+			}
+		}
+		
 		return null;
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (56)	Oct (60)	Nov (58)	Dec (89)
2006	Jan (66)	Feb (55)	Mar (85)	Apr (115)	May (35)	Jun (28)	Jul (3)	Aug (48)	Sep (37)	Oct (22)	Nov (14)	Dec (66)
2007	Jan (45)	Feb (63)	Mar (10)	Apr (1)	May (1)	Jun (12)	Jul	Aug	Sep (25)	Oct (21)	Nov (39)	Dec
2008	Jan (7)	Feb	Mar (26)	Apr (5)	May (2)	Jun (32)	Jul (9)	Aug (10)	Sep	Oct (3)	Nov (1)	Dec
2009	Jan (10)	Feb (31)	Mar (32)	Apr (35)	May (25)	Jun	Jul (31)	Aug (10)	Sep (95)	Oct (35)	Nov (10)	Dec (34)
2010	Jan (90)	Feb (4)	Mar (7)	Apr (20)	May (20)	Jun (13)	Jul (7)	Aug (18)	Sep (25)	Oct (4)	Nov (16)	Dec (2)
2011	Jan (1)	Feb	Mar (11)	Apr (3)	May (2)	Jun (26)	Jul (10)	Aug (2)	Sep	Oct (1)	Nov (1)	Dec (1)
2012	Jan (3)	Feb (4)	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct (14)	Nov (3)	Dec (4)
2013	Jan (3)	Feb (2)	Mar (1)	Apr (4)	May	Jun (1)	Jul (3)	Aug	Sep	Oct (4)	Nov (3)	Dec (3)
2014	Jan (4)	Feb (2)	Mar (4)	Apr (1)	May (2)	Jun	Jul (2)	Aug	Sep	Oct	Nov	Dec
2015	Jan	Feb	Mar	Apr	May (4)	Jun	Jul	Aug (3)	Sep	Oct	Nov (3)	Dec (3)
2016	Jan (2)	Feb	Mar	Apr (2)	May	Jun	Jul (1)	Aug (2)	Sep (4)	Oct (2)	Nov (7)	Dec
2017	Jan (1)	Feb	Mar (4)	Apr (5)	May (2)	Jun	Jul (2)	Aug	Sep (4)	Oct	Nov	Dec (3)
2018	Jan	Feb	Mar (2)	Apr	May (5)	Jun (2)	Jul (2)	Aug	Sep	Oct	Nov	Dec

fb-contrib-commit Mailing List for fb-contrib (Page 42)

fb-contrib-commit — Log for cvs commits of fb-contrib code