antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Added code to find out if a property is defined in the

Browse source 
type.properties file before returning its value as a macro.

Return an error message if the property is not defined, or if
the macro tried to access a private property (which currently
applies only to user passwords).
This commit is contained in:
hns 2001-11-27 14:15:18 +00:00
parent 0dd58e56b0
commit aec53f4425
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/helma/framework/core/RequestEvaluator.java
View file

@ -1032,14 +1032,20 @@ public class RequestEvaluator implements Runnable {
* is a java object) with that name. * is a java object) with that name.
*/ */
public Object getProperty (Object obj, String propname) { public Object getProperty (Object obj, String propname) {
if (obj == null) if (obj == null || propname == null)
return null; return null;
String prototypeName = app.getPrototypeName (obj); String prototypeName = app.getPrototypeName (obj);
if ("user".equalsIgnoreCase (prototypeName) && if ("user".equalsIgnoreCase (prototypeName) &&
"password".equalsIgnoreCase (propname)) "password".equalsIgnoreCase (propname))
return null; return "[macro access to password property not allowed]";
DbMapping dbm = app.getDbMapping (prototypeName);
if (dbm != null) {
Relation rel = dbm.propertyToRelation (propname);
if (rel == null || !rel.isPrimitive ())
return "[property \""+propname+"\" is not defined for "+prototypeName+"]";
}
ESObject eso = getElementWrapper (obj); ESObject eso = getElementWrapper (obj);
try { try {
ESValue prop = eso.getProperty (propname, propname.hashCode()); ESValue prop = eso.getProperty (propname, propname.hashCode());