morciuch 2002/12/22 13:22:59
Modified: src/java/org/apache/jetspeed/portal/security/portlets
PortletWrapper.java
Log:
Bug fix: all portlet access is now properly logged (see Bugzilla bug# 15595)
Revision Changes Path
1.16 +9 -10
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java
Index: PortletWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PortletWrapper.java 12 Dec 2002 03:17:50 -0000 1.15
+++ PortletWrapper.java 22 Dec 2002 21:22:59 -0000 1.16
@@ -140,18 +140,10 @@
if (checkPermission(rundata, JetspeedSecurity.PERMISSION_VIEW))
{
- if (PortletStats.isEnabled())
- {
- PortletStats.logAccess(rundata, this, PortletStats.ACCESS_OK);
- }
return wrappedPortlet.getContent(rundata);
}
else
{
- if (PortletStats.isEnabled())
- {
- PortletStats.logAccess(rundata, this, PortletStats.ACCESS_DENIED);
- }
return new JetspeedClearElement("Sorry, you have no permission to see
this portlet");
}
}
@@ -318,9 +310,16 @@
+ portalResource.getOwner());
}
- return JetspeedSecurity.checkPermission((JetspeedUser) rundata.getUser(),
+ boolean accessOk = JetspeedSecurity.checkPermission((JetspeedUser)
rundata.getUser(),
portalResource,
permissionName);
+
+ if (PortletStats.isEnabled() &&
permissionName.equals(JetspeedSecurity.PERMISSION_VIEW))
+ {
+ PortletStats.logAccess(rundata, this, accessOk ? PortletStats.ACCESS_OK
: PortletStats.ACCESS_DENIED);
+ }
+
+ return accessOk;
}
// utility methods
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
