Fix workspace display for user anonymous.

git-svn-id: https://svn.argeo.org/slc/trunk@6155 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/GroupElem.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/GroupElem.java
index 512f1b5f96057764afe1d4253f8823e7fc40deb3..8e9cef36d70b868961c63647cd6e4f0daa08fc14 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/GroupElem.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/GroupElem.java
@@ -1,5 +1,6 @@
 package org.argeo.slc.client.ui.dist.model;
 
+import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,13 +29,34 @@ public class GroupElem extends DistParentElem {
                Session session = null;
                try {
                        Repository repository = repoElem.getRepository();
-                       // Node repoNode = repoElem.getRepoNode();
                        session = repository.login(repoElem.getCredentials());
 
                        String[] workspaceNames = session.getWorkspace()
                                        .getAccessibleWorkspaceNames();
                        List<WorkspaceElem> distributionElems = new ArrayList<WorkspaceElem>();
-                       for (String workspaceName : workspaceNames) {
+                       buildWksp: for (String workspaceName : workspaceNames) {
+
+                               // Filter non-public workspaces for user anonymous.
+                               if (repoElem.getRepoNode() == null) {
+                                       Session tmpSession = null;
+                                       try {
+                                               tmpSession = repository.login(workspaceName);
+                                               Boolean res = true;
+                                               try {
+                                                       tmpSession.checkPermission("/", "read");
+                                               } catch (AccessControlException e) {
+                                                       res = false;
+                                               }
+                                               if (!res)
+                                                       continue buildWksp;
+                                       } catch (RepositoryException e) {
+                                               throw new SlcException(
+                                                               "Cannot list workspaces for anonymous user", e);
+                                       } finally {
+                                               JcrUtils.logoutQuietly(tmpSession);
+                                       }
+                               }
+
                                // filter technical workspaces
                                if (workspaceName.startsWith(name)) {
                                        distributionElems.add(new WorkspaceElem(repoElem,

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/RepoElem.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/RepoElem.java
index 8e48d231f26bc65fb582eb31a8ae6b7192cad07e..6d07d1c672725063c1a49aae3ea313576b8d3d0a 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/RepoElem.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/RepoElem.java
@@ -1,5 +1,6 @@
 package org.argeo.slc.client.ui.dist.model;
 
+import java.security.AccessControlException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -25,7 +26,7 @@ import org.argeo.util.security.Keyring;
  * Node or just an URI and a label if user is anonymous
  */
 public class RepoElem extends DistParentElem {
-
+       // private final static Log log = LogFactory.getLog(RepoElem.class);
        private Repository repository;
        private Credentials credentials;
        private RepositoryFactory repositoryFactory;
@@ -112,27 +113,25 @@ public class RepoElem extends DistParentElem {
                                // Add a supplementary check to hide workspace that are not
                                // public to anonymous user
 
-                               // TODO fix this
-                               // if (repoNode == null) {
-                               // Session tmpSession = null;
-                               // try {
-                               // tmpSession = repository.login();
-                               // Privilege[] priv = new Privilege[1];
-                               // priv[0] = tmpSession.getAccessControlManager()
-                               // .privilegeFromName(Privilege.JCR_READ);
-                               // Privilege[] tmp = tmpSession.getAccessControlManager()
-                               // .getPrivileges("/");
-                               // boolean res = tmpSession.getAccessControlManager()
-                               // .hasPrivileges("/", priv);
-                               // if (!res)
-                               // continue buildWksp;
-                               // } catch (RepositoryException e) {
-                               // throw new SlcException(
-                               // "Cannot list workspaces for anonymous user", e);
-                               // } finally {
-                               // JcrUtils.logoutQuietly(tmpSession);
-                               // }
-                               // }
+                               if (repoNode == null) {
+                                       Session tmpSession = null;
+                                       try {
+                                               tmpSession = repository.login(workspaceName);
+                                               Boolean res = true;
+                                               try {
+                                                       tmpSession.checkPermission("/", "read");
+                                               } catch (AccessControlException e) {
+                                                       res = false;
+                                               }
+                                               if (!res)
+                                                       continue buildWksp;
+                                       } catch (RepositoryException e) {
+                                               throw new SlcException(
+                                                               "Cannot list workspaces for anonymous user", e);
+                                       } finally {
+                                               JcrUtils.logoutQuietly(tmpSession);
+                                       }
+                               }
 
                                // filter technical workspaces
                                // FIXME: rely on a more robust rule than just wksp name