Compare commits

..

19 Commits

Author SHA1 Message Date
alfresco-build
eca25addff [maven-release-plugin][skip ci] prepare release 23.7.0.6 2025-11-05 10:17:14 +00:00
Gerard Olenski
0ea417ed37 ACS-10528 Bump jakarta mail to 2.0.2 (#3635) (#3637) 2025-11-05 09:57:43 +01:00
alfresco-build
fb811cdb2d [maven-release-plugin][skip ci] prepare for next development iteration 2025-11-04 12:04:33 +00:00
alfresco-build
9c0ac89015 [maven-release-plugin][skip ci] prepare release 23.7.0.5 2025-11-04 12:04:31 +00:00
Damian Ujma
1028b5c44b ACS-10456 Backport camel and netty version bump to 23.N (#3634) 2025-11-04 11:42:53 +01:00
alfresco-build
39d209a6a1 [maven-release-plugin][skip ci] prepare for next development iteration 2025-10-31 11:42:38 +00:00
alfresco-build
d9adbd60e1 [maven-release-plugin][skip ci] prepare release 23.7.0.4 2025-10-31 11:42:36 +00:00
Somnath-Deshmukh
cb07b26653 MNT-25422 Backporting to 23.N (#3628)
Bulleted list, numbered list, and underline are not working properly when adding comment in the file. Backporting to 23.N
2025-10-31 15:50:32 +05:30
SanjoyHyland2025
327129f021 Merge pull request #3618 from Alfresco/fix/MNT-25186_23.N
MNT-25186: fixed the tags and category filters for elasticsearch
2025-10-24 16:46:06 +05:30
alfresco-build
afbaf11ff9 [maven-release-plugin][skip ci] prepare for next development iteration 2025-10-22 09:56:07 +00:00
alfresco-build
e779057f23 [maven-release-plugin][skip ci] prepare release 23.7.0.3 2025-10-22 09:56:05 +00:00
Debjit Chattopadhyay
49ee9f8f29 Revert "MNT-24776 adding if-else conditionals to avoid null values"
Revert "MNT-24776 adding if-else conditionals to avoid null values"
2025-10-22 14:33:52 +05:30
Debjit Chattopadhyay
213886cedd Revert "MNT-24776 adding if-else conditionals to avoid null values"
This reverts commit 353d50a35c.
2025-10-22 13:13:42 +05:30
Sanjoy Das
1be9a43bcd MNT-25186: fixed the tags and category filters for elasticsearch 2025-10-22 12:17:37 +05:30
alfresco-build
eceb7c0eb3 [maven-release-plugin][skip ci] prepare for next development iteration 2025-10-21 11:39:39 +00:00
alfresco-build
8cd46d4585 [maven-release-plugin][skip ci] prepare release 23.7.0.2 2025-10-21 11:39:37 +00:00
Debjit Chattopadhyay
11d71e1941 (MNT-24776) Category Picker Error when a User does not have Read Permissions to a Category
(MNT-24776) Category Picker Error when a User does not have Read Permissions to a Category
2025-10-21 15:30:44 +05:30
Debjit Chattopadhyay
353d50a35c MNT-24776 adding if-else conditionals to avoid null values
(cherry picked from commit be02be5a8b)
2025-10-21 12:12:06 +05:30
alfresco-build
2daafc711d [maven-release-plugin][skip ci] prepare for next development iteration 2025-10-19 04:45:23 +00:00
28 changed files with 94 additions and 45 deletions

View File

@@ -107,7 +107,7 @@ jobs:
bash ./scripts/ci/init.sh
bash ./scripts/ci/build.sh
- name: "Run SAST Scan"
uses: veracode/Veracode-pipeline-scan-action@v1.0.16
uses: veracode/Veracode-pipeline-scan-action@v1.0.20
with:
vid: ${{ secrets.VERACODE_API_ID }}
vkey: ${{ secrets.VERACODE_API_KEY }}

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-amps</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<modules>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-parent</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<modules>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-automation-community-repo</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<build>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-parent</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<modules>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<build>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<modules>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-amps</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<properties>

View File

@@ -134,6 +134,25 @@ function doclist_main()
logger.log("doclist.lib.js - NodeRef: " + parsedArgs.nodeRef + " Query: " + query);
favourites = sanitizeJunkFavouriteKeys(favourites);
if(query === null)
{
return {
luceneQuery: "",
paging: {
totalRecords: 0,
startIndex: 0
},
container: parsedArgs.rootNode,
parent: null,
onlineEditing: utils.moduleInstalled("org.alfresco.module.vti"),
itemCount: {
folders: 0,
documents: 0
},
items: [],
customJSON: slingshotDocLib.getJSON()
};
}
if(Object.keys(favourites).length === 0 && query === null)
{

View File

@@ -240,7 +240,7 @@ var Filters =
filterData = filterData.slice(0, -1);
}
filterQuery = this.constructPathQuery(parsedArgs);
filterParams.query = filterQuery + " +PATH:\"/cm:taggable/cm:" + search.ISO9075Encode(filterData) + "/member\"";
filterParams.query = filterQuery + " +TAG:\"" + search.ISO9075Encode(filterData) + "\"";
break;
case "category":
@@ -249,8 +249,15 @@ var Filters =
{
filterData = filterData.slice(0, -1);
}
filterQuery = this.constructPathQuery(parsedArgs);
filterParams.query = filterQuery + " +PATH:\"/cm:categoryRoot/cm:generalclassifiable" + Filters.iso9075EncodePath(filterData) + "/member\"";
var categoryNodeRef = this.getCategoryNodeRef(filterData);
if (categoryNodeRef && search.findNode(categoryNodeRef) != null) {
filterParams.query = filterQuery + ' +@cm\\:categories:"' + categoryNodeRef + '"';
} else {
logger.warn("category filter: skipping invalid category node : " + categoryNodeRef);
}
filterParams.language = "fts-alfresco";
break;
case "aspect":
@@ -271,11 +278,24 @@ var Filters =
{
filterParams.query += " " + (Filters.TYPE_MAP[parsedArgs.type] || "");
}
logger.warn("Final Query : " + filterParams.query);
return filterParams;
},
constructPathQuery: function constructPathQuery(parsedArgs)
getCategoryNodeRef: function(categoryName) {
var results = search.luceneSearch(
'PATH:"/cm:categoryRoot/cm:generalclassifiable//*" AND @cm\\:name:"' + categoryName + '"'
);
if (results && results.length > 0) {
return results[0].nodeRef.toString();
}
logger.warn("Category not found: " + categoryName);
return null;
},
constructPathQuery: function(parsedArgs)
{
var pathQuery = "";
if (parsedArgs.libraryRoot != companyhome || parsedArgs.nodeRef != "alfresco://company/home")

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<dependencies>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<dependencies>

View File

@@ -9,6 +9,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
</project>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<modules>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<modules>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<organization>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<developers>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<properties>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<developers>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<properties>

10
pom.xml
View File

@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-community-repo</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
<packaging>pom</packaging>
<name>Alfresco Community Repo Parent</name>
@@ -85,8 +85,8 @@
<dependency.truezip.version>7.7.10</dependency.truezip.version>
<dependency.poi.version>5.4.1</dependency.poi.version>
<dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version>
<dependency.camel.version>4.10.2</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
<dependency.netty.version>4.1.118.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
<dependency.camel.version>4.15.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
<dependency.netty.version>4.1.127.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
<dependency.activemq.version>5.18.3</dependency.activemq.version>
<dependency.apache-compress.version>1.27.1</dependency.apache-compress.version>
<dependency.awaitility.version>4.2.2</dependency.awaitility.version>
@@ -104,7 +104,7 @@
<dependency.jakarta-annotation-api.version>3.0.0</dependency.jakarta-annotation-api.version>
<dependency.jakarta-transaction-api.version>2.0.1</dependency.jakarta-transaction-api.version>
<dependency.jakarta-jws-api.version>3.0.0</dependency.jakarta-jws-api.version>
<dependency.jakarta-ee-mail.version>2.0.1</dependency.jakarta-ee-mail.version>
<dependency.jakarta-ee-mail.version>2.0.2</dependency.jakarta-ee-mail.version>
<dependency.jakarta-ee-activation.version>2.0.1</dependency.jakarta-ee-activation.version>
<dependency.jakarta-ee-jms.version>3.1.0</dependency.jakarta-ee-jms.version>
<dependency.java-ee-activation.version>1.2.0</dependency.java-ee-activation.version>
@@ -154,7 +154,7 @@
<connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
<url>https://github.com/Alfresco/alfresco-community-repo</url>
<tag>23.7.0.1</tag>
<tag>23.7.0.6</tag>
</scm>
<distributionManagement>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<dependencies>

View File

@@ -33,8 +33,8 @@ import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.json.simple.JSONObject;
import org.owasp.html.HtmlPolicyBuilder;
import org.owasp.html.PolicyFactory;
import org.owasp.html.Sanitizers;
import org.springframework.extensions.webscripts.Cache;
import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptRequest;
@@ -78,7 +78,17 @@ public class CommentsPost extends AbstractCommentsWebScript
}
else
{
PolicyFactory policy = Sanitizers.FORMATTING.and(Sanitizers.LINKS);
// Allowed HTML elements and attributes in comment content e.g. Text formatting ,Lists and Structure & Styling
String[] allowedElements = {"b", "i", "u", "strong", "em", "ul", "ol", "li", "p", "br", "span", "div"};
PolicyFactory policy = new HtmlPolicyBuilder()
.allowElements(allowedElements)
.allowAttributes("style")
.onElements("span", "div", "p", "ul")
.allowStyling()
.allowStandardUrlProtocols()
.toFactory();
String safeContent = policy.sanitize(commentContent);
json.replace("content", safeContent);
}

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.7.0.1</version>
<version>23.7.0.6</version>
</parent>
<dependencies>