hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Moving Pattern to final static

Browse Source
This commit is contained in:
Sergey
2017-02-28 14:11:49 -08:00
committed by Juan Martín Sotuyo Dodero
parent 4c748d961f
commit 51058cccfa
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/security/VfUnescapeElRule.java
View File

@ -40,6 +40,8 @@ public class VfUnescapeElRule extends AbstractVfRule {
private static final String APEX_PAGE_MESSAGES = "apex:pagemessages"; private static final String APEX_PAGE_MESSAGES = "apex:pagemessages";
private static final String APEX_SELECT_OPTION = "apex:selectoption"; private static final String APEX_SELECT_OPTION = "apex:selectoption";
private static final String FALSE = "false"; private static final String FALSE = "false";
private static final Pattern ON_EVENT = Pattern.compile("^on(\\w)+$");
private static final Pattern PLACEHOLDERS = Pattern.compile("\\{(\\w|,|\\.|'|:|\\s)*\\}");
@Override @Override
public Object visit(ASTElement node, Object data) { public Object visit(ASTElement node, Object data) {
@ -60,7 +62,8 @@ public class VfUnescapeElRule extends AbstractVfRule {
for (ASTAttribute attr : attributes) { for (ASTAttribute attr : attributes) {
String name = attr.getName().toLowerCase(); String name = attr.getName().toLowerCase();
// look for onevents // look for onevents
if (Pattern.compile("^on(\\w)+$").matcher(name).matches()) {
if (ON_EVENT.matcher(name).matches()) {
final List<ASTElExpression> elsInVal = attr.findDescendantsOfType(ASTElExpression.class); final List<ASTElExpression> elsInVal = attr.findDescendantsOfType(ASTElExpression.class);
for (ASTElExpression el : elsInVal) { for (ASTElExpression el : elsInVal) {
if (doesElContainAnyUnescapedIdentifiers(el, if (doesElContainAnyUnescapedIdentifiers(el,
@ -158,7 +161,8 @@ public class VfUnescapeElRule extends AbstractVfRule {
final ASTText textValue = attr.getFirstDescendantOfType(ASTText.class); final ASTText textValue = attr.getFirstDescendantOfType(ASTText.class);
if (textValue != null) { if (textValue != null) {
if (Pattern.compile("\\{(\\w|,|\\.|'|:|\\s)*\\}").matcher(textValue.getImage()).matches()) {
if (PLACEHOLDERS.matcher(textValue.getImage()).matches()) {
hasPlaceholders = true; hasPlaceholders = true;
} }
} }