[
https://issues.apache.org/jira/browse/WW-5184?focusedWorklogId=778113&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-778113
]
ASF GitHub Bot logged work on WW-5184:
--------------------------------------
Author: ASF GitHub Bot
Created on: 03/Jun/22 14:39
Start Date: 03/Jun/22 14:39
Worklog Time Spent: 10m
Work Description: brianandle commented on code in PR #557:
URL: https://github.com/apache/struts/pull/557#discussion_r889007813
##########
core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java:
##########
@@ -292,6 +327,28 @@ protected boolean acceptableName(String name) {
return accepted;
}
+ /**
+ * Validates:
+ * * Name is within the max length of a parameter name
+ * * Name is not excluded
+ * * Name is accepted
+ * * Value is null/blank
+ * * Value is not excluded
+ * * Value is accepted
+ *
+ * @param name - Name to check
+ * @param value - value to check
+ * @return true if accepted
+ */
+ protected boolean acceptableNameValue(String name, String value) {
+ boolean accepted = isWithinLengthLimit(name) && !isExcluded(name) &&
isAccepted(name)
+ && (value == null || value.isEmpty() ||
(!isParamValueExcluded(value) && isParamValueAccepted(value)));
+ if (devMode && accepted) { // notify only when in devMode
+ LOG.debug("Parameter [{}] was accepted with value [{}] and will be
appended to action!", name, value);
Review Comment:
Done
Issue Time Tracking
-------------------
Worklog Id: (was: 778113)
Time Spent: 50m (was: 40m)
> Add optional parameter value check to ParametersInterceptor
> -----------------------------------------------------------
>
> Key: WW-5184
> URL: https://issues.apache.org/jira/browse/WW-5184
> Project: Struts 2
> Issue Type: Improvement
> Reporter: Brian Andle
> Priority: Major
> Time Spent: 50m
> Remaining Estimate: 0h
>
> It is known that developers utilizing Struts/Freemarker should always ensure
> proper sanitization to prevent OGNL/Freemarker evaluation on untrusted user
> input when %{/$\{ in FTL being passed into Struts tags.
> These patterns aren't always practical to resolve/find especially in legacy
> code. This isn't a solely a legacy code of course it's just as easy to make a
> mistake in newer code as well.
> The following would end up rendering 81
> Payload:
> {code:java}
> untrustedInput=%25%7B9%2A9%7D {code}
> FTL:
>
> {code:java}
> <@s.form theme="simple" action="${untrustedInput}" id="myForm4">
> </@s.form> {code}
>
> Java:
> {code:java}
> private String untrustedInput;
> public String getUntrustedInput() {
> return untrustedInput;
> }
> public void setUntrustedInput(String untrustedInput) {
> this.untrustedInput = untrustedInput;
> } {code}
>
> This ticket is to add an optional `params.excludeValuePatterns` so that
> ParametersInterceptor can drop incoming parameter itself if the value matches
> a pattern to be excluded.
>
> {code:java}
> <param
> name="params.excludeValuePatterns">.*\$\{.*?\}.*,.*%\{.*?\}.*</param>{code}
>
> Since this is a pattern and would be executed against the values themselves
> there is the potential of a performance impact however I since it's optional
> we shouldn't see any measurable impact when not enabled.
>
> *NOTE:* I did add a `params.acceptValuePatterns` pattern that is
> null/disabled by default. This might not ever be used but mimic'd the Pattern
> matcher the ParametersInterceptor/CookieInterceptor.
>
--
This message was sent by Atlassian Jira
(v8.20.7#820007)
