CVE-2025-43755

@@ -213,6 +213,47 @@ test.describe('General configuration', () => {
 			).toBeVisible();
 		}
 	);
+
+	test(
+		'Layout type is escaped',
+		{
+			tag: '@LPD-54782',
+		},
+		async ({
+			apiHelpers,
+			page,
+			pageConfigurationPage,
+			pagesAdminPage,
+			site,
+		}) => {
+
+			// Create a layout
+
+			const title = getRandomString();
+
+			await apiHelpers.jsonWebServicesLayout.addLayout({
+				groupId: site.id,
+				options: {
+					type: 'contenttho8o<script>alert(12345)</script>l421oja33oz',
+				},
+				title,
+			});
+
+			// Go to page configuration
+
+			await pagesAdminPage.goto(site.friendlyUrlPath);
+
+			await pageConfigurationPage.goToSection(title, 'General');
+
+			// Verify no alert is shown
+
+			page.on('dialog', async (dialog) => {
+				await dialog.accept();
+
+				expect(dialog.message(), '12345').toBeNull();
+			});
+		}
+	);
 });
 
 test.describe('Design configuration', () => {

@@ -128,19 +128,19 @@ portletDisplay.setURLBackTitle(ParamUtil.getString(request, "backURLTitle"));
 			%>
 
 			<c:if test="<%= lte.getType() == LayoutTypeException.FIRST_LAYOUT %>">
-				<liferay-ui:message arguments='<%= Validator.isNull(lte.getLayoutType()) ? type : "layout.types." + lte.getLayoutType() %>' key="the-first-page-cannot-be-of-type-x" />
+				<liferay-ui:message arguments='<%= Validator.isNull(lte.getLayoutType()) ? HtmlUtil.escape(type) : "layout.types." + HtmlUtil.escape(lte.getLayoutType()) %>' key="the-first-page-cannot-be-of-type-x" />
 			</c:if>
 
 			<c:if test="<%= lte.getType() == LayoutTypeException.FIRST_LAYOUT_PERMISSION %>">
 				<liferay-ui:message key="you-cannot-delete-this-page-because-the-next-page-is-not-viewable-by-unauthenticated-users-and-so-cannot-be-the-first-page" />
 			</c:if>
 
 			<c:if test="<%= lte.getType() == LayoutTypeException.NOT_INSTANCEABLE %>">
-				<liferay-ui:message arguments="<%= type %>" key="pages-of-type-x-cannot-be-selected" />
+				<liferay-ui:message arguments="<%= HtmlUtil.escape(type) %>" key="pages-of-type-x-cannot-be-selected" />
 			</c:if>
 
 			<c:if test="<%= lte.getType() == LayoutTypeException.NOT_PARENTABLE %>">
-				<liferay-ui:message arguments="<%= type %>" key="pages-of-type-x-cannot-have-child-pages" />
+				<liferay-ui:message arguments="<%= HtmlUtil.escape(type) %>" key="pages-of-type-x-cannot-have-child-pages" />
 			</c:if>
 		</liferay-ui:error>
 

@@ -81,7 +81,7 @@ if (selLayout != null) {
 
 		<div class="layout-type">
 			<p class="small text-secondary">
-				<liferay-ui:message key='<%= "layout.types." + type + ".description" %>' />
+				<liferay-ui:message key='<%= "layout.types." + HtmlUtil.escape(type) + ".description" %>' />
 			</p>
 
 			<%= layoutTypeController.includeEditContent(request, response, selLayout) %>