You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2008/09/08 16:01:09 UTC
svn commit: r693103 - in
/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed:
om/page/impl/ om/page/psml/ page/ serializer/
Author: vkumar
Date: Mon Sep 8 07:01:06 2008
New Revision: 693103
URL: http://svn.apache.org/viewvc?rev=693103&view=rev
Log:
Fixing broken methods of page managers
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerSecurityUtils.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerUtils.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java?rev=693103&r1=693102&r2=693103&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java Mon Sep 8 07:01:06 2008
@@ -32,12 +32,12 @@
import org.apache.jetspeed.om.page.SecurityConstraintImpl;
import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
import org.apache.jetspeed.security.FolderPermission;
-import org.apache.jetspeed.security.GroupPrincipal;
+import org.apache.jetspeed.security.Group;
import org.apache.jetspeed.security.JSSubject;
import org.apache.jetspeed.security.PagePermission;
import org.apache.jetspeed.security.PortalResourcePermission;
-import org.apache.jetspeed.security.RolePrincipal;
-import org.apache.jetspeed.security.UserPrincipal;
+import org.apache.jetspeed.security.Role;
+import org.apache.jetspeed.security.User;
/**
* BaseElementImpl
@@ -367,7 +367,7 @@
while (principals.hasNext())
{
Principal principal = (Principal) principals.next();
- if (principal instanceof UserPrincipal)
+ if (principal instanceof User)
{
if (userPrincipals == null)
{
@@ -375,7 +375,7 @@
}
userPrincipals.add(principal.getName());
}
- else if (principal instanceof RolePrincipal)
+ else if (principal instanceof Role)
{
if (rolePrincipals == null)
{
@@ -383,7 +383,7 @@
}
rolePrincipals.add(principal.getName());
}
- else if (principal instanceof GroupPrincipal)
+ else if (principal instanceof Group)
{
if (groupPrincipals == null)
{
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java?rev=693103&r1=693102&r2=693103&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java Mon Sep 8 07:01:06 2008
@@ -40,12 +40,12 @@
import org.apache.jetspeed.page.document.NodeSet;
import org.apache.jetspeed.page.document.psml.NodeSetImpl;
import org.apache.jetspeed.security.FolderPermission;
-import org.apache.jetspeed.security.GroupPrincipal;
+import org.apache.jetspeed.security.Group;
import org.apache.jetspeed.security.JSSubject;
import org.apache.jetspeed.security.PagePermission;
import org.apache.jetspeed.security.PortalResourcePermission;
-import org.apache.jetspeed.security.RolePrincipal;
-import org.apache.jetspeed.security.UserPrincipal;
+import org.apache.jetspeed.security.Role;
+import org.apache.jetspeed.security.User;
/**
@@ -274,7 +274,7 @@
while (principals.hasNext())
{
Principal principal = (Principal) principals.next();
- if (principal instanceof UserPrincipal)
+ if (principal instanceof User)
{
if (userPrincipals == null)
{
@@ -282,7 +282,7 @@
}
userPrincipals.add(principal.getName());
}
- else if (principal instanceof RolePrincipal)
+ else if (principal instanceof Role)
{
if (rolePrincipals == null)
{
@@ -290,7 +290,7 @@
}
rolePrincipals.add(principal.getName());
}
- else if (principal instanceof GroupPrincipal)
+ else if (principal instanceof Group)
{
if (groupPrincipals == null)
{
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerSecurityUtils.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerSecurityUtils.java?rev=693103&r1=693102&r2=693103&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerSecurityUtils.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerSecurityUtils.java Mon Sep 8 07:01:06 2008
@@ -29,10 +29,10 @@
import org.apache.jetspeed.om.page.SecurityConstraintImpl;
import org.apache.jetspeed.om.page.SecurityConstraintsDef;
import org.apache.jetspeed.page.document.DocumentException;
-import org.apache.jetspeed.security.GroupPrincipal;
+import org.apache.jetspeed.security.Group;
import org.apache.jetspeed.security.JSSubject;
-import org.apache.jetspeed.security.RolePrincipal;
-import org.apache.jetspeed.security.UserPrincipal;
+import org.apache.jetspeed.security.Role;
+import org.apache.jetspeed.security.User;
/**
@@ -82,7 +82,7 @@
while (principals.hasNext())
{
Principal principal = (Principal) principals.next();
- if (principal instanceof UserPrincipal)
+ if (principal instanceof User)
{
if (userPrincipals == null)
{
@@ -90,7 +90,7 @@
}
userPrincipals.add(principal.getName());
}
- else if (principal instanceof RolePrincipal)
+ else if (principal instanceof Role)
{
if (rolePrincipals == null)
{
@@ -98,7 +98,7 @@
}
rolePrincipals.add(principal.getName());
}
- else if (principal instanceof GroupPrincipal)
+ else if (principal instanceof Group)
{
if (groupPrincipals == null)
{
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerUtils.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerUtils.java?rev=693103&r1=693102&r2=693103&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerUtils.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerUtils.java Mon Sep 8 07:01:06 2008
@@ -29,9 +29,9 @@
import org.apache.jetspeed.om.page.Link;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.document.NodeException;
-import org.apache.jetspeed.security.RolePrincipal;
+import org.apache.jetspeed.security.Role;
import org.apache.jetspeed.security.SecurityHelper;
-import org.apache.jetspeed.security.UserPrincipal;
+import org.apache.jetspeed.security.User;
/**
@@ -55,7 +55,7 @@
public static void createUserHomePagesFromRoles(PageManager pageManager, Subject subject)
throws NodeException
{
- Principal principal = SecurityHelper.getBestPrincipal(subject, UserPrincipal.class);
+ Principal principal = SecurityHelper.getBestPrincipal(subject, User.class);
if (principal == null)
{
String errorMessage = "Could not create user home for null principal";
@@ -82,10 +82,10 @@
// for each role for a user, deep copy the folder contents for that role
// into the user's home
// TODO: this algorithm could actually merge pages on dups
- Iterator roles = SecurityHelper.getPrincipals(subject, RolePrincipal.class).iterator();
+ Iterator roles = SecurityHelper.getPrincipals(subject, Role.class).iterator();
while (roles.hasNext())
{
- RolePrincipal role = (RolePrincipal)roles.next();
+ Role role = (Role)roles.next();
if (pageManager.folderExists(Folder.ROLE_FOLDER + role.getName()))
{
Folder roleFolder = pageManager.getFolder(Folder.ROLE_FOLDER + role.getName());
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java?rev=693103&r1=693102&r2=693103&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java Mon Sep 8 07:01:06 2008
@@ -19,6 +19,8 @@
import java.security.PrivilegedAction;
import java.util.Map;
+import javax.security.auth.Subject;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.administration.PortalConfigurationConstants;
@@ -30,15 +32,12 @@
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.page.PageManagerUtils;
import org.apache.jetspeed.page.document.NodeException;
-import org.apache.jetspeed.security.AttributeAlreadyExistsException;
import org.apache.jetspeed.security.AttributeTypeNotFoundException;
import org.apache.jetspeed.security.AttributesReadOnlyException;
import org.apache.jetspeed.security.JSSubject;
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
-import org.apache.jetspeed.security.SecurityAttribute;
-import org.apache.jetspeed.security.SecurityAttributes;
import org.apache.jetspeed.serializer.objects.JSSnapshot;
import org.apache.jetspeed.serializer.objects.JSUser;
@@ -142,8 +141,15 @@
final String innerSubsite = subsite;
final PageManager innerPageManager = pageManager;
final String innerUserName = userName;
-
- JetspeedException pe = (JetspeedException) JSSubject.doAsPrivileged(adminUser.getSubject(), new PrivilegedAction()
+ Subject adminSubject;
+ try{
+ adminSubject = userManager.getSubject(adminUser);
+ }
+ catch (SecurityException se) {
+ //TODO handle error in much better way
+ return;
+ }
+ JetspeedException pe = (JetspeedException) JSSubject.doAsPrivileged(adminSubject, new PrivilegedAction()
{
public Object run()
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org