Author: kevinshen
Date: 2010-01-08 07:11:45 +0100 (Fri, 08 Jan 2010)
New Revision: 40411
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
Log:
CMSC-1539 CAS single sign-on implementation
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-07 18:52:39 UTC (rev 40410)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-08 06:11:45 UTC (rev 40411)
@@ -30,16 +30,17 @@
log.debug("Page: allowed to see");
return super.doRender(request, response, path);
}
- Cloud cloud = CloudUtil.getCloudFromThread();
- Node node = cloud.getNode(item.getId());
- UserRole role = NavigationUtil.getRole(cloud, node, false);
- if (SecurityUtil.isWriter(role)) {
- return super.doRender(request, response, path);
+ Cloud cloud = CloudUtil.getCloudFromThread();
+ if (cloud != null) {
+ Node node = cloud.getNode(item.getId());
+ UserRole role = NavigationUtil.getRole(cloud, node, false);
+ if (SecurityUtil.isWriter(role)) {
+ return super.doRender(request, response, path);
+ }
}
response.sendRedirect(getServletContext().getInitParameter("casServerLoginUrl")+"?service="+HttpUtil.getWebappUri(request)+path);
-
- log.warn("Page: not allowed to see, no login page found!");
- return false;
+ log.warn("Page: not allowed to see, no login page found!");
+ return false;
}
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
