Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WW-5516 Fix TemplateDir and Theme fallback to Request/Session/Application attributes #1190

Merged
merged 1 commit into from
Jan 22, 2025

Conversation

kusalk
Copy link
Member

@kusalk kusalk commented Jan 20, 2025

WW-5516

This is a fix for a functionality regression introduced in #763. Instead of re-introducing the dependency on an OGNL context expression, we instead access the required attributes directly through Java instead. This fixes the regression whilst still allowing applications to block OGNL context access (expressions beginning with #) using OgnlGuard if they desire.

@kusalk kusalk force-pushed the WW-5516-fix-temp-theme-fallback branch from 82e1598 to 90021fa Compare January 20, 2025 03:27
@kusalk kusalk marked this pull request as ready for review January 20, 2025 03:37
@kusalk kusalk requested a review from lukaszlenart January 20, 2025 03:38
Copy link
Member

@lukaszlenart lukaszlenart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I would just add one more test without using OGNL expression, just set value in a given scope (application or session) and check if it was resolved.

@lukaszlenart lukaszlenart added this to the 6.7.1 milestone Jan 21, 2025
@kusalk kusalk force-pushed the WW-5516-fix-temp-theme-fallback branch from 90021fa to 32071c7 Compare January 21, 2025 09:12
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
22 Security Hotspots
42.3% Coverage on New Code (required ≥ 80%)
3.4% Duplication on New Code (required ≤ 3%)
E Security Rating on New Code (required ≥ A)
E Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

@kusalk kusalk merged commit 6a6270f into release/struts-6-7-x Jan 22, 2025
9 of 10 checks passed
@kusalk kusalk deleted the WW-5516-fix-temp-theme-fallback branch January 22, 2025 02:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants