phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NOT(..) is a safe evaluation

Browse Source
This commit is contained in:
Sergey
2017-04-12 15:08:21 -07:00
parent 523495750f
commit e7bcf6fdfa
4 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pmd-visualforce/etc/grammar/VfParser.jjt
View File

@ -145,7 +145,7 @@ PARSER_END(VfParser)
| <GE: ">=" >
| <LT: "<" >
| <GT: ">" >
| <EXCL: ("!"|"~"|"NOT") >
| <EXCL: ("!"|"~") >
| <PIPE_PIPE: "||" >
| <STRING_LITERAL: <QUOTED_STRING> >
| <DIGITS: (<NUM_CHAR>)+ (<DOT> (<NUM_CHAR>)+)? >
@ -476,10 +476,10 @@ void UnaryExpression() #void :
{}
{
( <PLUS> | <MINUS> ) UnaryExpression()
| UnaryExpressionNotPlusMinus()
| NegationExpression()
}
void UnaryExpressionNotPlusMinus() #void :
void NegationExpression() #void :
{}
{
( <EXCL> ) UnaryExpression()

2
pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfParserVisitorAdapter.java
View File

@ -93,5 +93,5 @@ public class VfParserVisitorAdapter implements VfParserVisitor {
public Object visit(ASTContent node, Object data) {
return visit((VfNode) node, data);
}
}

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

@ -230,20 +230,24 @@ public class VfUnescapeElRule extends AbstractVfRule {
if (expression != null) {
final ASTIdentifier id = expression.getFirstChildOfType(ASTIdentifier.class);
if (id != null) {
switch (id.getImage().toLowerCase()) {
case "$component":
case "$objecttype":
case "$label":
case "$resource":
case "urlfor":
case "$site":
case "$page":
case "$action":
case "casesafeid":
case "$remoteaction":
return true;
List<ASTArguments> args = expression.findChildrenOfType(ASTArguments.class);
if (!args.isEmpty()) {
switch (id.getImage().toLowerCase()) {
case "$component":
case "$objecttype":
case "$label":
case "$resource":
case "urlfor":
case "$site":
case "$page":
case "$action":
case "casesafeid":
case "not":
case "$remoteaction":
return true;
default:
default:
}
}
}

15
pmd-visualforce/src/test/resources/net/sourceforge/pmd/lang/vf/rule/security/xml/VfUnescapeEl.xml
View File

@ -557,5 +557,20 @@ Safe unquoted followed by safe quoted
]]></code>
<source-type>vf</source-type>
</test-code>
<test-code>
<description><![CDATA[
NOT method evaluates to safe boolean
]]></description>
<expected-problems>0</expected-problems>
<code><![CDATA[
<apex:page>
<script>
if({!NOT(yes)}) { maskFormEls(); }
</script>
</apex:page>
]]></code>
<source-type>vf</source-type>
</test-code>
</test-data>