You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@struts.apache.org by "kusalk (via GitHub)" <gi...@apache.org> on 2025/01/20 03:23:54 UTC
[PR] WW-5516 Fix TemplateDir and Theme fallback to Request/Session/Application attributes [struts]
kusalk opened a new pull request, #1190:
URL: https://github.com/apache/struts/pull/1190
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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] WW-5516 Fix TemplateDir and Theme fallback to Request/Session/Application attributes [struts]
Posted by "kusalk (via GitHub)" <gi...@apache.org>.
kusalk merged PR #1190:
URL: https://github.com/apache/struts/pull/1190
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] WW-5516 Fix TemplateDir and Theme fallback to Request/Session/Application attributes [struts]
Posted by "sonarqubecloud[bot] (via GitHub)" <gi...@apache.org>.
sonarqubecloud[bot] commented on PR #1190:
URL: https://github.com/apache/struts/pull/1190#issuecomment-2601256206
## [](https://sonarcloud.io/dashboard?id=apache_struts&pullRequest=1190) **Quality Gate failed**
Failed conditions
 [22 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_struts&pullRequest=1190&issueStatuses=OPEN,CONFIRMED&sinceLeakPeriod=true)
 [42.2% Coverage on New Code](https://sonarcloud.io/component_measures?id=apache_struts&pullRequest=1190&metric=new_coverage&view=list) (required ≥ 80%)
 [3.4% Duplication on New Code](https://sonarcloud.io/component_measures?id=apache_struts&pullRequest=1190&metric=new_duplicated_lines_density&view=list) (required ≤ 3%)
 [E Reliability Rating on New Code](https://sonarcloud.io/dashboard?id=apache_struts&pullRequest=1190) (required ≥ A)
 [E Security Rating on New Code](https://sonarcloud.io/dashboard?id=apache_struts&pullRequest=1190) (required ≥ A)
[See analysis details on SonarQube Cloud](https://sonarcloud.io/dashboard?id=apache_struts&pullRequest=1190)
##
 Catch issues before they fail your Quality Gate with our IDE extension  [SonarQube for IDE](https://www.sonarsource.com/products/sonarlint/features/connected-mode/?referrer=pull-request)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] WW-5516 Fix TemplateDir and Theme fallback to Request/Session/Application attributes [struts]
Posted by "sonarqubecloud[bot] (via GitHub)" <gi...@apache.org>.
sonarqubecloud[bot] commented on PR #1190:
URL: https://github.com/apache/struts/pull/1190#issuecomment-2604133860
## [](https://sonarcloud.io/dashboard?id=apache_struts&pullRequest=1190) **Quality Gate failed**
Failed conditions
 [22 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_struts&pullRequest=1190&issueStatuses=OPEN,CONFIRMED&sinceLeakPeriod=true)
 [42.3% Coverage on New Code](https://sonarcloud.io/component_measures?id=apache_struts&pullRequest=1190&metric=new_coverage&view=list) (required ≥ 80%)
 [3.4% Duplication on New Code](https://sonarcloud.io/component_measures?id=apache_struts&pullRequest=1190&metric=new_duplicated_lines_density&view=list) (required ≤ 3%)
 [E Security Rating on New Code](https://sonarcloud.io/dashboard?id=apache_struts&pullRequest=1190) (required ≥ A)
 [E Reliability Rating on New Code](https://sonarcloud.io/dashboard?id=apache_struts&pullRequest=1190) (required ≥ A)
[See analysis details on SonarQube Cloud](https://sonarcloud.io/dashboard?id=apache_struts&pullRequest=1190)
##
 Catch issues before they fail your Quality Gate with our IDE extension  [SonarQube for IDE](https://www.sonarsource.com/products/sonarlint/features/connected-mode/?referrer=pull-request)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] WW-5516 Fix TemplateDir and Theme fallback to Request/Session/Application attributes [struts]
Posted by "kusalk (via GitHub)" <gi...@apache.org>.
kusalk commented on code in PR #1190:
URL: https://github.com/apache/struts/pull/1190#discussion_r1923325870
##########
core/src/test/java/org/apache/struts2/components/UIBeanTagTest.java:
##########
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.components;
+
+import org.apache.struts2.ActionContext;
+import org.apache.struts2.dispatcher.DispatcherConstants;
+import org.apache.struts2.views.jsp.AbstractTagTest;
+
+import java.util.Map;
+
+import static org.apache.struts2.components.UIBean.TEMPLATE_DIR;
+import static org.apache.struts2.components.UIBean.THEME;
+
+public class UIBeanTagTest extends AbstractTagTest {
+
+ private UIBean bean;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ bean = new UIBean(stack, request, response) {
+ @Override
+ protected String getDefaultTemplate() {
+ return null;
+ }
+ };
+ }
+
+ public void testTemplateDir_ognlExpression() {
+ bean.setTemplateDir("%{testDir}");
+ stack.push(new Object() {
+ public String getTestDir() {
+ return "testValue";
+ }
+ });
+
+ assertEquals("testValue", bean.getTemplateDir());
+ }
+
+ public void testTemplateDir_attrMapFallback() {
+ bean.setTemplateDir("%{testDir}");
Review Comment:
Sorry that was a mistake, fixed!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] WW-5516 Fix TemplateDir and Theme fallback to Request/Session/Application attributes [struts]
Posted by "lukaszlenart (via GitHub)" <gi...@apache.org>.
lukaszlenart commented on code in PR #1190:
URL: https://github.com/apache/struts/pull/1190#discussion_r1921891441
##########
core/src/test/java/org/apache/struts2/components/UIBeanTagTest.java:
##########
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.components;
+
+import org.apache.struts2.ActionContext;
+import org.apache.struts2.dispatcher.DispatcherConstants;
+import org.apache.struts2.views.jsp.AbstractTagTest;
+
+import java.util.Map;
+
+import static org.apache.struts2.components.UIBean.TEMPLATE_DIR;
+import static org.apache.struts2.components.UIBean.THEME;
+
+public class UIBeanTagTest extends AbstractTagTest {
+
+ private UIBean bean;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ bean = new UIBean(stack, request, response) {
+ @Override
+ protected String getDefaultTemplate() {
+ return null;
+ }
+ };
+ }
+
+ public void testTemplateDir_ognlExpression() {
+ bean.setTemplateDir("%{testDir}");
+ stack.push(new Object() {
+ public String getTestDir() {
+ return "testValue";
+ }
+ });
+
+ assertEquals("testValue", bean.getTemplateDir());
+ }
+
+ public void testTemplateDir_attrMapFallback() {
+ bean.setTemplateDir("%{testDir}");
Review Comment:
Doesn't this test depend on the `testTemplateDir_ognlExpression`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@struts.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org