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

Merge branch 'pr-280' into pmd/5.5.x

Browse Source
This commit is contained in:
Juan Martín Sotuyo Dodero
2017-03-01 12:28:58 -03:00
parent 2dc0937350 b183caeec1
commit b8d034cb87
3 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/security/ApexCRUDViolationRule.java
View File

@ -53,7 +53,9 @@ import net.sourceforge.pmd.lang.ast.Node;
*
*/
public class ApexCRUDViolationRule extends AbstractApexRule {
private static final Pattern p = Pattern.compile("^(string|void)$", Pattern.CASE_INSENSITIVE);
private static final Pattern VOID_OR_STRING_PATTERN = Pattern.compile("^(string|void)$", Pattern.CASE_INSENSITIVE);
private static final Pattern SELECT_FROM_PATTERN = Pattern.compile("^[\\S|\\s]+?FROM[\\s]+?(\\S+)",
Pattern.CASE_INSENSITIVE);
private final HashMap<String, String> varToTypeMapping = new HashMap<>();
private final ListMultimap<String, String> typeToDMLOperationMapping = ArrayListMultimap.create();
@ -477,6 +479,7 @@ public class ApexCRUDViolationRule extends AbstractApexRule {
private void checkForAccessibility(final ASTSoqlExpression node, Object data) {
final boolean isCount = node.getNode().getCanonicalQuery().startsWith("SELECT COUNT()");
final String typeFromSOQL = getTypeFromSOQLQuery(node);
final HashSet<ASTMethodCallExpression> prevCalls = getPreviousMethodCalls(node);
for (ASTMethodCallExpression prevCall : prevCalls) {
@ -507,7 +510,7 @@ public class ApexCRUDViolationRule extends AbstractApexRule {
.append(":").append(type);
if (!isGetter) {
validateCRUDCheckPresent(node, data, ANY, typeCheck.toString());
validateCRUDCheckPresent(node, data, ANY, typeFromSOQL == null ? typeCheck.toString() : typeFromSOQL);
}
}
@ -520,7 +523,7 @@ public class ApexCRUDViolationRule extends AbstractApexRule {
if (varToTypeMapping.containsKey(variableWithClass)) {
String type = varToTypeMapping.get(variableWithClass);
if (!isGetter) {
validateCRUDCheckPresent(node, data, ANY, type);
validateCRUDCheckPresent(node, data, ANY, typeFromSOQL == null ? type : typeFromSOQL);
}
}
}
@ -530,11 +533,23 @@ public class ApexCRUDViolationRule extends AbstractApexRule {
final ASTReturnStatement returnStatement = node.getFirstParentOfType(ASTReturnStatement.class);
if (returnStatement != null) {
if (!isGetter) {
validateCRUDCheckPresent(node, data, ANY, returnType == null ? "" : returnType);
String retType = typeFromSOQL == null ? returnType : typeFromSOQL;
validateCRUDCheckPresent(node, data, ANY, retType == null ? "" : retType);
}
}
}
private String getTypeFromSOQLQuery(final ASTSoqlExpression node) {
final String canonQuery = node.getNode().getCanonicalQuery();
Matcher m = SELECT_FROM_PATTERN.matcher(canonQuery);
while (m.find()) {
return new StringBuffer().append(node.getNode().getDefiningType().getApexName()).append(":")
.append(m.group(1)).toString();
}
return null;
}
private String getReturnType(final ASTMethod method) {
return new StringBuilder().append(method.getNode().getDefiningType().getApexName()).append(":")
.append(method.getNode().getMethodInfo().getEmitSignature().getReturnType().getApexName()).toString();
@ -542,7 +557,7 @@ public class ApexCRUDViolationRule extends AbstractApexRule {
private boolean isMethodAGetter(final ASTMethod method) {
final boolean startsWithGet = method.getNode().getMethodInfo().getCanonicalName().startsWith("get");
final boolean voidOrString = p
final boolean voidOrString = VOID_OR_STRING_PATTERN
.matcher(method.getNode().getMethodInfo().getEmitSignature().getReturnType().getApexName()).matches();
final boolean noParams = method.findChildrenOfType(ASTParameter.class).isEmpty();

34
pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/security/xml/ApexCRUDViolation.xml
View File

@ -2,6 +2,37 @@
<test-data>
<test-code>
<description>Proper CRUD checks for Aggregate Result</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
public class Foo {
public void justGiveMeFoo() {
if (Opportunity.sObjectType.getDescribe().isAccessible()) {
return;
}
AggregateResult[] test = [SELECT Id FROM Opportunity];
}
}
]]></code>
</test-code>
<test-code>
<description>Proper CRUD checks for Aggregate Result return</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
public class Foo {
public AggregateResult[] justGiveMeFoo() {
if (Opportunity.sObjectType.getDescribe().isAccessible()) {
return null;
}
return [SELECT Id FROM Opportunity];
}
}
]]></code>
</test-code>
<test-code>
<description>Not a getter</description>
<expected-problems>1</expected-problems>
@ -688,7 +719,7 @@ public class Foo {
}
]]></code>
</test-code>
<test-code>
<description>Field detection</description>
<expected-problems>1</expected-problems>
@ -703,5 +734,4 @@ public class MyProfilePageController {
]]></code>
</test-code>
</test-data>

1
src/site/markdown/overview/changelog.md
View File

@ -20,3 +20,4 @@ The PMD team is pleased to announce PMD 5.5.5.
### External Contributions
* [#280](https://github.com/pmd/pmd/pull/280): \[apex] Support for Aggregate Result in CRUD rules