entando · ffalqui · Jul 27, 2026 · Jun 24, 2026 · Jun 25, 2026 · Jun 25, 2026
diff --git a/Dockerfile.tomcat b/Dockerfile.tomcat
@@ -1,4 +1,4 @@
-FROM registry.hub.docker.com/entando/entando-tomcat-base:7.5.0
+FROM registry.hub.docker.com/entando/entando-tomcat-base:v7.5.1-ESB-1170-PR-37-BB-release-2F-7.5
 ARG VERSION
 
 ### Required OpenShift Labels

diff --git a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/enumeratorAttribute.jsp b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/enumeratorAttribute.jsp
@@ -1,10 +1,10 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <s:if test="#lang.default">
-	<s:property value="%{#attribute.getText()}" />
+	<s:property value="%{#attribute.getText()}" escapeHtml="true" />
 </s:if>
 <s:else>
 	<s:if test="#attributeTracer.listElement">
-		<s:property value="%{#attribute.getText()}" />
+		<s:property value="%{#attribute.getText()}" escapeHtml="true" />
 	</s:if>
 	<s:else>
 		<s:text name="EntityAttribute.monolang.defaultValue" />

diff --git a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/enumeratorMapAttribute.jsp b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/enumeratorMapAttribute.jsp
@@ -2,16 +2,16 @@
 <s:if test="#lang.default">
     <s:if test="%{null == #attribute.getMapKey()}" >&ndash;</s:if>
     <s:else>
-        <p><label><s:text name="label.key" /></label>:&#32;<s:property value="%{#attribute.getMapKey()}" /></p>
-        <p><label><s:text name="label.value" /></label>:&#32;<s:property value="%{#attribute.getMapValue()}" /></p>
+        <p><label><s:text name="label.key" /></label>:&#32;<s:property value="#attribute.getMapKey()" escapeHtml="true" /></p>
+        <p><label><s:text name="label.value" /></label>:&#32;<s:property value="#attribute.getMapValue()" escapeHtml="true" /></p>
     </s:else>
 </s:if>
 <s:else>
 	<s:if test="#attributeTracer.listElement">
             <s:if test="%{null == #attribute.getMapKey()}" >&ndash;</s:if>
             <s:else>
-                <p><label><s:text name="label.key" /></label>:&#32;<s:property value="%{#attribute.getMapKey()}" /></p>
-                <p><label><s:text name="label.value" /></label>:&#32;<s:property value="%{#attribute.getMapValue()}" /></p>
+                <p><label><s:text name="label.key" /></label>:&#32;<s:property value="#attribute.getMapKey()" escapeHtml="true" /></p>
+                <p><label><s:text name="label.value" /></label>:&#32;<s:property value="#attribute.getMapValue()" escapeHtml="true" /></p>
             </s:else>
 	</s:if>
 	<s:else>

diff --git a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/hypertextAttribute.jsp b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/hypertextAttribute.jsp
@@ -1,2 +1,2 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
-<s:property value="#attribute.getTextForLang(#lang.code)" escapeHtml="false" />
+<s:property value="#attribute.getTextForLang(#lang.code)" escapeHtml="true" />
diff --git a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/longtextAttribute.jsp b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/longtextAttribute.jsp
@@ -1,2 +1,2 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
-<s:property value="%{#attribute.getTextForLang(#lang.code)}" />
+<s:property value="#attribute.getTextForLang(#lang.code)" escapeHtml="true" />
diff --git a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/textAttribute.jsp b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/textAttribute.jsp
@@ -1,2 +1,2 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
-<s:property value="%{#attribute.getTextForLang(#lang.code)}" />
+<s:property value="#attribute.getTextForLang(#lang.code)" escapeHtml="true" />
diff --git a/admin-console/src/main/webapp/error.jsp b/admin-console/src/main/webapp/error.jsp
@@ -5,9 +5,9 @@
 <%@ taglib prefix="wp" uri="/aps-core" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%
-		Object statusCode = request.getAttribute("javax.servlet.error.status_code");
-		Object exceptionType = request.getAttribute("javax.servlet.error.exception_type");
-		Object message = request.getAttribute("javax.servlet.error.message");
+		Object statusCode = request.getAttribute("jakarta.servlet.error.status_code");
+		Object exceptionType = request.getAttribute("jakarta.servlet.error.exception_type");
+		Object message = request.getAttribute("jakarta.servlet.error.message");
 %>
 <!DOCTYPE html>
 <html lang="en">

diff --git a/.../src/main/java/com/agiletec/plugins/jacms/aps/system/services/content/ContentManager.java b/.../src/main/java/com/agiletec/plugins/jacms/aps/system/services/content/ContentManager.java
@@ -1,3 +1,3 @@
 /*
 * Copyright 2015-Present Entando Inc. (http://www.entando.com) All rights reserved.
 *
@@ -45,6 +45,7 @@
 import org.entando.entando.ent.exception.EntRuntimeException;
 import org.entando.entando.ent.util.EntLogging.EntLogFactory;
 import org.entando.entando.ent.util.EntLogging.EntLogger;
+import org.entando.entando.ent.util.LabelSanitizer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 
@@ -144,7 +145,7 @@
    @Override
    public String getViewPage(String contentId) {
        Content type = this.getTypeById(contentId);
        return type.getViewPage();
    }

    /**
@@ -156,7 +157,7 @@
    @Override
    public String getDefaultModel(String contentId) {
        Content type = this.getTypeById(contentId);
        return type.getDefaultModel();
    }

    /**
@@ -169,7 +170,7 @@
    @Override
    public String getListModel(String contentId) {
        Content type = this.getTypeById(contentId);
        return type.getListModel();
    }

    /**
@@ -293,6 +294,7 @@
     private String addUpdateContent(Content content, boolean updateDate) throws EntException {
         String id = null;
         try {
+            content.setDescription(LabelSanitizer.stripMarkup(content.getDescription()));
             content.setLastModified(new Date());
             if (updateDate) {
                 content.incrementVersion(false);

diff --git a/...java/com/agiletec/plugins/jacms/aps/system/services/contentmodel/ContentModelManager.java b/...java/com/agiletec/plugins/jacms/aps/system/services/contentmodel/ContentModelManager.java
@@ -33,6 +33,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
+import org.entando.entando.ent.util.LabelSanitizer;
 import org.entando.entando.plugins.jacms.aps.system.services.content.widget.RowContentListHelper;
 import org.entando.entando.ent.util.EntLogging.EntLogger;
 import org.entando.entando.ent.util.EntLogging.EntLogFactory;
@@ -113,6 +115,7 @@ public void releaseTenantAware() {
      */
     @Override
     public void addContentModel(ContentModel model) throws EntException {
+        model.setDescription(LabelSanitizer.stripMarkup(model.getDescription()));
         try {
             this.getContentModelDAO().addContentModel(model);
             this.getCacheWrapper().addContentModel(model);
@@ -149,6 +152,7 @@ public void removeContentModel(ContentModel model) throws EntException {
      */
     @Override
     public void updateContentModel(ContentModel model) throws EntException {
+        model.setDescription(LabelSanitizer.stripMarkup(model.getDescription()));
         try {
             this.getContentModelDAO().updateContentModel(model);
             this.getCacheWrapper().updateContentModel(model);

diff --git a/...rc/main/java/com/agiletec/plugins/jacms/aps/system/services/resource/ResourceManager.java b/...rc/main/java/com/agiletec/plugins/jacms/aps/system/services/resource/ResourceManager.java
@@ -1,3 +1,3 @@
 /*
 * Copyright 2015-Present Entando Inc. (http://www.entando.com) All rights reserved.
 *
@@ -40,6 +40,7 @@
 import org.entando.entando.ent.util.EntLogging.EntLogger;
 import org.entando.entando.ent.util.EntLogging.EntLogFactory;
 import org.entando.entando.ent.util.EntSafeXmlUtils;
+import org.entando.entando.ent.util.LabelSanitizer;
 import org.xml.sax.InputSource;
 
 import jakarta.xml.bind.JAXBContext;
@@ -244,6 +245,7 @@
      */
     @Override
     public void addResource(ResourceInterface resource) throws EntException {
+        resource.setDescription(LabelSanitizer.stripMarkup(resource.getDescription()));
         try {
             this.generateAndSetResourceId(resource, resource.getId());
             this.getResourceDAO().addResource(resource);
@@ -268,7 +270,7 @@
         ResourceInterface oldResource = this.loadResource(bean.getResourceId());
         try {
             if (null == bean.getInputStream()) {
-                oldResource.setDescription(bean.getDescr());
+                oldResource.setDescription(LabelSanitizer.stripMarkup(bean.getDescr()));
                 oldResource.setCategories(bean.getCategories());
                 oldResource.setMetadata(bean.getMetadata());
                 oldResource.setMainGroup(bean.getMainGroup());
@@ -280,7 +282,7 @@
                updatedResource
                        .saveResourceInstances(bean, getIgnoreMetadataKeysForResourceType(bean.getResourceType()));
                this.getResourceDAO().updateResource(updatedResource);
                if (!updatedResource.getMasterFileName().equals(oldResource.getMasterFileName())) {
                    oldResource.deleteResourceInstances();
                }
                this.notifyResourceChanging(updatedResource, ResourceChangedEvent.UPDATE_OPERATION_CODE);
@@ -299,6 +301,7 @@
      */
     @Override
     public void updateResource(ResourceInterface resource) throws EntException {
+        resource.setDescription(LabelSanitizer.stripMarkup(resource.getDescription()));
         try {
             this.getResourceDAO().updateResource(resource);
             this.notifyResourceChanging(resource, ResourceChangedEvent.UPDATE_OPERATION_CODE);
@@ -310,7 +313,7 @@
 
     protected ResourceInterface createResource(ResourceDataBean bean) throws EntException {
         ResourceInterface resource = this.createResourceType(bean.getResourceType());
-        resource.setDescription(bean.getDescr());
+        resource.setDescription(LabelSanitizer.stripMarkup(bean.getDescr()));
         resource.setMainGroup(bean.getMainGroup());
         resource.setCategories(bean.getCategories());
         resource.setMasterFileName(bean.getFileName());
@@ -560,7 +563,7 @@
    protected void refreshMasterFileNames(String resourceId) {
        try {
            ResourceInterface resource = this.loadResource(resourceId);
            if (resource.isMultiInstance()) {
                ResourceInstance instance
                        = ((AbstractMultiInstanceResource) resource).getInstance(0, null);
                String filename = instance.getFileName();
@@ -581,7 +584,7 @@
    protected void refreshResourceInstances(String resourceId) {
        try {
            ResourceInterface resource = this.loadResource(resourceId);
            resource.reloadResourceInstances();
            this.updateResource(resource);
        } catch (Throwable t) {
            logger.error("Error refreshing resource instances of resource {}", resourceId, t);
@@ -667,7 +670,7 @@
            JAXBContext context = JAXBContext.newInstance(JaxbMetadataMapping.class);
            Unmarshaller unmarshaller = context.createUnmarshaller();
            JaxbMetadataMapping jaxbMapping = (JaxbMetadataMapping) unmarshaller.unmarshal(stream);
            jaxbMapping.getFields().stream().forEach(m -> {
                String key = m.getKey();
                String csv = m.getValue();
                List<String> metadatas = new ArrayList<>();

diff --git a/...src/main/java/com/agiletec/plugins/jacms/apsadmin/content/helper/ContentActionHelper.java b/...src/main/java/com/agiletec/plugins/jacms/apsadmin/content/helper/ContentActionHelper.java
@@ -23,6 +23,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.struts2.ServletActionContext;
 import org.entando.entando.aps.system.services.actionlog.model.ActivityStreamInfo;
+import org.entando.entando.ent.util.LabelSanitizer;
 import org.entando.entando.plugins.jacms.aps.system.services.content.helper.IContentHelper;
 import org.entando.entando.plugins.jacms.aps.util.CmsPageUtil;
 import org.entando.entando.ent.util.EntLogging.EntLogger;
@@ -134,7 +135,8 @@ public void scanEntity(IApsEntity entity, ActionSupport action) {
                 String[] args = {String.valueOf(maxLength)};
                 action.addFieldError(DESCR, action.getText("error.content.descr.wrongMaxLength", args));
             }
-            if (!descr.matches("([^\"])+")) {
+            if (!descr.matches("[^\"<>]+")) {
+                content.setDescription(LabelSanitizer.stripMarkup(content.getDescription()));
                 action.addFieldError(DESCR, action.getText("error.content.descr.wrongCharacters"));
             }
         }

diff --git a/...in/src/main/java/com/agiletec/plugins/jacms/apsadmin/resource/AbstractResourceAction.java b/...in/src/main/java/com/agiletec/plugins/jacms/apsadmin/resource/AbstractResourceAction.java
@@ -28,7 +28,7 @@
  * @author E.Santoboni
  */
 public abstract class AbstractResourceAction extends AbstractTreeAction {
-	
+
 	public List<String> getResourceTypeCodes() {
 		return this.getResourceManager().getResourceTypeCodes();
 	}
@@ -58,7 +58,14 @@ public ResourceInterface loadResource(String resourceId) throws Throwable {
 	public String getResourceTypeCode() {
 		return _resourceTypeCode;
 	}
+
+	// Accept only registered type codes; neutralizes reflected input at the single bind point (SSTI, WSTG-INPV-18).
 	public void setResourceTypeCode(String resourceTypeCode) {
+		if (null != resourceTypeCode && null != this.getResourceManager()
+				&& !this.getResourceManager().getResourceTypeCodes().contains(resourceTypeCode)) {
+			this._resourceTypeCode = null;
+			return;
+		}
 		this._resourceTypeCode = resourceTypeCode;
 	}
 

diff --git a/...in/src/main/java/com/agiletec/plugins/jacms/apsadmin/resource/MultipleResourceAction.java b/...in/src/main/java/com/agiletec/plugins/jacms/apsadmin/resource/MultipleResourceAction.java
@@ -47,6 +47,12 @@ public class MultipleResourceAction extends ResourceAction {
     public void validate() {
         logger.debug("MultipleResourceAction validate");
         savedId.clear();
+        // Reject unregistered type codes: blocks save() on unknown type and reflected sinks (SSTI, WSTG-INPV-18).
+        if (!this.getResourceManager().getResourceTypeCodes().contains(this.getResourceTypeCode())) {
+            logger.warn("Rejected unknown resourceTypeCode value");
+            this.addFieldError("resourceTypeCode", this.getText("error.resource.file.genericError"));
+            return;
+        }
         if (ApsAdminSystemConstants.EDIT == this.getStrutsAction()) {
             this.fetchFileDescriptions();
             addFieldErrors(validateFileDescriptions());

diff --git a/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/contentDetails.jsp b/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/contentDetails.jsp
@@ -328,7 +328,7 @@
                                                                         </s:if>
                                                                         <s:else>
                                                                             <div class="text-muted">
-                                                                                <s:property value="#attribute.getText()" />
+                                                                                <s:property value="#attribute.getText()" escapeHtml="true" />
                                                                             </div>
                                                                         </s:else>
                                                                     </s:else>

diff --git a/...plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/view/imageAttribute.jsp b/...plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/view/imageAttribute.jsp
@@ -9,7 +9,7 @@
         <img
             class="img-thumbnail"
             src="<s:property value="#defaultResource.getImagePath('1')"/>"
-            alt="<s:property value="#defaultResource.descr"/>" />
+            alt="<s:property value="#defaultResource.descr"/>" escapeHtml="true" />
         <span class="sr-only">
             <abbr
                 title="<s:text name="label.img.text.long" />">
@@ -27,7 +27,7 @@
     </s:if>
     <s:else>
         <s:if test="#currentResource != null">
-            <img class="img-thumbnail" src="<s:property value="#currentResource.getImagePath('1')"/>" alt="<s:property value="#currentResource.descr"/>" />
+            <img class="img-thumbnail" src="<s:property value="#currentResource.getImagePath('1')"/>" alt="<s:property value="#currentResource.descr" escapeHtml="true" />" />
             <span class="sr-only">
                 <abbr title="<s:text name="label.img.text.long" />"> <s:text name="label.img.text.short" /></abbr>:&#32;
             </span>
@@ -36,7 +36,7 @@
             <img
                 class="img-thumbnail"
                 src="<s:property value="#defaultResource.getImagePath('1')"/>"
-                alt="<s:property value="#defaultResource.descr"/>" />
+                alt="<s:property value="#defaultResource.descr" escapeHtml="true" />" />
             <span class="sr-only">
                 <abbr
                     title="<s:text name="label.img.text.long" />">

diff --git a/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/view/linkAttribute.jsp b/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/view/linkAttribute.jsp
@@ -42,10 +42,10 @@
 			<s:set var="linkDestination" value="%{getText('note.contentLinkTo') + ': ' + #linkToEdit.contentDestination + ' - ' + #linkedContent.descr + ', ' + getText('note.contentOnPageLinkTo') + ': ' + #linkedPage.titles[currentLang.code]}" />
 		</s:elseif>
 		<%-- link icon --%>
-			<a href="<s:property value="#linkToEdit.contentDestination" />" class="<s:property value="#statusIconVar" />" title="<s:property value="#linkDestination" />"><span class="sr-only"><s:property value="#linkDestination" /></span></a>
+			<a href="<s:property value="#linkToEdit.contentDestination" />" class="<s:property value="#statusIconVar" />" title="<s:property value="#linkDestination" escapeHtml="true" />"><span class="sr-only"><s:property value="#linkDestination" escapeHtml="true" /></span></a>
 		<%-- text of the link --%>
 			<s:if test="%{#attribute.getTextForLang(#lang.code)==null}">
-				<span class="text-muted">&#32;<s:property value="#attribute.getText()" /></span>
+				<span class="text-muted">&#32;<s:property value="#attribute.getText()" escapeHtml="true" /></span>
 			</s:if>
 			<s:else>
 				&#32;<s:include value="/WEB-INF/apsadmin/jsp/entity/view/textAttribute.jsp" />

diff --git a/...rc/test/java/com/agiletec/plugins/jacms/apsadmin/resource/TestMultipleResourceAction.java b/...rc/test/java/com/agiletec/plugins/jacms/apsadmin/resource/TestMultipleResourceAction.java
@@ -92,8 +92,8 @@ void testSaveNewResourceStrutsValidation() throws Throwable {
         assertEquals(Action.INPUT, result);
         ActionSupport action = this.getAction();
         Map<String, List<String>> actionFieldErrors = action.getFieldErrors();
-        assertEquals(6, actionFieldErrors.size());
-        assertEquals(1, actionFieldErrors.get("resourceTypeCode").size());
+        assertEquals(2, actionFieldErrors.size());
+        assertEquals(2, actionFieldErrors.get("resourceTypeCode").size());
         assertEquals(1, actionFieldErrors.get("mainGroup").size());
     }
 
@@ -131,8 +131,8 @@ void testSaveNewResource_2() throws Throwable {
         assertEquals(Action.INPUT, result);
         ActionSupport action = this.getAction();
         Map<String, List<String>> actionFieldErrors = action.getFieldErrors();
-        assertEquals(5, actionFieldErrors.size());
-        assertEquals(1, actionFieldErrors.get("resourceTypeCode").size());
+        assertEquals(1, actionFieldErrors.size());
+        assertEquals(2, actionFieldErrors.get("resourceTypeCode").size());
 
     }
 

diff --git a/engine/src/main/java/com/agiletec/aps/system/common/entity/ApsEntityManager.java b/engine/src/main/java/com/agiletec/aps/system/common/entity/ApsEntityManager.java
@@ -1,3 +1,3 @@
 /*
 * Copyright 2015-Present Entando Inc. (http://www.entando.com) All rights reserved.
 *
@@ -59,6 +59,7 @@
 import org.apache.commons.beanutils.BeanComparator;
 import org.entando.entando.ent.util.EntLogging.EntLogger;
 import org.entando.entando.ent.util.EntLogging.EntLogFactory;
+import org.entando.entando.ent.util.LabelSanitizer;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
@@ -254,6 +255,7 @@
         if (null == entityType) {
             throw new EntException("Invalid entity type to add");
         }
+        this.sanitizeEntityTypeLabels(entityType);
         Map<String, IApsEntity> newEntityTypes = this.getEntityTypes();
         newEntityTypes.put(entityType.getTypeCode(), entityType);
         this.updateEntityPrototypes(newEntityTypes);
@@ -271,6 +273,7 @@
         if (null == entityType) {
             throw new EntException("Invalid entity type to update");
         }
+        this.sanitizeEntityTypeLabels(entityType);
         Map<String, IApsEntity> entityTypes = this.getEntityTypes();
         IApsEntity oldEntityType = entityTypes.get(entityType.getTypeCode());
         if (null == oldEntityType) {
@@ -282,6 +285,23 @@
         this.notifyEntityTypesChanging(oldEntityType, entityType, EntityTypesChangingEvent.UPDATE_OPERATION_CODE);
     }
 
+    /**
+     * Strips markup from the user-supplied label fields of an entity type (its description
+     * and the name/description of each attribute) before it is persisted
+     */
+    private void sanitizeEntityTypeLabels(IApsEntity entityType) {
+        entityType.setTypeCode(LabelSanitizer.stripMarkup(entityType.getTypeCode()));
+        entityType.setTypeDescription(LabelSanitizer.stripMarkup(entityType.getTypeDescription()));
+        List<AttributeInterface> attributes = entityType.getAttributeList();
+        if (null != attributes) {
+            for (AttributeInterface attribute : attributes) {
+                attribute.setName(LabelSanitizer.stripMarkup(attribute.getName()));
+                attribute.setDescription(LabelSanitizer.stripMarkup(attribute.getDescription()));
+                LabelSanitizer.stripMarkup(attribute.getNames());
+            }
+        }
+    }
+
     protected void verifyReloadingNeeded(IApsEntity oldEntityType, IApsEntity newEntityType) {
         if (this.getStatus(newEntityType.getTypeCode()) == STATUS_NEED_TO_RELOAD_REFERENCES) {
             return;

diff --git a/engine/src/main/java/com/agiletec/aps/system/services/category/CategoryManager.java b/engine/src/main/java/com/agiletec/aps/system/services/category/CategoryManager.java
@@ -1,3 +1,3 @@
 /*
 * Copyright 2015-Present Entando Inc. (http://www.entando.com) All rights reserved.
 *
@@ -23,6 +23,7 @@
 import org.entando.entando.aps.system.services.tenants.RefreshableBeanTenantAware;
 import org.entando.entando.ent.util.EntLogging.EntLogger;
 import org.entando.entando.ent.util.EntLogging.EntLogFactory;
+import org.entando.entando.ent.util.LabelSanitizer;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.ListableBeanFactory;
 
@@ -82,6 +83,8 @@
 	 */
 	@Override
 	public void addCategory(Category category) throws EntException {
+		category.setCode(LabelSanitizer.stripMarkup(category.getCode()));
+		LabelSanitizer.stripMarkup(category.getTitles());
 		try {
 			this.getCategoryDAO().addCategory(category);
             this.getCacheWrapper().addCategory(category);
@@ -121,6 +124,7 @@
 	 */
 	@Override
 	public void updateCategory(Category category) throws EntException {
+		LabelSanitizer.stripMarkup(category.getTitles());
 		try {
 			this.getCategoryDAO().updateCategory(category);
             this.getCacheWrapper().updateCategory(category);

diff --git a/engine/src/main/java/com/agiletec/aps/system/services/group/GroupManager.java b/engine/src/main/java/com/agiletec/aps/system/services/group/GroupManager.java
@@ -27,6 +27,7 @@
 import org.apache.commons.beanutils.BeanComparator;
 import org.entando.entando.ent.util.EntLogging.EntLogger;
 import org.entando.entando.ent.util.EntLogging.EntLogFactory;
+import org.entando.entando.ent.util.LabelSanitizer;
 
 /**
  * Servizio gestore dei gruppi.
@@ -87,6 +88,7 @@ public void releaseTenantAware() {
     @Override
     public void addGroup(Group group) throws EntException {
         try {
+            group.setDescr(LabelSanitizer.stripMarkup(group.getDescr()));
             this.getGroupDAO().addGroup(group);
             this.getCacheWrapper().addGroup(group);
         } catch (Throwable t) {
@@ -121,6 +123,7 @@ public void removeGroup(Group group) throws EntException {
     @Override
     public void updateGroup(Group group) throws EntException {
         try {
+            group.setDescr(LabelSanitizer.stripMarkup(group.getDescr()));
             this.getGroupDAO().updateGroup(group);
             this.getCacheWrapper().updateGroup(group);
         } catch (Throwable t) {