Skip to content

Commit fad9914

Browse files
committed
MC-15311: [Sec] PageBuilder XSS Injection Possible Through Block on HTML Code Content Type For CSS Classes Attribute & in TinyMCE
- test coverage for invalid css classes
1 parent 24c6189 commit fad9914

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,20 @@
304304
<data key="fieldName">css_classes</data>
305305
<data key="value">first-class second-class third-class</data>
306306
</entity>
307+
<entity name="PageBuilderAdvancedCssClassesProperty_Invalid_GreaterThan" type="pagebuilder_advanced_css_classes_property">
308+
<data key="name">CSS Classes</data>
309+
<data key="section">advanced</data>
310+
<data key="fieldName">css_classes</data>
311+
<data key="value">first&gt;class second-class third-class</data>
312+
<data key="errorMessage">Please enter a valid CSS class.</data>
313+
</entity>
314+
<entity name="PageBuilderAdvancedCssClassesProperty_Invalid_LessThan" type="pagebuilder_advanced_css_classes_property">
315+
<data key="name">CSS Classes</data>
316+
<data key="section">advanced</data>
317+
<data key="fieldName">css_classes</data>
318+
<data key="value">first-class second-class third&lt;class</data>
319+
<data key="errorMessage">Please enter a valid CSS class.</data>
320+
</entity>
307321
<!-- Text Color -->
308322
<entity name="PageBuilderAdvancedTextColorProperty" type="pagebuilder_advanced_color_property">
309323
<data key="name">Text Color</data>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest.xml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1629,8 +1629,6 @@
16291629
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowIntoStage2">
16301630
<argument name="contentType" value="PageBuilderRowContentType"/>
16311631
</actionGroup>
1632-
<!-- Add CSS Classes: Empty -->
1633-
<comment userInput="Add CSS Classes: Empty" stepKey="commentAddCSSClassesEmpty"/>
16341632
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
16351633
<argument name="contentType" value="PageBuilderTextContentType"/>
16361634
</actionGroup>
@@ -1648,6 +1646,24 @@
16481646
<actionGroup ref="addTextToTinyMCE" stepKey="enterText1">
16491647
<argument name="property" value="PageBuilderTextProperty"/>
16501648
</actionGroup>
1649+
<!-- Add CSS Classes: Invalid Greater Than -->
1650+
<comment userInput="Add CSS Classes: Invalid Greater Than" stepKey="commentAddCSSClassesInvalidGreaterThan"/>
1651+
<actionGroup ref="fillSlideOutPanelFieldAndExpectToSeeErrorInFieldset" stepKey="enterGreaterThanSymbol">
1652+
<argument name="property" value="PageBuilderAdvancedCssClassesProperty_Invalid_GreaterThan"/>
1653+
</actionGroup>
1654+
<actionGroup ref="saveEditPanelAndValidateFieldError" stepKey="validateErrorGreaterThan">
1655+
<argument name="property" value="PageBuilderAdvancedCssClassesProperty_Invalid_GreaterThan"/>
1656+
</actionGroup>
1657+
<!-- Add CSS Classes: Invalid Less Than -->
1658+
<comment userInput="Add CSS Classes: Invalid Less Than" stepKey="commentAddCSSClassesInvalidLessThan"/>
1659+
<actionGroup ref="fillSlideOutPanelFieldAndExpectToSeeErrorInFieldset" stepKey="enterLessThanSymbol">
1660+
<argument name="property" value="PageBuilderAdvancedCssClassesProperty_Invalid_LessThan"/>
1661+
</actionGroup>
1662+
<actionGroup ref="saveEditPanelAndValidateFieldError" stepKey="validateErrorLessThan">
1663+
<argument name="property" value="PageBuilderAdvancedCssClassesProperty_Invalid_LessThan"/>
1664+
</actionGroup>
1665+
<!-- Add CSS Classes: Empty -->
1666+
<comment userInput="Add CSS Classes: Empty" stepKey="commentAddCSSClassesEmpty"/>
16511667
<actionGroup ref="clearSlideOutPanelFieldGeneral" stepKey="clearCSSClasses">
16521668
<argument name="property" value="PageBuilderAdvancedCssClassesDefaultProperty"/>
16531669
</actionGroup>

0 commit comments

Comments
 (0)