From 6c08d95103f4923e61ed54ac36d1658a85211d74 Mon Sep 17 00:00:00 2001 From: sjfink Date: Wed, 9 Jan 2008 20:46:05 +0000 Subject: [PATCH] tweak some servlet models git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@2324 f5eafffb-2e1d-0410-98e4-8ec43c5233c4 --- com.ibm.wala.j2ee/lib/wala.j2ee.jar.model | Bin 21205 -> 21382 bytes .../model/javax/servlet/ServletRequest.java | 29 +++++++++++++----- .../servlet/http/HttpServletRequest.java | 12 ++++++-- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/com.ibm.wala.j2ee/lib/wala.j2ee.jar.model b/com.ibm.wala.j2ee/lib/wala.j2ee.jar.model index 2a70dc3595fdbd5c1337e9c4ea6a013a3ffc6724..081000aea1fbbda56ac3df55829511149529b4ef 100644 GIT binary patch delta 7415 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 U^t8E=?3MpjWkQuy{nLj30Te@=$p8QV delta 7237 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 TB78zi5bmN4z=&7=v+Vx^UaldL diff --git a/com.ibm.wala.j2ee/src/com/ibm/wala/model/javax/servlet/ServletRequest.java b/com.ibm.wala.j2ee/src/com/ibm/wala/model/javax/servlet/ServletRequest.java index 417947c35..e2100b1ab 100644 --- a/com.ibm.wala.j2ee/src/com/ibm/wala/model/javax/servlet/ServletRequest.java +++ b/com.ibm.wala.j2ee/src/com/ibm/wala/model/javax/servlet/ServletRequest.java @@ -17,26 +17,34 @@ import javax.servlet.ServletInputStream; import com.ibm.wala.model.SyntheticFactory; public class ServletRequest implements javax.servlet.ServletRequest { + private final java.util.Hashtable values = new java.util.Hashtable(); - private final java.util.Hashtable parameters = new java.util.Hashtable(); + + private java.util.Hashtable parameters; + private String encoding = "iso88591-1"; + // lazily initialize bogus model of parameters + private void initParameters() { + parameters = new java.util.Hashtable(); + parameters.put(getInputString(), getInputString()); + } + /** * The semantics of this are bogus ... be careful to hijack this. */ protected static String getInputString() { return "some input string"; } - + /** * The semantics of this are bogus ... be careful to hijack this. */ public ServletRequest() { - parameters.put(getInputString(), getInputString()); } public Object getAttribute(String name) { - if (name.length() > 5) { // random condition. + if (name.length() > 5) { // random condition. return values.get(name); } else { return SyntheticFactory.getObject(); @@ -68,7 +76,7 @@ public class ServletRequest implements javax.servlet.ServletRequest { int n = s.charAt(0); return n; } - + }; } @@ -80,9 +88,11 @@ public class ServletRequest implements javax.servlet.ServletRequest { public java.util.Enumeration getLocales() { return new java.util.Enumeration() { private boolean done = false; + public boolean hasMoreElements() { return !done; } + public Object nextElement() { done = true; return getLocale(); @@ -92,22 +102,25 @@ public class ServletRequest implements javax.servlet.ServletRequest { public String getParameter(String name) { // Note, while the following is technically a more accurate model... -// return parameters.get(name); + // return parameters.get(name); // I'm using the following simpler model for now to avoid some unnecessary analysis - // of flow through the heap. Revisit this decision if necessary. + // of flow through the heap. Revisit this decision if necessary. return getInputString(); } public java.util.Map getParameterMap() { + initParameters(); return parameters; } public java.util.Enumeration getParameterNames() { + initParameters(); return parameters.keys(); } public String[] getParameterValues(String name) { - return new String[] {parameters.get(name)}; + initParameters(); + return new String[] { parameters.get(name) }; } public java.lang.String getProtocol() { diff --git a/com.ibm.wala.j2ee/src/com/ibm/wala/model/javax/servlet/http/HttpServletRequest.java b/com.ibm.wala.j2ee/src/com/ibm/wala/model/javax/servlet/http/HttpServletRequest.java index 980b7834d..14005fb65 100644 --- a/com.ibm.wala.j2ee/src/com/ibm/wala/model/javax/servlet/http/HttpServletRequest.java +++ b/com.ibm.wala.j2ee/src/com/ibm/wala/model/javax/servlet/http/HttpServletRequest.java @@ -18,11 +18,16 @@ import com.ibm.wala.annotations.Internal; public class HttpServletRequest extends com.ibm.wala.model.javax.servlet.ServletRequest implements javax.servlet.http.HttpServletRequest { - private final java.util.Hashtable headers = new java.util.Hashtable(); + private java.util.Hashtable headers; + // lazily initialize bogus model of headers + private void initHeaders() { + headers = new java.util.Hashtable(); + headers.put(getInputString(), getInputString()); + } + public HttpServletRequest() { super(); - headers.put(getInputString(), getInputString()); } public String getAuthType() { @@ -45,14 +50,17 @@ public class HttpServletRequest } public String getHeader(String name) { + initHeaders(); return headers.get(name); } public java.util.Enumeration getHeaderNames() { + initHeaders(); return headers.keys(); } public java.util.Enumeration getHeaders(String name) { + initHeaders(); return headers.elements(); }