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

Merge branch 'CRUDClassCastExceptionFix' of https://github.com/sgorbaty/pmd into pr-344

Browse Source
This commit is contained in:
Andreas Dangel
2017-04-22 11:11:29 +02:00
parent d60fdf7656 31a42121e8
commit 81892a58fe
2 changed files with 61 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@ import net.sourceforge.pmd.lang.ast.Node;
import apex.jorje.data.ast.Identifier;
import apex.jorje.data.ast.TypeRef;
import apex.jorje.data.ast.TypeRef.ArrayTypeRef;
import apex.jorje.data.ast.TypeRef.ClassTypeRef;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
@ -183,30 +184,33 @@ public class ApexCRUDViolationRule extends AbstractApexRule {
classNameField.setAccessible(true);
typeArgsField.setAccessible(true);
if (typeArgsField.get(a) instanceof Optional<?>) {
Optional<?> optionalContainer = (Optional<?>) typeArgsField.get(a);
if (optionalContainer.isPresent()) {
@SuppressWarnings("unchecked")
ArrayList<ClassTypeRef> inner = (ArrayList<ClassTypeRef>) optionalContainer.get();
if (!inner.isEmpty()) {
ClassTypeRef innerClassRef = inner.get(0);
List<Identifier> ids = innerClassRef.className;
String argType = ids.get(0).value;
addVariableToMapping(Helper.getFQVariableName(node), argType);
}
}
}
if (classNameField.get(a) instanceof ArrayList<?>) {
@SuppressWarnings("unchecked")
ArrayList<Identifier> innerField = (ArrayList<Identifier>) classNameField.get(a);
if (!innerField.isEmpty()) {
String type = innerField.get(0).value;
addVariableToMapping(Helper.getFQVariableName(node), type);
StringBuffer sb = new StringBuffer();
for (Identifier id : innerField) {
sb.append(id.value).append(".");
}
sb.deleteCharAt(sb.length() - 1);
switch (sb.toString().toLowerCase()) {
case "list":
case "map":
if (typeArgsField.get(a) instanceof Optional<?>) {
addParametersToMapping(node, a, typeArgsField);
}
break;
default:
varToTypeMapping.put(Helper.getFQVariableName(node), getSimpleType(sb.toString()));
break;
}
}
}
} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException | SecurityException e) {
e.printStackTrace();
}
}
@ -219,6 +223,36 @@ public class ApexCRUDViolationRule extends AbstractApexRule {
}
private void addParametersToMapping(final ASTFieldDeclaration node, TypeRef a, Field typeArgsField)
throws IllegalAccessException {
Optional<?> optionalContainer = (Optional<?>) typeArgsField.get(a);
if (optionalContainer.isPresent()) {
ArrayList<?> inner = (ArrayList<?>) optionalContainer.get();
for (int i = 0; i < inner.size(); i++) {
if (inner.get(i) instanceof ClassTypeRef) {
innerAddParametrizedClassToMapping(node, (ClassTypeRef) inner.get(i));
}
if (inner.get(i) instanceof ArrayTypeRef) {
ArrayTypeRef atr = (ArrayTypeRef) inner.get(i);
if (atr.heldType instanceof ClassTypeRef) {
innerAddParametrizedClassToMapping(node, (ClassTypeRef) atr.heldType);
}
}
}
}
}
private void innerAddParametrizedClassToMapping(final ASTFieldDeclaration node, final ClassTypeRef innerClassRef) {
List<Identifier> ids = innerClassRef.className;
StringBuffer argType = new StringBuffer();
for (Identifier id : ids) {
argType.append(id.value).append(".");
}
argType.deleteCharAt(argType.length() - 1);
addVariableToMapping(Helper.getFQVariableName(node), argType.toString());
}
@Override
public Object visit(final ASTReturnStatement node, Object data) {
final ASTSoqlExpression soql = node.getFirstChildOfType(ASTSoqlExpression.class);

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

@ -798,6 +798,17 @@ public class MyProfilePageController {
}
}
]]></code>
</test-code>
<test-code>
<description>ClassCastException detection</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
public class Foo {
public list<A.B[]> bar;
public map<Id,A.B[]> baz;
}
]]></code>
</test-code>
</test-data>