Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix : enable to display published news images selected from existing upload for non members - EXO-65111 #878

Merged
merged 1 commit into from
Jul 7, 2023
Merged

fix : enable to display published news images selected from existing upload for non members - EXO-65111 #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 80 additions & 58 deletions services/src/main/java/org/exoplatform/news/storage/jcr/JcrNewsStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.time.OffsetTime;
import java.time.ZoneId;
Expand All @@ -12,12 +14,7 @@
import java.util.regex.Pattern;
import java.util.stream.Stream;

import javax.jcr.ItemNotFoundException;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.Value;
import javax.jcr.*;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;

Expand Down Expand Up @@ -73,74 +70,75 @@
import org.exoplatform.social.core.service.LinkProvider;
import org.exoplatform.social.core.space.model.Space;
import org.exoplatform.social.core.space.spi.SpaceService;
import org.exoplatform.social.rest.api.RestUtils;
import org.exoplatform.upload.UploadResource;
import org.exoplatform.upload.UploadService;

public class JcrNewsStorage implements NewsStorage {

private static final String HTML_AT_SYMBOL_PATTERN = "@";
private static final String HTML_AT_SYMBOL_PATTERN = "@";

private static final String HTML_AT_SYMBOL_ESCAPED_PATTERN = "@";

private static final String LAST_PUBLISHER = "publication:lastUser";

private static final Log LOG = ExoLogger.getLogger(JcrNewsStorage.class);

private static final String HTML_AT_SYMBOL_ESCAPED_PATTERN = "@";

private static final String LAST_PUBLISHER = "publication:lastUser";

private static final Log LOG = ExoLogger.getLogger(JcrNewsStorage.class);

private static final Pattern MENTION_PATTERN = Pattern.compile("@([^\\s<]+)|@([^\\s<]+)$");

private static final Pattern IMAGE_SRC_PATTERN = Pattern.compile("src=\"/portal/rest/images/?(.+)?\"");

public static final String MIX_NEWS_MODIFIERS = "mix:newsModifiers";
private static final String IMAGE_SRC_REGEX = "src=\"/portal/rest/images/?(.+)?\"";

public static final String MIX_NEWS_MODIFIERS_PROP = "exo:newsModifiersIds";
public static final String MIX_NEWS_MODIFIERS = "mix:newsModifiers";

public static final String NEWS_ACTIVITY_POSTING_MIXIN_TYPE = "mix:newsActivityPosting";
public static final String MIX_NEWS_MODIFIERS_PROP = "exo:newsModifiersIds";

public static final String NEWS_ACTIVITY_POSTED_MIXIN_PROP = "exo:newsActivityPosted";

public static final String NEWS_DRAFT_VISIBILE_MIXIN_PROP = "exo:draftVisible";

public static final String NEWS_DRAFT_VISIBILITY_MIXIN_TYPE = "mix:draftVisibility";

public static final String NEWS_NODES_FOLDER = "News";
public static final String NEWS_ACTIVITY_POSTING_MIXIN_TYPE = "mix:newsActivityPosting";

public static final String EXO_NEWS_LAST_MODIFIER = "exo:newsLastModifier";
public static final String NEWS_ACTIVITY_POSTED_MIXIN_PROP = "exo:newsActivityPosted";

public static final String NEWS_MODIFICATION_MIXIN = "mix:newsModification";
public static final String NEWS_DRAFT_VISIBILE_MIXIN_PROP = "exo:draftVisible";

public static final String EXO_PRIVILEGEABLE = "exo:privilegeable";
public static final String NEWS_DRAFT_VISIBILITY_MIXIN_TYPE = "mix:draftVisibility";

public static final String NEWS_AUDIENCE_PROP = "exo:audience";
public static final String NEWS_NODES_FOLDER = "News";

public static final String[] SHARE_NEWS_PERMISSIONS = new String[] { PermissionType.READ };

private ActivityManager activityManager;

private DataDistributionType dataDistributionType;

private IdentityManager identityManager;
public static final String EXO_NEWS_LAST_MODIFIER = "exo:newsLastModifier";

private LinkManager linkManager;
public static final String NEWS_MODIFICATION_MIXIN = "mix:newsModification";

private NewsAttachmentsStorage newsAttachmentsService;

private NodeHierarchyCreator nodeHierarchyCreator;

private PublicationManager publicationManager;

private PublicationService publicationService;

private RepositoryService repositoryService;

private SessionProviderService sessionProviderService;
public static final String EXO_PRIVILEGEABLE = "exo:privilegeable";

private SpaceService spaceService;
public static final String NEWS_AUDIENCE_PROP = "exo:audience";

private UploadService uploadService;

private WCMPublicationService wCMPublicationService;

private NewsSearchConnector newsSearchConnector;
public static final String[] SHARE_NEWS_PERMISSIONS = new String[] { PermissionType.READ };

private ActivityManager activityManager;

private DataDistributionType dataDistributionType;

private IdentityManager identityManager;

private LinkManager linkManager;

private NewsAttachmentsStorage newsAttachmentsService;

private NodeHierarchyCreator nodeHierarchyCreator;

private PublicationManager publicationManager;

private PublicationService publicationService;

private RepositoryService repositoryService;

private SessionProviderService sessionProviderService;

private SpaceService spaceService;

private UploadService uploadService;

private WCMPublicationService wCMPublicationService;

private NewsSearchConnector newsSearchConnector;

public JcrNewsStorage(RepositoryService repositoryService,
SessionProviderService sessionProviderService,
Expand Down Expand Up @@ -1209,12 +1207,18 @@ private Session getSession(SessionProvider sessionProvider) throws RepositoryExc
repositoryService.getCurrentRepository());
}

private void updateNewsImagesPermissions(News news, SessionProvider sessionProvider, Space space) throws RepositoryException {
Matcher matcher = IMAGE_SRC_PATTERN.matcher(news.getBody());
private void updateNewsImagesPermissions(News news, SessionProvider sessionProvider, Space space, String imageSrcRegex) throws RepositoryException {
Matcher matcher = Pattern.compile(imageSrcRegex).matcher(news.getBody());
while (matcher.find()) {
String match = matcher.group(1);
String imageUUID = match.substring(match.lastIndexOf("/") + 1);
ExtendedNode image = (ExtendedNode) getNodeById(imageUUID, sessionProvider);
ExtendedNode image = null;
if (imageSrcRegex.equals(IMAGE_SRC_REGEX)) {
String imageUUID = match.substring(match.lastIndexOf("/") + 1);
image = (ExtendedNode) getNodeById(imageUUID, sessionProvider);
} else {
String imagePath = match.substring(match.indexOf("/Groups"));
image = (ExtendedNode) getNodeByPath(imagePath,sessionProvider);
}
if (image != null) {
if (image.canAddMixin(EXO_PRIVILEGEABLE)) {
image.addMixin(EXO_PRIVILEGEABLE);
Expand All @@ -1231,4 +1235,22 @@ private void updateNewsImagesPermissions(News news, SessionProvider sessionProvi
}
}
}
private void updateNewsImagesPermissions(News news, SessionProvider sessionProvider, Space space) throws RepositoryException {
Matcher matcher = Pattern.compile(IMAGE_SRC_REGEX).matcher(news.getBody());
if (matcher.find()) {
updateNewsImagesPermissions(news, sessionProvider,space, IMAGE_SRC_REGEX);
} else {
String existingUploadImagesSrcRegex = "src=\"" + CommonsUtils.getCurrentDomain() + "/" + PortalContainer.getCurrentPortalContainerName() + "/" + CommonsUtils.getRestContextName() + "/jcr/?(.+)?\"";
updateNewsImagesPermissions(news, sessionProvider,space, existingUploadImagesSrcRegex);
}
}

public Node getNodeByPath(String path, SessionProvider sessionProvider) {
try {
Session session = getSession(sessionProvider);
return (Node) session.getItem(URLDecoder.decode(path, StandardCharsets.UTF_8));
} catch (RepositoryException exception) {
return null;
}
}
}
22 changes: 21 additions & 1 deletion services/src/test/java/org/exoplatform/news/storage/jcr/JcrNewsStorageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

@RunWith(PowerMockRunner.class)
@PowerMockIgnore({"com.sun.*", "org.w3c.*", "javax.naming.*", "javax.xml.*", "org.xml.*", "javax.management.*"})
@PrepareForTest(CommonsUtils.class)
@PrepareForTest({CommonsUtils.class, PortalContainer.class})
public class JcrNewsStorageTest {

@Mock
Expand Down Expand Up @@ -1144,6 +1144,26 @@ public void shouldPublishNews() throws Exception {
jcrNewsStorageSpy.publishNews(news);
verify(newsImageNode, times(1)).setPermission("*:/platform/users", JcrNewsStorage.SHARE_NEWS_PERMISSIONS);
verify(newsImageNode, times(1)).save();

//
ExtendedNode existingUploadedNewsImageNode = mock(ExtendedNode.class);
String nodePath = "Groups/spaces/test/testimage";
String currentDomainName = "https://exoplatform.com";
String currentPortalContainerName = "portal";
String restContextName = "rest";
PowerMockito.mockStatic(CommonsUtils.class);
PowerMockito.mockStatic(PortalContainer.class);
when(CommonsUtils.getRestContextName()).thenReturn(restContextName);
when(PortalContainer.getCurrentPortalContainerName()).thenReturn(currentPortalContainerName);
when(CommonsUtils.getCurrentDomain()).thenReturn(currentDomainName);
news.setBody("news body with image src=\"https://exoplatform.com/portal/rest/jcr/repository/collaboration/Groups/spaces/test/testimage\"");
when(session.getItem(nullable(String.class))).thenReturn(existingUploadedNewsImageNode);
when(jcrNewsStorageSpy.getNodeByPath(nodePath, sessionProvider)).thenReturn(existingUploadedNewsImageNode);
when(existingUploadedNewsImageNode.canAddMixin(EXO_PRIVILEGEABLE)).thenReturn(true);
// When
jcrNewsStorageSpy.publishNews(news);
verify(existingUploadedNewsImageNode, times(1)).setPermission("*:/platform/users", JcrNewsStorage.SHARE_NEWS_PERMISSIONS);
verify(existingUploadedNewsImageNode, times(1)).save();
}

@Test
Expand Down