LPD-46264 - Extract inline styles #4668

juanjofgliferay · 2025-01-17T08:43:39Z

Story / Task

Goal

Extend ContentSecurityPolicyHTMLRewriter scope so it extracts event handlers and inline styles using the same DOM node.

# breaking ## What portal-kernel/src/com/liferay/portal/kernel/content/security/policy/ContentSecurityPolicyHTMLRewriter.java portal-kernel/src/com/liferay/portal/kernel/content/security/policy/ContentSecurityPolicyHTMLRewriter.java includes a utility that extracts inline event handlers and styles from the same DOM node ## Why The method deeds a more generic name as it considers more attributes to extract

liferay-continuous-integration · 2025-01-17T08:43:44Z

CI is automatically triggering the following test suites:

ci:test:sf

liferay-continuous-integration · 2025-01-17T08:47:42Z

❌ ci:test:sf - 0 out of 1 jobs passed in 4 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: d1f1ba2114b232828a89aa605c18ef368ad23905

Sender Branch:

Branch Name: LPD-46264
Branch GIT ID: 4a427744b3b57cb397842d14261b0c3455e9cfce

0 out of 1jobs PASSED

1 Failed Jobs:

~~test-portal-source-format~~

For more details click here.

format-source-files:
     [java] java.lang.Exception: Found 2 formatting issues:
     [java] 1: ./modules/apps/frontend-taglib/frontend-taglib-clay/src/main/java/com/liferay/frontend/taglib/clay/servlet/taglib/AlertTag.java expected:<...icyHTMLRewriterUtil.[rewriteInlineAttributes(
     [java] ]          sb.toString(), ...> but was:<...icyHTMLRewriterUtil.[
     [java]           rewriteInlineAttributes(
     [java]   ]          sb.toString(), ...>
     [java] 2: ./util-taglib/src/com/liferay/taglib/ui/CSPTag.java expected:<...icyHTMLRewriterUtil.[rewriteInlineAttributes(
     [java] ]          bodyContent.get...> but was:<...icyHTMLRewriterUtil.[
     [java]           rewriteInlineAttributes(
     [java]   ]          bodyContent.get...>
     [java] 
     [java]   at com.liferay.source.formatter.SourceFormatter.format(SourceFormatter.java:472)
     [java]   at com.liferay.source.formatter.SourceFormatter.main(SourceFormatter.java:301)
[stopwatch] [run.batch.test.action: 1:57.741 sec]
     [echo] The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/portal-impl/build.xml:498: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/portal-impl/build.xml:651: Java returned: 1
  [typedef] Could not load definitions from resource org/apache/maven/artifact/ant/antlib.xml. It could not be found.
  [taskdef] Could not load definitions from resource org/jacoco/ant/antlib.xml. It could not be found.
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/null864637582.properties
merge-test-results:

[mkdir] Created dir: /opt/dev/projects/github/liferay-portal/test-results

[beanshell] Truncating errors in /opt/dev/projects/github/liferay-portal/portal-impl/test-results/TEST-JenkinsLogAssertTest.xml

[junitreport] Processing /opt/dev/projects/github/liferay-portal/test-results/TESTS-TestSuites.xml to /tmp/null1704536478

[junitreport] Loading stylesheet ile:/opt/java/ant/lib/ant-junit.jar!/org/apache/tools/ant/taskdefs/optional/junit/xsl/junit-frames.xsl

[junitreport] Transform time: 205ms

[junitreport] Deleting: /tmp/null1704536478

[echo] A report with all the test results can be found at test-results/html/index.html.

[mkdir] Created dir: /opt/dev/projects/github/liferay-jenkins-ee/test-results

[copy] Copying 1 file to /opt/dev/projects/github/liferay-jenkins-ee/test-results

[echo] run.batch.test.tear.down.start.timestamp: 01-17-2025 00:47:32:682 PST

liferay-continuous-integration · 2025-01-17T08:49:33Z

Jenkins Build:test-portal-source-format#7260

Jenkins Report:jenkins-report.html

Jenkins Suite:sf

Pull Request:liferay-frontend#4668

Testray Routine:EE Pull Request

Testray Build:[master] ci:test:sf - juanjofgliferay > liferay-frontend - PR#4668 - 2025-01-17[00:43:53]

Testray Build ID:111014750

Testray Importer:publish-testray-report#27633

juanjofgliferay · 2025-01-17T09:13:54Z

ci:test:sf

liferay-continuous-integration · 2025-01-17T09:18:58Z

✔️ ci:test:sf - 1 out of 1 jobs passed in 5 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: d1f1ba2114b232828a89aa605c18ef368ad23905

Sender Branch:

Branch Name: LPD-46264
Branch GIT ID: 14793fbae826cb9b745c6f35bb8c9abaefdc8759

1 out of 1jobs PASSED

1 Successful Jobs:

test-portal-source-format

For more details click here.

liferay-continuous-integration · 2025-01-17T09:21:39Z

Jenkins Build:test-portal-source-format#8398

Jenkins Report:jenkins-report.html

Jenkins Suite:sf

Pull Request:liferay-frontend#4668

Testray Routine:EE Pull Request

Testray Build:[master] ci:test:sf - juanjofgliferay > liferay-frontend - PR#4668 - 2025-01-17[01:14:05]

Testray Build ID:111023080

Testray Importer:publish-testray-report#4772

izaera · 2025-01-17T10:22:28Z

.../portal/security/content/security/policy/internal/ContentSecurityPolicyHTMLRewriterImpl.java

+		String elementStyles = element.attr("style");
+
+		if (Validator.isBlank(elementStyles)) {
+			return;


This would break the recursive logic, right? 🤔

Meaning it wouldn't process children if the parent has no style attribute...

.../portal/security/content/security/policy/internal/ContentSecurityPolicyHTMLRewriterImpl.java

...tal/security/content/security/policy/internal/ContentSecurityPolicyHTMLRewriterImplTest.java

…ppears in the parent

juanjofgliferay · 2025-01-17T12:30:19Z

ci:test:sf

liferay-continuous-integration · 2025-01-17T12:34:41Z

✔️ ci:test:sf - 1 out of 1 jobs passed in 4 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: d1f1ba2114b232828a89aa605c18ef368ad23905

Sender Branch:

Branch Name: LPD-46264
Branch GIT ID: 14793fbae826cb9b745c6f35bb8c9abaefdc8759

1 out of 1jobs PASSED

1 Successful Jobs:

test-portal-source-format

For more details click here.

liferay-continuous-integration · 2025-01-17T12:36:32Z

Jenkins Build:test-portal-source-format#8488

Jenkins Report:jenkins-report.html

Jenkins Suite:sf

Pull Request:liferay-frontend#4668

Testray Routine:EE Pull Request

Testray Build:[master] ci:test:sf - juanjofgliferay > liferay-frontend - PR#4668 - 2025-01-17[04:30:32]

Testray Build ID:111101588

Testray Importer:publish-testray-report#33370

juanjofgliferay · 2025-01-17T12:41:10Z

ci:test:relevant

juanjofgliferay · 2025-01-17T12:59:14Z

ci:test:sf

liferay-continuous-integration · 2025-01-17T13:03:35Z

✔️ ci:test:sf - 1 out of 1 jobs passed in 4 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: d1f1ba2114b232828a89aa605c18ef368ad23905

Sender Branch:

Branch Name: LPD-46264
Branch GIT ID: 1ad9385338fdc291a17a817f74d66a6925602880

1 out of 1jobs PASSED

1 Successful Jobs:

test-portal-source-format

For more details click here.

liferay-continuous-integration · 2025-01-17T13:05:27Z

Jenkins Build:test-portal-source-format#3880

Jenkins Report:jenkins-report.html

Jenkins Suite:sf

Pull Request:liferay-frontend#4668

Testray Routine:EE Pull Request

Testray Build:[master] ci:test:sf - juanjofgliferay > liferay-frontend - PR#4668 - 2025-01-17[04:59:30]

Testray Build ID:111118162

Testray Importer:publish-testray-report#15878

liferay-continuous-integration · 2025-01-17T16:13:02Z

✔️ ci:test:stable - 24 out of 24 jobs passed

❌ ci:test:relevant - 95 out of 130 jobs passed in 3 hours 24 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: d1f1ba2114b232828a89aa605c18ef368ad23905

Upstream Comparison:

Branch GIT ID: d1f1ba2114b232828a89aa605c18ef368ad23905
Jenkins Build URL: EE Development Acceptance (master) - 2 - 2025-01-16[23:22:23]

ci:test:stable - 24 out of 24 jobs PASSED

24 Successful Jobs:

ci:test:relevant - 95 out of 130 jobs PASSED

35 Failed Jobs:

95 Successful Jobs:

For more details click here.

Failures unique to this pull:

For upstream results, click here.

Test bundle downloads:

liferay-portal-bundle-tomcat.tar.gz

liferay-continuous-integration · 2025-01-17T16:22:48Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#19798

Jenkins Report:jenkins-report.html

Jenkins Suite:relevant

Pull Request:liferay-frontend#4668

Testray Routine:EE Pull Request

Testray Build:[master] ci:test:relevant - juanjofgliferay > liferay-frontend - PR#4668 - 2025-01-17[04:41:23]

Testray Build ID:111377795

Testray Importer:publish-testray-report#42789

juanjofgliferay · 2025-01-20T08:09:02Z

ci:test:relevant

liferay-continuous-integration · 2025-01-20T12:21:09Z

✔️ ci:test:stable - 24 out of 24 jobs passed

❌ ci:test:relevant - 174 out of 206 jobs passed in 4 hours 3 minutes

Click here for more details.

This pull is eligible for reevaluation. When this upstream build has completed, using the following CI command will compare this pull request result against a more recent upstream result:

ci:reevaluate:1377401_19829

Base Branch:

Branch Name: master
Branch GIT ID: 4035a2f3f4c922f3108d0bf0a3939c66802ed5ba

Upstream Comparison:

Branch GIT ID: 09cc2b52634eb72cdebf54b7aac9afe4ba545311
Jenkins Build URL: EE Development Acceptance (master) - 1128 - 2025-01-19[20:37:59]

ci:test:stable - 24 out of 24 jobs PASSED

24 Successful Jobs:

ci:test:relevant - 174 out of 206 jobs PASSED

32 Failed Jobs:

174 Successful Jobs:

For more details click here.

Failures unique to this pull:

modules-integration-mysql57/0/0
```
Build was aborted
```
1. com.liferay.object.rest.internal.resource.v1_0.test.ObjectEntryResourceTest - Failed 2 of last 21
  testRun

semantic-versioning/0/0

clean-up-java-processes:
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/clean_up_java_processes.sh
[stopwatch] [run.batch.test.setup: 19:09.280 sec]
     [echo] run.batch.test.action.start.timestamp: 01-20-2025 00:41:53:966 PST
     [echo] Checking for baseline log files.
     [echo] 
     [echo] ##
     [echo] ## /opt/dev/projects/github/liferay-portal/baseline-reports/portal-kernel.log
     [echo] ##
     [echo] 
[beanshell] [Baseline Warning] Bundle Version Change Recommended: 157.0.0
[beanshell] 
[stopwatch] [run.batch.test.action: 6.473 sec]
     [echo] Semantic versioning is incorrect.
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/null1719861490.properties

com.liferay.jenkins.JenkinsLogAsserterTest
1. testScanJenkinsLog

modules-integration-mysql57/3/5
1. com.liferay.portal.workflow.kaleo.internal.runtime.integration.test.WorkflowTaskManagerImplTest - Failed 0 of last 20
  testSearchWorkflowTasksWhenThereIsAnUnregisteredHandler
2. com.liferay.portal.workflow.kaleo.internal.runtime.integration.test.WorkflowEngineConcurrentTest - Failed 1 of last 21
  testConcurrentExecuteTimerWorkflowInstance
modules-integration-mysql57/3/20
1. com.liferay.headless.commerce.admin.order.resource.v1_0.test.OrderAccountGroupResourceTest - Failed 0 of last 20
  testGetOrderRuleAccountGroupAccountGroup
modules-integration-mysql57/4/19
1. com.liferay.oauth2.provider.client.test.SAPClientTest - Failed 3 of last 21
  test
...

Test bundle downloads:

liferay-portal-bundle-tomcat.tar.gz

liferay-continuous-integration · 2025-01-20T12:35:23Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#19829

Jenkins Report:jenkins-report.html

Jenkins Suite:relevant

Pull Request:liferay-frontend#4668

Testray Routine:EE Pull Request

Testray Build:[master] ci:test:relevant - juanjofgliferay > liferay-frontend - PR#4668 - 2025-01-20[00:09:14]

Testray Build ID:113253656

Testray Importer:publish-testray-report#42864

juanjofgliferay added 5 commits January 17, 2025 09:38

LPD-46264 - Feat. Add utility to extract inline styles

1e93669

LPD-46264 - semver

04fa0d5

LPD-46264 - Fix typo

54debc4

LPD-46264 - Add tests for inline styles extraction

4a42774

juanjofgliferay requested a review from liferay-frontend as a code owner January 17, 2025 08:43

juanjofgliferay requested review from izaera and removed request for liferay-frontend January 17, 2025 08:43

juanjofgliferay requested a review from dsanz January 17, 2025 08:44

liferay-continuous-integration added ci:test:sf - pending ci:test:sf - failure and removed ci:test:sf - pending labels Jan 17, 2025

LPD-46264 - SF

14793fb

liferay-continuous-integration added ci:test:sf - pending ci:test:sf - success and removed ci:test:sf - failure ci:test:sf - pending labels Jan 17, 2025

izaera reviewed Jan 17, 2025

View reviewed changes

juanjofgliferay commented Jan 17, 2025

View reviewed changes

...tal/security/content/security/policy/internal/ContentSecurityPolicyHTMLRewriterImplTest.java Outdated Show resolved Hide resolved

juanjofgliferay added 2 commits January 17, 2025 13:04

LPD-46264 - SF

fcfdb98

LPD-46264 - Refactor. Prevent utility to exit if no style attribute a…

905a6e5

…ppears in the parent

liferay-continuous-integration added ci:test:sf - pending and removed ci:test:sf - success labels Jan 17, 2025

liferay-continuous-integration added ci:test:relevant - pending ci:test:stable - pending labels Jan 17, 2025

LPD-46264 - SF

1ad9385

liferay-continuous-integration added ci:test:sf - pending ci:test:sf - success and removed ci:test:sf - success ci:test:sf - pending labels Jan 17, 2025

liferay-continuous-integration added ci:test:relevant - failure ci:test:stable - success and removed ci:test:relevant - pending ci:test:stable - pending labels Jan 17, 2025

liferay-continuous-integration added ci:test:relevant - pending ci:test:stable - pending ci:test:relevant - failure ci:test:stable - success and removed ci:test:relevant - failure ci:test:stable - success ci:test:relevant - pending ci:test:stable - pending labels Jan 20, 2025

LPD-46264 - Extract inline styles #4668

Are you sure you want to change the base?

LPD-46264 - Extract inline styles #4668

Conversation

juanjofgliferay commented Jan 17, 2025

Story / Task

Goal

liferay-continuous-integration commented Jan 17, 2025

liferay-continuous-integration commented Jan 17, 2025

❌ ci:test:sf - 0 out of 1 jobs passed in 4 minutes

Base Branch:

Sender Branch:

1 Failed Jobs:

For more details click here.

liferay-continuous-integration commented Jan 17, 2025

juanjofgliferay commented Jan 17, 2025

liferay-continuous-integration commented Jan 17, 2025

✔️ ci:test:sf - 1 out of 1 jobs passed in 5 minutes

Base Branch:

Sender Branch:

For more details click here.

liferay-continuous-integration commented Jan 17, 2025

izaera Jan 17, 2025

Choose a reason for hiding this comment

juanjofgliferay commented Jan 17, 2025

liferay-continuous-integration commented Jan 17, 2025

✔️ ci:test:sf - 1 out of 1 jobs passed in 4 minutes

Base Branch:

Sender Branch:

For more details click here.

liferay-continuous-integration commented Jan 17, 2025

juanjofgliferay commented Jan 17, 2025

juanjofgliferay commented Jan 17, 2025

liferay-continuous-integration commented Jan 17, 2025

✔️ ci:test:sf - 1 out of 1 jobs passed in 4 minutes

Base Branch:

Sender Branch:

For more details click here.

liferay-continuous-integration commented Jan 17, 2025

liferay-continuous-integration commented Jan 17, 2025

✔️ ci:test:stable - 24 out of 24 jobs passed

❌ ci:test:relevant - 95 out of 130 jobs passed in 3 hours 24 minutes

Base Branch:

Upstream Comparison:

35 Failed Jobs:

For more details click here.

Failures unique to this pull:

For upstream results, click here.

Test bundle downloads:

liferay-continuous-integration commented Jan 17, 2025

juanjofgliferay commented Jan 20, 2025

liferay-continuous-integration commented Jan 20, 2025

✔️ ci:test:stable - 24 out of 24 jobs passed

❌ ci:test:relevant - 174 out of 206 jobs passed in 4 hours 3 minutes

Base Branch:

Upstream Comparison:

32 Failed Jobs:

For more details click here.

Failures unique to this pull:

Test bundle downloads:

liferay-continuous-integration commented Jan 20, 2025