Merge Space Public Site - Meeds-io/MIPs#151

layout-service/src/main/java/io/meeds/layout/plugin/attachment/PortletInstanceAttachmentPlugin.java

@@ -77,7 +77,7 @@ public boolean hasAccessPermission(Identity userIdentity, String entityId) throw
     List<String> permissions = portletInstance.getPermissions();
     return CollectionUtils.isEmpty(permissions)
            || (userIdentity != null
-               && permissions.stream().anyMatch(p -> layoutAclService.isMemberOf(userIdentity.getUserId(), p)));
+               && permissions.stream().anyMatch(p -> layoutAclService.hasPermission(userIdentity.getUserId(), p)));
   }
 
   @Override

layout-service/src/main/java/io/meeds/layout/plugin/translation/PortletInstanceCategoryTranslationPlugin.java

@@ -76,7 +76,7 @@ public boolean hasAccessPermission(long id, String username) throws ObjectNotFou
     }
     List<String> permissions = category.getPermissions();
     return CollectionUtils.isEmpty(permissions)
-           || permissions.stream().anyMatch(p -> layoutAclService.isMemberOf(username, p));
+           || permissions.stream().anyMatch(p -> layoutAclService.hasPermission(username, p));
   }
 
   @Override

layout-service/src/main/java/io/meeds/layout/plugin/translation/PortletInstanceTranslationPlugin.java

@@ -78,7 +78,7 @@ public boolean hasAccessPermission(long id, String username) throws ObjectNotFou
     }
     List<String> permissions = portletInstance.getPermissions();
     return CollectionUtils.isEmpty(permissions)
-           || permissions.stream().anyMatch(p -> layoutAclService.isMemberOf(username, p));
+           || permissions.stream().anyMatch(p -> layoutAclService.hasPermission(username, p));
   }
 
   @Override

layout-service/src/main/java/io/meeds/layout/rest/model/LayoutModel.java

@@ -165,10 +165,6 @@ public class LayoutModel {
   // Specific to container
   private String                          profiles;
 
-  private String[]                        moveAppsPermissions;
-
-  private String[]                        moveContainersPermissions;
-
   private List<PortletInstancePreference> preferences;
 
   private List<LayoutModel>               children;
@@ -260,8 +256,6 @@ private void init(ModelObject model) { // NOSONAR
       this.cssClass = container.getCssClass();
       this.profiles = container.getProfiles();
       this.accessPermissions = container.getAccessPermissions();
-      this.moveAppsPermissions = container.getMoveAppsPermissions();
-      this.moveContainersPermissions = container.getMoveContainersPermissions();
       this.children = container.getChildren().stream().map(LayoutModel::new).toList();
 
       ApplicationBackgroundStyle appCssStyle = container.getAppBackgroundStyle();
@@ -344,8 +338,6 @@ public static ModelObject toModelObject(LayoutModel layoutModel) { // NOSONAR
       container.setCssClass(layoutModel.getCssClass());
       container.setProfiles(layoutModel.getProfiles());
       container.setAccessPermissions(layoutModel.getAccessPermissions());
-      container.setMoveAppsPermissions(layoutModel.getMoveAppsPermissions());
-      container.setMoveContainersPermissions(layoutModel.getMoveContainersPermissions());
       container.setCssStyle(cssStyle);
       container.setAppBackgroundStyle(mapToAppStyle(layoutModel));
       if (layoutModel.getChildren() != null) {

layout-service/src/main/java/io/meeds/layout/service/LayoutAclService.java

@@ -18,201 +18,94 @@
  */
 package io.meeds.layout.service;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.portal.config.UserACL;
 import org.exoplatform.portal.config.model.Page;
 import org.exoplatform.portal.config.model.PortalConfig;
 import org.exoplatform.portal.mop.SiteKey;
 import org.exoplatform.portal.mop.page.PageKey;
 import org.exoplatform.portal.mop.service.LayoutService;
-import org.exoplatform.services.security.Authenticator;
 import org.exoplatform.services.security.ConversationState;
-import org.exoplatform.services.security.Identity;
-import org.exoplatform.services.security.IdentityConstants;
-import org.exoplatform.services.security.IdentityRegistry;
+import org.exoplatform.social.core.identity.model.Identity;
 import org.exoplatform.social.core.manager.IdentityManager;
 
-import jakarta.annotation.PostConstruct;
-import lombok.Setter;
-import lombok.SneakyThrows;
-
 @Service
 public class LayoutAclService {
 
   @Autowired
-  private UserACL          userAcl;
-
-  @Autowired
-  private LayoutService    layoutService;
+  private LayoutService   layoutService;
 
   @Autowired
-  private Authenticator    authenticator;
+  private IdentityManager identityManager;
 
   @Autowired
-  private IdentityManager  identityManager;
-
-  @Setter
-  private IdentityRegistry identityRegistry;
-
-  @PostConstruct
-  public void init() {
-    // Can't be autowired from Kernel IoC, thus inject it once Spring Bean
-    // initialized
-    setIdentityRegistry(ExoContainerContext.getService(IdentityRegistry.class));
-  }
+  private UserACL         userAcl;
 
   public boolean canAddSite(String username) {
-    ConversationState currentConversationState = ConversationState.getCurrent();
-    ConversationState.setCurrent(getConversationState(username));
-    try {
-      return userAcl.hasCreatePortalPermission();
-    } finally {
-      ConversationState.setCurrent(currentConversationState);
-    }
+    return userAcl.hasCreatePortalPermission(userAcl.getUserIdentity(username));
   }
 
   public boolean canEditSite(SiteKey siteKey, String username) {
     PortalConfig portalConfig = layoutService.getPortalConfig(siteKey);
     if (portalConfig == null) {
       return false;
     }
-    ConversationState currentConversationState = ConversationState.getCurrent();
-    ConversationState.setCurrent(getConversationState(username));
-    try {
-      return userAcl.hasEditPermission(portalConfig);
-    } finally {
-      ConversationState.setCurrent(currentConversationState);
-    }
+    return userAcl.hasEditPermission(portalConfig, userAcl.getUserIdentity(username));
   }
 
   public boolean canViewSite(SiteKey siteKey, String username) {
     PortalConfig portalConfig = layoutService.getPortalConfig(siteKey);
     if (portalConfig == null) {
       return false;
     }
-    ConversationState currentConversationState = ConversationState.getCurrent();
-    ConversationState.setCurrent(getConversationState(username));
-    try {
-      return userAcl.hasPermission(portalConfig);
-    } finally {
-      ConversationState.setCurrent(currentConversationState);
-    }
+    return userAcl.hasAccessPermission(portalConfig, userAcl.getUserIdentity(username));
   }
 
   public boolean canEditNavigation(SiteKey siteKey, String username) {
-    PortalConfig portalConfig = layoutService.getPortalConfig(siteKey);
-    if (portalConfig == null) {
-      return false;
-    }
-
-    ConversationState currentConversationState = ConversationState.getCurrent();
-    ConversationState.setCurrent(getConversationState(username));
-    try {
-      return userAcl.hasEditPermission(portalConfig) || userAcl.hasEditPermissionOnNavigation(siteKey);
-    } finally {
-      ConversationState.setCurrent(currentConversationState);
-    }
+    return canEditSite(siteKey, username);
   }
 
   public boolean canViewNavigation(SiteKey siteKey, PageKey pageKey, String username) {
-    PortalConfig portalConfig = layoutService.getPortalConfig(siteKey);
-    if (portalConfig == null) {
-      return false;
-    }
-    Page page = pageKey == null ? null : layoutService.getPage(pageKey);
-    ConversationState currentConversationState = ConversationState.getCurrent();
-    ConversationState.setCurrent(getConversationState(username));
-    try {
-      return userAcl.hasAccessPermission(portalConfig) && (page == null || userAcl.hasPermission(page));
-    } finally {
-      ConversationState.setCurrent(currentConversationState);
-    }
+    return canViewSite(siteKey, username) && (pageKey == null || canViewPage(pageKey, username));
   }
 
   public boolean canViewPage(PageKey pageKey, String username) {
     Page page = layoutService.getPage(pageKey);
     if (page == null) {
       return false;
     }
-
-    ConversationState currentConversationState = ConversationState.getCurrent();
-    ConversationState.setCurrent(getConversationState(username));
-    try {
-      return userAcl.hasPermission(page);
-    } finally {
-      ConversationState.setCurrent(currentConversationState);
-    }
+    return userAcl.hasAccessPermission(page, userAcl.getUserIdentity(username));
   }
 
   public boolean canEditPage(PageKey pageKey, String username) {
     Page page = layoutService.getPage(pageKey);
     if (page == null) {
       return false;
     }
-
-    ConversationState currentConversationState = ConversationState.getCurrent();
-    ConversationState.setCurrent(getConversationState(username));
-    try {
-      return userAcl.hasEditPermission(page);
-    } finally {
-      ConversationState.setCurrent(currentConversationState);
-    }
+    return userAcl.hasEditPermission(page, userAcl.getUserIdentity(username));
   }
 
   public boolean isAdministrator(String username) {
-    ConversationState currentConversationState = ConversationState.getCurrent();
-    ConversationState.setCurrent(getConversationState(username));
-    try {
-      return userAcl.isSuperUser() || userAcl.isUserInGroup(getAdministratorsGroup());
-    } finally {
-      ConversationState.setCurrent(currentConversationState);
-    }
+    return userAcl.isAdministrator(userAcl.getUserIdentity(username));
   }
 
-  public boolean isMemberOf(String username, String expression) {
-    ConversationState currentConversationState = ConversationState.getCurrent();
-    ConversationState.setCurrent(getConversationState(username));
-    try {
-      return userAcl.hasPermission(expression);
-    } finally {
-      ConversationState.setCurrent(currentConversationState);
-    }
+  public boolean hasPermission(String username, String expression) {
+    return userAcl.hasPermission(userAcl.getUserIdentity(username), expression);
   }
 
   public String getAdministratorsGroup() {
     return userAcl.getAdminGroups();
   }
 
   public ConversationState getSuperUserConversationState() {
-    return new ConversationState(getUserIdentity(userAcl.getSuperUser()));
+    return new ConversationState(userAcl.getUserIdentity(userAcl.getSuperUser()));
   }
 
   public long getSuperUserIdentityId() {
-    org.exoplatform.social.core.identity.model.Identity userIdentity =
-                                                                     identityManager.getOrCreateUserIdentity(userAcl.getSuperUser());
-    String id = userIdentity == null ? null : userIdentity.getId();
-    return id == null ? 0 : Long.parseLong(id);
-  }
-
-  private ConversationState getConversationState(String username) {
-    return new ConversationState(getUserIdentity(username));
-  }
-
-  @SneakyThrows
-  private Identity getUserIdentity(String username) {
-    if (StringUtils.isBlank(username) || IdentityConstants.ANONIM.equals(username)) {
-      return null;
-    }
-    Identity identity = identityRegistry.getIdentity(username);
-    if (identity != null) {
-      return identity;
-    } else {
-      return authenticator.createIdentity(username);
-    }
+    Identity userIdentity = identityManager.getOrCreateUserIdentity(userAcl.getSuperUser());
+    return userIdentity == null ? 0l : Long.parseLong(userIdentity.getId());
   }
 
 }

layout-service/src/main/java/io/meeds/layout/service/PageLayoutService.java

@@ -296,8 +296,6 @@ public void updatePageLink(PageKey pageKey,
                                        pageState.getFactoryId(),
                                        pageState.getAccessPermissions(),
                                        pageState.getEditPermission(),
-                                       pageState.getMoveAppsPermissions(),
-                                       pageState.getMoveContainersPermissions(),
                                        pageState.getType(),
                                        link));
     layoutService.save(pageContext);
@@ -323,8 +321,6 @@ public void updatePagePermissions(PageKey pageKey,
                                        pageState.getFactoryId(),
                                        accessPermissionsList,
                                        editPermission,
-                                       pageState.getMoveAppsPermissions(),
-                                       pageState.getMoveContainersPermissions(),
                                        pageState.getType(),
                                        pageState.getLink()));
     layoutService.save(pageContext);

layout-service/src/main/java/io/meeds/layout/service/PortletInstanceService.java

@@ -329,7 +329,7 @@ public List<PortletInstancePreference> getApplicationPreferences(long applicatio
     }
     if (!layoutAclService.isAdministrator(username)
         && Arrays.stream(application.getAccessPermissions())
-                 .noneMatch(permission -> layoutAclService.isMemberOf(username, permission))) {
+                 .noneMatch(permission -> layoutAclService.hasPermission(username, permission))) {
       throw new IllegalAccessException(String.format("Application with id %s access denied", applicationId));
     }
     return getApplicationPreferences(application);
@@ -453,13 +453,13 @@ private boolean hasPermission(PortletInstance portletInstance, String username)
     List<String> permissions = portletInstance.getPermissions();
     return CollectionUtils.isEmpty(permissions)
            || permissions.equals(EVERYONE_PERMISSIONS_LIST)
-           || (StringUtils.isNotBlank(username) && permissions.stream().anyMatch(p -> layoutAclService.isMemberOf(username, p)));
+           || (StringUtils.isNotBlank(username) && permissions.stream().anyMatch(p -> layoutAclService.hasPermission(username, p)));
   }
 
   private boolean hasPermission(PortletInstanceCategory category, String username) {
     List<String> permissions = category.getPermissions();
     return CollectionUtils.isEmpty(permissions)
            || permissions.equals(EVERYONE_PERMISSIONS_LIST)
-           || (StringUtils.isNotBlank(username) && permissions.stream().anyMatch(p -> layoutAclService.isMemberOf(username, p)));
+           || (StringUtils.isNotBlank(username) && permissions.stream().anyMatch(p -> layoutAclService.hasPermission(username, p)));
   }
 }

layout-service/src/main/java/io/meeds/layout/service/injection/PortletInstanceImportService.java

@@ -114,7 +114,7 @@ public class PortletInstanceImportService {
   @Value("${meeds.portlets.import.override:false}")
   private boolean                        forceReimport;
 
-  @Value("${meeds.portlets.import.version:2}")
+  @Value("${meeds.portlets.import.version:4}")
   private long                           portletInstanceImportVersion;
 
   @PostConstruct
@@ -124,11 +124,10 @@ public void init() {
 
   @ContainerTransactional
   public void importPortletInstances() {
-    LOG.info("Importing Portlet instances");
-    if (!forceReimport
-        && getSettingValue(PORTLET_INSTANCE_VERSION) != portletInstanceImportVersion) {
+    if (!forceReimport && getSettingValue(PORTLET_INSTANCE_VERSION) != portletInstanceImportVersion) {
       forceReimport = true;
     }
+    LOG.info("Importing Portlet instances with version {}, force reimport = {}", portletInstanceImportVersion, forceReimport);
 
     ConversationState.setCurrent(layoutAclService.getSuperUserConversationState());
     try {

layout-service/src/main/java/io/meeds/layout/storage/PortletInstanceLayoutStorage.java

@@ -207,9 +207,7 @@ private Page getPortletInstanceSystemPage() {
                                           false,
                                           null,
                                           Arrays.asList(UserACL.EVERYONE),
-                                          page.getEditPermission(),
-                                          Arrays.asList(UserACL.EVERYONE),
-                                          Arrays.asList(UserACL.EVERYONE));
+                                          page.getEditPermission());
       layoutService.save(new PageContext(PORTLET_EDITOR_SYSTEM_PAGE_KEY, pageState), page);
       page = layoutService.getPage(PORTLET_EDITOR_SYSTEM_PAGE_KEY);
     }