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.

Sign up for GitHub

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

CVE-2014-0114 Fix #1

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

CVE-2014-0114 Fix #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions core/src/main/java/org/apache/struts/util/RequestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
Expand All @@ -55,6 +54,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.regex.Pattern;

/**
* <p>General purpose utility methods related to processing a servlet request
Expand All @@ -70,6 +70,13 @@ public class RequestUtils {
*/
protected static Log log = LogFactory.getLog(RequestUtils.class);

/**
* <p>Pattern matching 'class' access.</p>
*/
protected static final Pattern CLASS_ACCESS_PATTERN = Pattern
.compile("(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*",
Pattern.CASE_INSENSITIVE);

// --------------------------------------------------------- Public Methods

/**
Expand Down Expand Up @@ -464,7 +471,8 @@ public static void populate(Object bean, String prefix, String suffix,

// Populate parameters, except "standard" struts attributes
// such as 'org.apache.struts.action.CANCEL'
if (!(stripped.startsWith("org.apache.struts."))) {
if (!(stripped.startsWith("org.apache.struts."))
&& !CLASS_ACCESS_PATTERN.matcher(stripped).matches()) {
properties.put(stripped, parameterValue);
}
}
Expand Down