DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updates to processing of Web pages: 

1) adopted the code from Rational for HTML handling
    i) extended it to integrate better source mapping into IR
    ii) integrated fixes from the old html processing to collect more info on forms
    iii) added some copyright comments
  2) updated version of jericho
  3) added support for nu.validator for html5
  4) added script to fetch html parser jars, and removed binary jar
  

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@4090 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
dolby-oss 2011-04-04 15:23:58 +00:00
parent 617d3ac876
commit cdd42a68b6
32 changed files with 740 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
com.ibm.wala.cast.js/.classpath
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="source"/>
<classpathentry kind="src" path="dat"/>
<classpathentry exported="true" kind="lib" path="bin" sourcepath="bin"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/jericho-html-2.6.jar"/>
<classpathentry kind="lib" path="lib/htmlparser-1.3.1.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0 (MacOS X Default)"/>
<classpathentry kind="lib" path="lib/jericho-html-3.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
com.ibm.wala.cast.js/META-INF/MANIFEST.MF
View File

@ -16,13 +16,13 @@ Export-Package: com.ibm.wala.cast.js,
com.ibm.wala.cast.js.client.impl,
com.ibm.wala.cast.js.html,
com.ibm.wala.cast.js.html.jericho,
com.ibm.wala.cast.js.html.nu_validator,
com.ibm.wala.cast.js.ipa.callgraph,
com.ibm.wala.cast.js.ipa.summaries,
com.ibm.wala.cast.js.loader,
com.ibm.wala.cast.js.ssa,
com.ibm.wala.cast.js.translator,
com.ibm.wala.cast.js.types,
com.ibm.wala.cast.js.util,
com.ibm.wala.cast.js.vis
Require-Bundle: com.ibm.wala.cast,
com.ibm.wala.core,

137
com.ibm.wala.cast.js/build.xml
View File

@ -1,69 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="com.ibm.wala.cast.java.polyglot" default="getJars" basedir=".">
<property name="basews" value="${ws}"/>
<property name="baseos" value="${os}"/>
<property name="basearch" value="${arch}"/>
<property name="basenl" value="${nl}"/>
<property name="basews" value="${ws}"/>
<property name="baseos" value="${os}"/>
<property name="basearch" value="${arch}"/>
<property name="basenl" value="${nl}"/>
<!-- Compiler settings. -->
<property name="javacFailOnError" value="true"/>
<property name="javacDebugInfo" value="on"/>
<property name="javacVerbose" value="false"/>
<property name="logExtension" value=".log"/>
<property name="compilerArg" value=""/>
<property name="javacSource" value="1.5"/>
<property name="javacTarget" value="1.5"/>
<!-- This property has been updated to correspond to the paths used by the latest Java update
on Mac OS X 10.6 (Java version 1.6.0_22). If you are not using this version of Mac OS X or Java,
try changing the value of the property to "${java.home}/../../../Classes" -->
<condition property="dir_bootclasspath" value="${java.home}/../Classes">
<os family="mac"/>
</condition>
<property name="dir_bootclasspath" value="${java.home}/lib"/>
<path id="path_bootclasspath">
<fileset dir="${dir_bootclasspath}">
<include name="*.jar"/>
</fileset>
</path>
<property name="bootclasspath" refid="path_bootclasspath"/>
<property name="bundleJavacSource" value="${javacSource}"/>
<property name="bundleJavacTarget" value="${javacTarget}"/>
<property name="bundleBootClasspath" value="${bootclasspath}"/>
<target name="JerichoPresent" depends="init">
<available file="${plugin.destination}/lib/jericho-html-3.2.jar" property="jericho.present"/>
</target>
<target name="fetchJericho" depends="JerichoPresent" unless="jericho.present">
<delete dir="${temp.folder}"/>
<mkdir dir="${temp.folder}"/>
<get src="http://sourceforge.net/projects/jerichohtml/files/jericho-html/3.2/jericho-html-3.2.zip/download" dest="${temp.folder}/jericho-html-3.2.zip"/>
<unzip src="${temp.folder}/jericho-html-3.2.zip" dest="${temp.folder}"/>
<copy file="${temp.folder}/jericho-html-3.2/dist/jericho-html-3.2.jar" tofile="${plugin.destination}/lib/jericho-html-3.2.jar" />
<delete dir="${temp.folder}"/>
</target>
<target name="NuPresent" depends="init">
<available file="${plugin.destination}/lib/htmlparser-1.3.1.jar" property="nu.present"/>
</target>
<target name="fetchNu" depends="NuPresent" unless="nu.present">
<delete dir="${temp.folder}"/>
<mkdir dir="${temp.folder}"/>
<get src="http://about.validator.nu/htmlparser/htmlparser-1.3.1.zip" dest="${temp.folder}/htmlparser-1.3.1.zip"/>
<unzip src="${temp.folder}/htmlparser-1.3.1.zip" dest="${temp.folder}"/>
<copy file="${temp.folder}/htmlparser-1.3.1/htmlparser-1.3.1.jar" tofile="${plugin.destination}/lib/htmlparser-1.3.1.jar" />
<delete dir="${temp.folder}"/>
</target>
<!-- Compiler settings. -->
<property name="javacFailOnError" value="true"/>
<property name="javacDebugInfo" value="on"/>
<property name="javacVerbose" value="false"/>
<property name="logExtension" value=".log"/>
<property name="compilerArg" value=""/>
<property name="javacSource" value="1.5"/>
<property name="javacTarget" value="1.5"/>
<!-- This property has been updated to correspond to the paths used by the latest Java update
on Mac OS X 10.6 (Java version 1.6.0_22). If you are not using this version of Mac OS X or Java,
try changing the value of the property to "${java.home}/../../../Classes" -->
<condition property="dir_bootclasspath" value="${java.home}/../Classes">
<os family="mac"/>
<target name="getJars" depends="fetchJericho,fetchNu" />
<target name="init" depends="properties">
<condition property="pluginTemp" value="${buildTempFolder}/plugins">
<isset property="buildTempFolder"/>
</condition>
<property name="dir_bootclasspath" value="${java.home}/lib"/>
<path id="path_bootclasspath">
<fileset dir="${dir_bootclasspath}">
<include name="*.jar"/>
</fileset>
</path>
<property name="bootclasspath" refid="path_bootclasspath"/>
<property name="bundleJavacSource" value="${javacSource}"/>
<property name="bundleJavacTarget" value="${javacTarget}"/>
<property name="bundleBootClasspath" value="${bootclasspath}"/>
<target name="JerichoPresent" depends="init">
<available file="${plugin.destination}/lib/jericho-html-2.6.jar" property="jericho.present"/>
</target>
<target name="fetchJericho" depends="JerichoPresent" unless="jericho.present">
<delete dir="${temp.folder}"/>
<mkdir dir="${temp.folder}"/>
<get src="http://sourceforge.net/projects/jerichohtml/files/jericho-html/2.6/jericho-html-2.6.zip/download" dest="${temp.folder}/jericho-html-2.6.zip" />
<unzip src="${temp.folder}/jericho-html-2.6.zip" dest="${temp.folder}"/>
<copy file="${temp.folder}/jericho-html-2.6/lib/jericho-html-2.6.jar" tofile="${plugin.destination}/lib/jericho-html-2.6.jar" />
<delete dir="${temp.folder}"/>
</target>
<target name="getJars" depends="fetchJericho" />
<target name="init" depends="properties">
<condition property="pluginTemp" value="${buildTempFolder}/plugins">
<isset property="buildTempFolder"/>
</condition>
<property name="pluginTemp" value="${basedir}"/>
<condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.core.testdata">
<isset property="buildTempFolder"/>
</condition>
<property name="build.result.folder" value="${basedir}"/>
<property name="temp.folder" value="${basedir}/temp.folder"/>
<property name="plugin.destination" value="${basedir}"/>
</target>
<target name="properties" if="eclipse.running">
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
</target>
<property name="pluginTemp" value="${basedir}"/>
<condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.core.testdata">
<isset property="buildTempFolder"/>
</condition>
<property name="build.result.folder" value="${basedir}"/>
<property name="temp.folder" value="${basedir}/temp.folder"/>
<property name="plugin.destination" value="${basedir}"/>
</target>
<target name="properties" if="eclipse.running">
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
</target>
</project>

4
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/JavaScriptAnalysisEngine.java
View File

@ -23,6 +23,7 @@ import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
import com.ibm.wala.cast.js.translator.JavaScriptTranslatorFactory;
import com.ibm.wala.cast.js.types.JavaScriptTypes;
import com.ibm.wala.classLoader.Module;
import com.ibm.wala.classLoader.SourceModule;
import com.ibm.wala.client.AbstractAnalysisEngine;
import com.ibm.wala.ipa.callgraph.AnalysisCache;
import com.ibm.wala.ipa.callgraph.AnalysisOptions;
@ -43,12 +44,11 @@ public class JavaScriptAnalysisEngine extends AbstractAnalysisEngine {
public JavaScriptAnalysisEngine() {
}
@SuppressWarnings("unchecked")
public void buildAnalysisScope() {
try {
loaderFactory = new JavaScriptLoaderFactory(translatorFactory);
Module[] files = (Module[]) moduleFiles.toArray(new Module[moduleFiles.size()]);
SourceModule[] files = (SourceModule[]) moduleFiles.toArray(new SourceModule[moduleFiles.size()]);
scope = new CAstAnalysisScope(files, loaderFactory, Collections.singleton(JavaScriptLoader.JS));
} catch (IOException e) {

75
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java
View File

@ -1,11 +1,25 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.Stack;
import com.ibm.wala.util.collections.HashMapFactory;
import com.ibm.wala.util.collections.Pair;
public class DefaultSourceExtractor extends DomLessSourceExtractor{
@ -14,6 +28,9 @@ public class DefaultSourceExtractor extends DomLessSourceExtractor{
private final HashMap<String, String> constructors = HashMapFactory.make();
protected final Stack<String> stack;
private final Stack<ITag> forms = new Stack<ITag>();
private final Set<Pair<ITag,String>> sets = new HashSet<Pair<ITag,String>>();
public HtmlCallBack(URL entrypointUrl, IUrlResolver urlResolver) {
super(entrypointUrl, urlResolver);
@ -27,7 +44,15 @@ public class DefaultSourceExtractor extends DomLessSourceExtractor{
public void handleEndTag(ITag tag) {
super.handleEndTag(tag);
endElement(stack.pop());
}
if (tag.getName().equalsIgnoreCase("FORM")) {
forms.pop();
}
for(String v : tag.getAllAttributes().values()) {
if (v != null && v.startsWith("javascript:")) {
entrypointRegion.println(v.substring(11), entrypointUrl, tag.getStartingLineNum());
}
}
}
@Override
protected void handleDOM(ITag tag, String funcName) {
@ -48,7 +73,7 @@ public class DefaultSourceExtractor extends DomLessSourceExtractor{
if (relatedTag == null){
domRegion.println(indentedLine.toString());
} else {
domRegion.println(indentedLine.toString(), fileName, relatedTag.getStartingLineNum());
domRegion.println(indentedLine.toString(), entrypointUrl, relatedTag.getStartingLineNum());
}
}
@ -69,7 +94,35 @@ public class DefaultSourceExtractor extends DomLessSourceExtractor{
writeAttribute(tag, attr, value, "this", varName);
}
printlnIndented("" + varName + " = this;", tag);
if (tag.getName().equalsIgnoreCase("FORM")) {
forms.push(tag);
printlnIndented(" var currentForm = this;", tag);
} if (tag.getName().equalsIgnoreCase("INPUT")) {
String prop = tag.getAttributeByName("NAME");
if (prop == null) {
prop = tag.getAttributeByName("name");
}
String type = tag.getAttributeByName("TYPE");
if (type == null) {
type = tag.getAttributeByName("type");
}
if (type != null && prop != null) {
if (type.equalsIgnoreCase("RADIO")) {
if (! sets.contains(Pair.make(forms.peek(), prop))) {
sets.add(Pair.make(forms.peek(), prop));
printlnIndented(" currentForm." + prop + " = new Array();", tag);
printlnIndented(" currentForm." + prop + "Counter = 0;", tag);
}
printlnIndented(" currentForm." + prop + "[currentForm." + prop + "Counter++] = this;", tag);
} else {
printlnIndented(" currentForm." + prop + " = this;", tag);
}
}
}
printlnIndented(varName + " = this;", tag);
printlnIndented("dom_nodes." + varName + " = this;", tag);
printlnIndented("parent.appendChild(this);", tag);
}
@ -81,21 +134,19 @@ public class DefaultSourceExtractor extends DomLessSourceExtractor{
protected void writeEventAttribute(ITag tag, String attr, String value, String varName, String varName2){
if(attr.substring(0,2).equals("on")) {
printlnIndented("function " + attr + "_" + varName2 + "(event) {" + value + "};", tag);
printlnIndented(varName + "." + attr + " = " + attr + "_" + varName2 + ";", tag);
newLine(); newLine();
printlnIndented(varName2 + "." + attr + "(null);\n", tag);
} else if (value.startsWith("javascript:") || value.startsWith("javaScript:")) {
printlnIndented("var " + varName + attr + " = " + value.substring(11), tag);
printlnIndented(varName + ".setAttribute('" + attr + "', " + varName + attr + ");", tag);
} else {
printlnIndented(varName + "." + attr + " = function " + attr + "_" + varName2 + "(event) {" + value + "};", tag);
entrypointRegion.println(varName2 + "." + attr + "(null);", entrypointUrl, new Integer(tag.getStartingLineNum()));
} else if (value != null) {
if (value.indexOf('\'') > 0) {
value = value.replaceAll("\\'", "\\\\'");
}
if (value.indexOf('\n') > 0) {
value = value.replaceAll("\\n", "\\\\n");
}
printlnIndented(varName + ".setAttribute('" + attr + "', '" + value + "');", tag);
if (attr.equals(attr.toUpperCase())) {
attr = attr.toLowerCase();
}
printlnIndented(varName + "['" + attr + "'] = '" + value + "';", tag);
}
}

95
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DomLessSourceExtractor.java
View File

@ -1,10 +1,19 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintStream;
import java.net.MalformedURLException;
import java.net.URL;
@ -12,17 +21,14 @@ import java.net.URLConnection;
import java.util.Collections;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.regex.Pattern;
import com.ibm.wala.cast.js.html.jericho.JerichoHtmlParser;
import com.ibm.wala.classLoader.SourceFileModule;
import com.ibm.wala.util.collections.Pair;
public class DomLessSourceExtractor implements JSSourceExtractor {
public class DomLessSourceExtractor extends JSSourceExtractor {
private static final Pattern LEGAL_JS_IDENTIFIER_REGEXP = Pattern.compile("[a-zA-Z$_][a-zA-Z\\d$_]*");
private boolean DELETE_UPON_EXIT = true;
interface IGeneratorCallback extends IHtmlCallback {
void writeToFinalRegion(SourceRegion finalRegion);
}
@ -35,8 +41,8 @@ public class DomLessSourceExtractor implements JSSourceExtractor {
protected final SourceRegion domRegion;
protected final SourceRegion entrypointRegion;
protected final String fileName;
private boolean inScriptRegion = false;
private int counter = 0;
public HtmlCallback(URL entrypointUrl, IUrlResolver urlResolver) {
@ -45,19 +51,30 @@ public class DomLessSourceExtractor implements JSSourceExtractor {
this.scriptRegion = new SourceRegion();
this.domRegion = new SourceRegion();
this.entrypointRegion = new SourceRegion();
this.fileName = entrypointUrl.getFile();
}
//Do nothing
public void handleEndTag(ITag tag) {}
public void handleEndTag(ITag tag) {
if (tag.getName().equalsIgnoreCase("script")) {
assert inScriptRegion;
inScriptRegion = false;
}
}
public void handleText(int lineNumber, String text) {
if (inScriptRegion) {
scriptRegion.println(text, entrypointUrl, lineNumber);
}
}
public void handleStartTag(ITag tag) {
if (tag.getName().equalsIgnoreCase("script")) {
handleScript(tag);
assert !inScriptRegion;
inScriptRegion = true;
}
handleDOM(tag);
}
/**
@ -92,14 +109,14 @@ public class DomLessSourceExtractor implements JSSourceExtractor {
if (attName.toLowerCase().startsWith("on") || (attValue != null && attValue.toLowerCase().startsWith("javascript:"))) {
String fName = attName + "_" + funcName;
String signatureLine = "function " + fName + "(event) {";
domRegion.println(signatureLine, fileName, lineNum);// Defines the function
domRegion.println(signatureLine, entrypointUrl, lineNum);// Defines the function
int offset = 0;
for (String eventContentLine : extructJS(attValue)){
domRegion.println("\t" + eventContentLine, fileName, lineNum + (offset++));
domRegion.println("\t" + eventContentLine, entrypointUrl, lineNum + (offset++));
}
domRegion.println("}", fileName, lineNum);// Defines the function
domRegion.println("}", entrypointUrl, lineNum);// Defines the function
entrypointRegion.println("\t" + fName + "(null);", fileName, lineNum);// Run it
entrypointRegion.println("\t" + fName + "(null);", entrypointUrl, lineNum);// Run it
}
}
@ -125,8 +142,6 @@ public class DomLessSourceExtractor implements JSSourceExtractor {
if (value != null) {
// script is out-of-line
getScriptFromUrl(value);
} else{
getInlineScript(tag);
}
} catch (IOException e) {
@ -148,18 +163,13 @@ public class DomLessSourceExtractor implements JSSourceExtractor {
BufferedReader scriptReader = new BufferedReader(new UnicodeReader(scriptInputStream, "UTF8"));
while ((line = scriptReader.readLine()) != null) {
scriptRegion.println(line, scriptSrc.getFile(), lineNum++);
scriptRegion.println(line, scriptSrc, lineNum++);
}
} finally {
scriptInputStream.close();
}
}
private void getInlineScript(ITag tag) throws IOException {
Pair<Integer, String> bodyWithLineNumber = tag.getBodyText();
scriptRegion.println(bodyWithLineNumber.snd, fileName, bodyWithLineNumber.fst);
}
protected String getScriptName(URL url) throws MalformedURLException {
String file = url.getFile();
int lastIdxOfSlash = file.lastIndexOf('/');
@ -185,10 +195,10 @@ public class DomLessSourceExtractor implements JSSourceExtractor {
}
}
public Map<SourceFileModule, FileMapping> extractSources(URL entrypointUrl, IHtmlParser htmlParser, IUrlResolver urlResolver)
public Set<MappedSourceModule> extractSources(URL entrypointUrl, IHtmlParser htmlParser, IUrlResolver urlResolver)
throws IOException {
InputStreamReader inputStreamReader = getStream(entrypointUrl);
InputStream inputStreamReader = getStream(entrypointUrl);
IGeneratorCallback htmlCallback = createHtmlCallback(entrypointUrl, urlResolver);
htmlParser.parse(inputStreamReader, htmlCallback, entrypointUrl.getFile());
@ -196,18 +206,23 @@ public class DomLessSourceExtractor implements JSSourceExtractor {
htmlCallback.writeToFinalRegion(finalRegion);
// writing the final region into one SourceFileModule.
File outputFile = createOutputFile(entrypointUrl, DELETE_UPON_EXIT);
File outputFile = createOutputFile(entrypointUrl, DELETE_UPON_EXIT, USE_TEMP_NAME);
FileMapping fileMapping = finalRegion.writeToFile(new PrintStream(outputFile));
SourceFileModule singleFileModule = new SourceFileModule(outputFile, outputFile.getName());
return Collections.singletonMap(singleFileModule, fileMapping);
MappedSourceModule singleFileModule = new MappedSourceFileModule(outputFile, outputFile.getName(), fileMapping);
return Collections.singleton(singleFileModule);
}
protected IGeneratorCallback createHtmlCallback(URL entrypointUrl, IUrlResolver urlResolver) {
return new HtmlCallback(entrypointUrl, urlResolver);
}
private File createOutputFile(URL url, boolean delete) throws IOException {
File outputFile = File.createTempFile(new File(url.getFile()).getName(), ".js");
private File createOutputFile(URL url, boolean delete, boolean useTempName) throws IOException {
File outputFile;
if (useTempName) {
outputFile = File.createTempFile(new File(url.getFile()).getName(), ".js");
} else {
outputFile = new File(new File(url.getFile()).getName());
}
if (outputFile.exists()){
outputFile.delete();
}
@ -218,25 +233,25 @@ public class DomLessSourceExtractor implements JSSourceExtractor {
}
private InputStreamReader getStream(URL url) throws IOException {
private InputStream getStream(URL url) throws IOException {
URLConnection conn = url.openConnection();
conn.setDefaultUseCaches(false);
conn.setUseCaches(false);
return new InputStreamReader(conn.getInputStream());
return conn.getInputStream();
}
public static void main(String[] args) throws IOException {
// DomLessSourceExtractor domLessScopeGenerator = new DomLessSourceExtractor();
DomLessSourceExtractor domLessScopeGenerator = new DefaultSourceExtractor();
domLessScopeGenerator.DELETE_UPON_EXIT = false;
JSSourceExtractor domLessScopeGenerator = new DefaultSourceExtractor();
JSSourceExtractor.DELETE_UPON_EXIT = false;
URL entrypointUrl = new URL(args[0]);
IHtmlParser htmlParser = new JerichoHtmlParser();
IUrlResolver urlResolver = new IdentityUrlResover();
Map<SourceFileModule, FileMapping> res = domLessScopeGenerator.extractSources(entrypointUrl , htmlParser , urlResolver);
Entry<SourceFileModule, FileMapping> entry = res.entrySet().iterator().next();
System.out.println(entry.getKey());
entry.getValue().dump(System.out);
IUrlResolver urlResolver = new IdentityUrlResolver();
Set<MappedSourceModule> res = domLessScopeGenerator.extractSources(entrypointUrl , htmlParser , urlResolver);
MappedSourceModule entry = res.iterator().next();
System.out.println(entry);
entry.getMapping().dump(System.out);
}
}

17
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/FileMapping.java
View File

@ -1,6 +1,17 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
import java.io.PrintStream;
import java.net.URL;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@ -12,20 +23,20 @@ import com.ibm.wala.util.collections.Pair;
* Maps line numbers to lines of other files (fileName + line).
*/
public class FileMapping{
protected Map<Integer, Pair<String, Integer>> lineNumberToFileAndLine = HashMapFactory.make();
protected Map<Integer, Pair<URL, Integer>> lineNumberToFileAndLine = HashMapFactory.make();
/**
* @param line
* @return Null if no mapping for the given line.
*/
public Pair<String,Integer> getAssociatedFileAndLine(int line){
public Pair<URL,Integer> getAssociatedFileAndLine(int line){
return lineNumberToFileAndLine.get(line);
}
public void dump(PrintStream ps){
Set<Integer> lines = new TreeSet<Integer>(lineNumberToFileAndLine.keySet());
for (Integer line : lines){
Pair<String, Integer> fnAndln = lineNumberToFileAndLine.get(line);
Pair<URL, Integer> fnAndln = lineNumberToFileAndLine.get(line);
ps.println(line + ": " + fnAndln.snd + "@" + fnAndln.fst);
}
}

15
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IHtmlCallback.java
View File

@ -1,6 +1,17 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
/**
* Callback which is implemented by users of the IHtmlParser. The parser traverses the dom-nodes in an in-order.
* @author danielk
@ -11,6 +22,8 @@ public interface IHtmlCallback {
void handleStartTag(ITag tag);
void handleText(int lineNumber, String text);
void handleEndTag(ITag tag);
}

14
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IHtmlParser.java
View File

@ -1,6 +1,16 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
import java.io.Reader;
import java.io.InputStream;
/**
* @author danielk
@ -15,6 +25,6 @@ public interface IHtmlParser {
* @param callback
* @param fileName
*/
public void parse(Reader reader, IHtmlCallback callback, String fileName);
public void parse(InputStream reader, IHtmlCallback callback, String fileName);
}

7
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IHtmlParserFactory.java Normal file
View File

@ -0,0 +1,7 @@
package com.ibm.wala.cast.js.html;
public interface IHtmlParserFactory {
IHtmlParser getParser();
}

17
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/ITag.java
View File

@ -1,9 +1,17 @@
package com.ibm.wala.cast.js.html;
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
import java.util.Map;
import com.ibm.wala.util.collections.Pair;
/**
* @author danielk
* Data structure representing an HTML tag, with its attributes and content. Used by the HTML parser when calling the callback.
@ -24,11 +32,6 @@ public interface ITag {
public Map<String, String> getAllAttributes();
/**
* @return a pair containing the start line of the tag's body and the actual body as a string
*/
public Pair<Integer, String> getBodyText();
/**
* Returns the starting line number of the tag.
* @return null if no known

10
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IUrlResolver.java
View File

@ -1,3 +1,13 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
import java.net.URL;

25
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IdentityUrlResolver.java Normal file
View File

@ -0,0 +1,25 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
import java.net.URL;
public class IdentityUrlResolver implements IUrlResolver{
public URL resolve(URL input) {
return input;
}
public URL deResolve(URL input) {
return input;
}
}

15
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IdentityUrlResover.java
View File

@ -1,15 +0,0 @@
package com.ibm.wala.cast.js.html;
import java.net.URL;
public class IdentityUrlResover implements IUrlResolver{
public URL resolve(URL input) {
return input;
}
public URL deResolve(URL input) {
return input;
}
}

22
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/JSSourceExtractor.java
View File

@ -1,10 +1,18 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
import java.io.IOException;
import java.net.URL;
import java.util.Map;
import com.ibm.wala.classLoader.SourceFileModule;
import java.util.Set;
/**
* Extracts scripts from a given URL of an HTML. Retrieves also attached js files.
@ -13,8 +21,12 @@ import com.ibm.wala.classLoader.SourceFileModule;
* @author yinnonh
* @author danielk
*/
public interface JSSourceExtractor {
public abstract class JSSourceExtractor {
public Map<SourceFileModule, FileMapping> extractSources(URL entrypointUrl, IHtmlParser htmlParser, IUrlResolver urlResolver) throws IOException;
public static boolean DELETE_UPON_EXIT = true;
public static boolean USE_TEMP_NAME = true;
public abstract Set<MappedSourceModule> extractSources(URL entrypointUrl, IHtmlParser htmlParser, IUrlResolver urlResolver) throws IOException;
}

24
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/MappedSourceFileModule.java Normal file
View File

@ -0,0 +1,24 @@
package com.ibm.wala.cast.js.html;
import java.io.File;
import com.ibm.wala.classLoader.SourceFileModule;
public class MappedSourceFileModule extends SourceFileModule implements MappedSourceModule {
private final FileMapping fileMapping;
public MappedSourceFileModule(File f, String fileName, FileMapping fileMapping) {
super(f, fileName);
this.fileMapping = fileMapping;
}
public MappedSourceFileModule(File f, SourceFileModule clonedFrom, FileMapping fileMapping) {
super(f, clonedFrom);
this.fileMapping = fileMapping;
}
public FileMapping getMapping() {
return fileMapping;
}
}

9
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/MappedSourceModule.java Normal file
View File

@ -0,0 +1,9 @@
package com.ibm.wala.cast.js.html;
import com.ibm.wala.classLoader.SourceModule;
public interface MappedSourceModule extends SourceModule {
FileMapping getMapping();
}

16
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/MutableFileMapping.java
View File

@ -1,11 +1,23 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
import java.net.URL;
import com.ibm.wala.util.collections.Pair;
public class MutableFileMapping extends FileMapping {
void map(int line, String originalFile, int originalLine){
lineNumberToFileAndLine.put(line, Pair.<String, Integer> make(originalFile, originalLine));
void map(int line, URL originalFile, int originalLine){
lineNumberToFileAndLine.put(line, Pair.<URL, Integer> make(originalFile, originalLine));
}
}

19
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/SourceRegion.java
View File

@ -1,9 +1,20 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.PrintStream;
import java.io.StringReader;
import java.net.URL;
import java.util.StringTokenizer;
import com.ibm.wala.util.collections.Pair;
@ -17,7 +28,7 @@ public class SourceRegion {
public SourceRegion() {
}
public void print(String text, String originalFile, int originalLine){
public void print(String text, URL originalFile, int originalLine){
source.append(text);
int numberOfLineDrops = getNumberOfLineDrops(text);
if (originalFile != null){
@ -32,7 +43,7 @@ public class SourceRegion {
}
}
public void println(String text, String originalFile, int originalLine){
public void println(String text, URL originalFile, int originalLine){
print(text + "\n", originalFile, originalLine);
}
@ -57,7 +68,7 @@ public class SourceRegion {
while ((line = br.readLine()) != null){
lineNum++;
Pair<String, Integer> fileAndLine = otherRegion.fileMapping.getAssociatedFileAndLine(lineNum);
Pair<URL, Integer> fileAndLine = otherRegion.fileMapping.getAssociatedFileAndLine(lineNum);
if (fileAndLine!= null){
this.println(line, fileAndLine.fst, fileAndLine.snd);
} else {
@ -77,7 +88,7 @@ public class SourceRegion {
String line = (String) st.nextElement();
lineNum++;
Pair<String, Integer> fileAndLine = fileMapping.getAssociatedFileAndLine(lineNum);
Pair<URL, Integer> fileAndLine = fileMapping.getAssociatedFileAndLine(lineNum);
if (fileAndLine!= null){
ps.print(fileAndLine.snd + "@" + fileAndLine.fst + "\t:");
} else {

10
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/UnicodeReader.java
View File

@ -1,3 +1,13 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
/**

10
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/UrlManipulator.java
View File

@ -1,3 +1,13 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
import java.net.MalformedURLException;

61
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/WebUtil.java Normal file
View File

@ -0,0 +1,61 @@
/******************************************************************************
* Copyright (c) 2002 - 2006 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Set;
import com.ibm.wala.cast.js.html.jericho.JerichoHtmlParser;
import com.ibm.wala.util.debug.Assertions;
public class WebUtil {
public static final String preamble = "preamble.js";
private static IHtmlParserFactory factory = new IHtmlParserFactory() {
public IHtmlParser getParser() {
return new JerichoHtmlParser();
}
};
public static void setFactory(IHtmlParserFactory factory) {
WebUtil.factory = factory;
}
public static Set<MappedSourceModule> extractScriptFromHTML(String url) {
try {
if (! url.startsWith("file://")) {
url = "file://" + url;
}
return extractScriptFromHTML(new URL(url));
} catch (MalformedURLException e) {
Assertions.UNREACHABLE( e.toString() );
return null;
}
}
public static Set<MappedSourceModule> extractScriptFromHTML(URL url) {
try {
JSSourceExtractor extractor = new DefaultSourceExtractor();
return extractor.extractSources(url, factory.getParser(), new IdentityUrlResolver());
} catch (IOException e) {
throw new RuntimeException("trouble with " + url, e);
}
}
public static void main(String[] args) throws MalformedURLException {
System.err.println(extractScriptFromHTML(new URL(args[0])));
}
}

26
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoHtmlParser.java
View File

@ -1,14 +1,25 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html.jericho;
import java.io.IOException;
import java.io.Reader;
import java.io.InputStream;
import java.util.Iterator;
import java.util.List;
import au.id.jericho.lib.html.Config;
import au.id.jericho.lib.html.Element;
import au.id.jericho.lib.html.LoggerProvider;
import au.id.jericho.lib.html.Source;
import net.htmlparser.jericho.Config;
import net.htmlparser.jericho.Element;
import net.htmlparser.jericho.LoggerProvider;
import net.htmlparser.jericho.Source;
import com.ibm.wala.cast.js.html.IHtmlCallback;
import com.ibm.wala.cast.js.html.IHtmlParser;
@ -23,8 +34,7 @@ public class JerichoHtmlParser implements IHtmlParser{
Config.LoggerProvider = LoggerProvider.STDERR;
}
@SuppressWarnings("unchecked")
public void parse(Reader reader, IHtmlCallback callback, String fileName) {
public void parse(InputStream reader, IHtmlCallback callback, String fileName) {
Parser parser = new Parser(callback, fileName);
Source src;
try {
@ -51,10 +61,10 @@ public class JerichoHtmlParser implements IHtmlParser{
this.fileName = fileName;
}
@SuppressWarnings("unchecked")
private void parse(Element root) {
JerichoTag tag = new JerichoTag(root, fileName);
handler.handleStartTag(tag);
handler.handleText(tag.getStartingLineNum(), tag.getBodyText().snd);
List<Element> childElements = root.getChildElements();
for (Iterator<Element> nodeIterator = childElements.iterator(); nodeIterator.hasNext();) {
Element child = nodeIterator.next();

22
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java
View File

@ -1,10 +1,21 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html.jericho;
import java.util.Map;
import au.id.jericho.lib.html.Attributes;
import au.id.jericho.lib.html.Element;
import au.id.jericho.lib.html.Segment;
import net.htmlparser.jericho.Attributes;
import net.htmlparser.jericho.Element;
import net.htmlparser.jericho.Segment;
import com.ibm.wala.cast.js.html.ITag;
import com.ibm.wala.util.collections.HashMapFactory;
@ -20,13 +31,12 @@ public class JerichoTag implements ITag {
private final String sourceFile;
private Map<String, String> attributesMap;
@SuppressWarnings("unchecked")
public JerichoTag(Element root, String sourceFile) {
this.innerElement = root;
Attributes attributes = innerElement.getStartTag().getAttributes();
attributesMap = HashMapFactory.make();
if (attributes != null) {
attributesMap = attributes.populateMap(attributesMap, false);
attributesMap = attributes.populateMap(attributesMap, true);
}
this.sourceFile = sourceFile;
}
@ -36,7 +46,7 @@ public class JerichoTag implements ITag {
}
public String getAttributeByName(String name) {
return attributesMap.get(name);
return attributesMap.get(name.toLowerCase());
}
public Pair<Integer, String> getBodyText() {

164
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/nu_validator/NuValidatorHtmlParser.java Normal file
View File

@ -0,0 +1,164 @@
/******************************************************************************
* Copyright (c) 2002 - 2011 IBM Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*****************************************************************************/
package com.ibm.wala.cast.js.html.nu_validator;
import java.io.IOException;
import java.io.InputStream;
import java.io.LineNumberReader;
import java.io.StringReader;
import java.util.AbstractMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.Stack;
import nu.validator.htmlparser.common.XmlViolationPolicy;
import nu.validator.htmlparser.sax.HtmlParser;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import com.ibm.wala.cast.js.html.IHtmlCallback;
import com.ibm.wala.cast.js.html.IHtmlParser;
import com.ibm.wala.cast.js.html.ITag;
public class NuValidatorHtmlParser implements IHtmlParser {
public void parse(final InputStream reader, final IHtmlCallback handler, String fileName) {
HtmlParser parser = new HtmlParser();
parser.setXmlPolicy(XmlViolationPolicy.ALLOW);
parser.setContentHandler(new ContentHandler() {
private Locator locator;
private Stack<ITag> tags = new Stack<ITag>();;
private int countLines(char[] ch, int start, int length) {
LineNumberReader r = new LineNumberReader(new StringReader (new String(ch, start, length)));
try {
while (r.read() > -1);
} catch (IOException e) {
throw new RuntimeException("cannot read from string", e);
}
return r.getLineNumber();
}
public void setDocumentLocator(Locator locator) {
this.locator = locator;
}
public void startElement(String uri, final String localName, String qName, final Attributes atts) throws SAXException {
final int line = locator.getLineNumber();
tags.push(new ITag() {
public String getName() {
return localName;
}
public String getAttributeByName(String name) {
return atts.getValue(name);
}
public Map<String, String> getAllAttributes() {
return new AbstractMap<String,String>() {
private Set<Map.Entry<String,String>> es = null;
@Override
public Set<java.util.Map.Entry<String, String>> entrySet() {
if (es == null) {
es = new HashSet<Map.Entry<String,String>>();
for(int i = 0; i < atts.getLength(); i++) {
final int index = i;
es.add(new Map.Entry<String,String>() {
public String getKey() {
return atts.getLocalName(index);
}
public String getValue() {
return atts.getValue(index);
}
public String setValue(String value) {
throw new UnsupportedOperationException();
}
});
}
}
return es;
}
};
}
public int getStartingLineNum() {
return line;
}
});
handler.handleStartTag(tags.peek());
}
public void endElement(String uri, String localName, String qName) throws SAXException {
handler.handleEndTag(tags.pop());
}
public void characters(char[] ch, int start, int length) throws SAXException {
handler.handleText(locator.getLineNumber() - countLines(ch, start, length), new String(ch, start, length));
}
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
handler.handleText(locator.getLineNumber(), new String(ch, start, length));
}
public void startDocument() throws SAXException {
// do nothing
}
public void endDocument() throws SAXException {
// do nothing
}
public void startPrefixMapping(String prefix, String uri) throws SAXException {
// do nothing
}
public void endPrefixMapping(String prefix) throws SAXException {
// do nothing
}
public void processingInstruction(String target, String data) throws SAXException {
// do nothing
}
public void skippedEntity(String name) throws SAXException {
// do nothing
}
});
try {
parser.parse(new InputSource(new InputStream() {
@Override
public int read() throws IOException {
int v;
do {
v = reader.read();
} while (v == '\r');
return v;
}
}));
} catch (IOException e) {
assert false : e.toString();
} catch (SAXException e) {
assert false : e.toString();
}
}
}

11
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCFABuilder.java
View File

@ -14,9 +14,11 @@ import java.util.Iterator;
import com.ibm.wala.cast.ipa.callgraph.AstCFAPointerKeys;
import com.ibm.wala.cast.js.types.JavaScriptTypes;
import com.ibm.wala.classLoader.IClass;
import com.ibm.wala.classLoader.IField;
import com.ibm.wala.ipa.callgraph.AnalysisCache;
import com.ibm.wala.ipa.callgraph.AnalysisOptions;
import com.ibm.wala.ipa.callgraph.propagation.ConcreteTypeKey;
import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
import com.ibm.wala.ipa.cha.IClassHierarchy;
@ -65,8 +67,12 @@ public class JSCFABuilder extends JSSSAPropagationCallGraphBuilder {
@Override
public Iterator<PointerKey> getPointerKeysForReflectedFieldRead(InstanceKey I, InstanceKey F) {
IClassHierarchy cha = I.getConcreteType().getClassHierarchy();
IClass function = cha.lookupClass(JavaScriptTypes.Function);
if (isBogusKey(I)) {
return EmptyIterator.instance();
} else if (cha.isSubclassOf(F.getConcreteType(), function)) {
return super.getPointerKeysForReflectedFieldRead(I, new ConcreteTypeKey(function));
} else {
return super.getPointerKeysForReflectedFieldRead(I, F);
}
@ -74,12 +80,17 @@ public class JSCFABuilder extends JSSSAPropagationCallGraphBuilder {
@Override
public Iterator<PointerKey> getPointerKeysForReflectedFieldWrite(InstanceKey I, InstanceKey F) {
IClassHierarchy cha = I.getConcreteType().getClassHierarchy();
IClass function = cha.lookupClass(JavaScriptTypes.Function);
if (isBogusKey(I)) {
return EmptyIterator.instance();
} else if (cha.isSubclassOf(F.getConcreteType(), function)) {
return super.getPointerKeysForReflectedFieldWrite(I, new ConcreteTypeKey(function));
} else {
return super.getPointerKeysForReflectedFieldWrite(I, F);
}
}
});
}

38
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java
View File

@ -11,7 +11,11 @@
package com.ibm.wala.cast.js.ipa.callgraph;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
import com.ibm.wala.analysis.typeInference.TypeInference;
import com.ibm.wala.cast.ipa.callgraph.AstSSAPropagationCallGraphBuilder;
@ -59,6 +63,7 @@ import com.ibm.wala.ssa.SSABinaryOpInstruction;
import com.ibm.wala.ssa.SSAUnaryOpInstruction;
import com.ibm.wala.ssa.SymbolTable;
import com.ibm.wala.util.collections.HashSetFactory;
import com.ibm.wala.util.collections.Pair;
import com.ibm.wala.util.intset.IntSetAction;
import com.ibm.wala.util.intset.IntSetUtil;
import com.ibm.wala.util.intset.MutableIntSet;
@ -70,12 +75,43 @@ public class JSSSAPropagationCallGraphBuilder extends AstSSAPropagationCallGraph
public static final boolean DEBUG_TYPE_INFERENCE = false;
URL scriptBaseURL;
private URL scriptBaseURL;
public URL getBaseURL() {
return scriptBaseURL;
}
public void setBaseURL(URL url) {
this.scriptBaseURL = url;
}
private SortedMap<Integer,URL> scriptIndexToFragment;
private Map<String, Integer> scriptFragmentToLine;
public void setFragments(SortedMap<Integer,URL> map) {
int i = 0;
scriptIndexToFragment = new TreeMap<Integer,URL>();
for(Map.Entry<Integer, URL> e : map.entrySet()) {
scriptIndexToFragment.put(i++, e.getValue());
}
scriptFragmentToLine = new HashMap<String,Integer>(map.size());
for(Map.Entry<Integer, URL> e : map.entrySet()) {
scriptFragmentToLine.put(e.getValue().toString(), e.getKey());
}
}
public URL getFragment(int i) {
return scriptIndexToFragment.get(i);
}
public Pair<URL, Integer> mapPosition(URL fragment, int line) {
if (fragment.toString().indexOf("scriptTag") < 0) {
return Pair.make(fragment, line);
} else {
return Pair.make(scriptBaseURL, scriptFragmentToLine.get(fragment) + line);
}
}
protected JSSSAPropagationCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache,
PointerKeyFactory pointerKeyFactory) {
super(cha, options, cache, pointerKeyFactory);

4
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java
View File

@ -55,7 +55,7 @@ public class LoadFileTargetSelector implements MethodTargetSelector {
String str = names.iterator().next();
try {
JavaScriptLoader cl = (JavaScriptLoader) builder.getClassHierarchy().getLoader(JavaScriptTypes.jsLoader);
URL url = new URL(builder.scriptBaseURL, str);
URL url = new URL(builder.getBaseURL(), str);
Util.loadAdditionalFile(builder.getClassHierarchy() , cl, str, url, url.getFile());
IClass script = builder.getClassHierarchy().lookupClass(TypeReference.findOrCreate(cl.getReference(), "L" + url.getFile()));
return script.getMethod(JavaScriptMethods.fnSelector);
@ -63,6 +63,8 @@ public class LoadFileTargetSelector implements MethodTargetSelector {
// do nothing, fall through and return 'target'
} catch (IOException e) {
// do nothing, fall through and return 'target'
} catch (RuntimeException e) {
// do nothing, fall through and return 'target'
}
}
}

59
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/Util.java
View File

@ -14,6 +14,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@ -122,34 +123,38 @@ public class Util extends com.ibm.wala.cast.ipa.callgraph.Util {
* @throws IOException
*/
public static Set<String> loadAdditionalFile(IClassHierarchy cha, JavaScriptLoader cl, String fileName, URL url, String file) throws IOException {
SourceURLModule M = new SourceURLModule(url);
TranslatorToCAst toCAst = getTranslatorFactory().make(new CAstImpl(), M, url, file);
final Set<String> names = new HashSet<String>();
JSAstTranslator toIR = new JSAstTranslator(cl) {
protected void defineFunction(CAstEntity N,
WalkContext definingContext,
AbstractCFG cfg,
SymbolTable symtab,
boolean hasCatchBlock,
TypeReference[][] caughtTypes,
boolean hasMonitorOp,
AstLexicalInformation LI,
DebuggingInformation debugInfo)
{
String fnName = "L" + composeEntityName(definingContext, N);
names.add(fnName);
super.defineFunction(N, definingContext, cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, LI, debugInfo);
try{
SourceURLModule M = new SourceURLModule(url);
TranslatorToCAst toCAst = getTranslatorFactory().make(new CAstImpl(), M);
final Set<String> names = new HashSet<String>();
JSAstTranslator toIR = new JSAstTranslator(cl) {
protected void defineFunction(CAstEntity N,
WalkContext definingContext,
AbstractCFG cfg,
SymbolTable symtab,
boolean hasCatchBlock,
TypeReference[][] caughtTypes,
boolean hasMonitorOp,
AstLexicalInformation LI,
DebuggingInformation debugInfo)
{
String fnName = "L" + composeEntityName(definingContext, N);
names.add(fnName);
super.defineFunction(N, definingContext, cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, LI, debugInfo);
}
};
CAstEntity tree = toCAst.translateToCAst();
if (DEBUG){
CAstPrinter.printTo(tree, new PrintWriter(System.err));
}
};
CAstEntity tree = toCAst.translateToCAst();
if (DEBUG){
CAstPrinter.printTo(tree, new PrintWriter(System.err));
toIR.translate(tree, fileName);
for(String name : names) {
IClass fcls = cl.lookupClass(name, cha);
cha.addClass(fcls);
}
return names;
} catch (RuntimeException e) {
return Collections.emptySet();
}
toIR.translate(tree, fileName);
for(String name : names) {
IClass fcls = cl.lookupClass(name, cha);
cha.addClass(fcls);
}
return names;
}
}

6
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java
View File

@ -11,7 +11,6 @@
package com.ibm.wala.cast.js.loader;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@ -70,6 +69,7 @@ import com.ibm.wala.classLoader.LanguageImpl;
import com.ibm.wala.classLoader.Module;
import com.ibm.wala.classLoader.ModuleEntry;
import com.ibm.wala.classLoader.NewSiteReference;
import com.ibm.wala.classLoader.SourceModule;
import com.ibm.wala.classLoader.SourceURLModule;
import com.ibm.wala.ipa.cha.IClassHierarchy;
import com.ibm.wala.shrikeBT.IBinaryOpInstruction.IOperator;
@ -844,8 +844,8 @@ public class JavaScriptLoader extends CAstAbstractModuleLoader {
}
@Override
protected TranslatorToCAst getTranslatorToCAst(CAst ast, ModuleEntry module, URL sourceURL, String localFileName) {
return translatorFactory.make(ast, module, sourceURL, localFileName);
protected TranslatorToCAst getTranslatorToCAst(CAst ast, SourceModule module) {
return translatorFactory.make(ast, module);
}
@Override

4
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JSAstTranslator.java
View File

@ -97,8 +97,9 @@ public class JSAstTranslator extends AstTranslator {
return readVn;
}
protected void defineType(CAstEntity type, WalkContext wc) {
protected boolean defineType(CAstEntity type, WalkContext wc) {
Assertions.UNREACHABLE("JavaScript doesn't have types. I suggest you look elsewhere for your amusement.");
return false;
}
protected void defineField(CAstEntity topEntity, WalkContext wc, CAstEntity n) {
@ -140,6 +141,7 @@ public class JSAstTranslator extends AstTranslator {
if (DEBUG)
System.err.println(cfg);
symtab.getNullConstant();
symtab.getConstant("arguments");
symtab.getConstant("length");
for(int i = 0; i < 20; i++) {

6
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptTranslatorFactory.java
View File

@ -10,14 +10,12 @@
*****************************************************************************/
package com.ibm.wala.cast.js.translator;
import java.net.URL;
import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
import com.ibm.wala.cast.tree.CAst;
import com.ibm.wala.classLoader.ModuleEntry;
import com.ibm.wala.classLoader.SourceModule;
public interface JavaScriptTranslatorFactory {
TranslatorToCAst make(CAst ast, ModuleEntry M, URL sourceURL, String localFileName);
TranslatorToCAst make(CAst ast, SourceModule M);
}