Skip to content

SONARJAVA-6383 Fix FP on S2077 when using conditional operators or integer constants #6406

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

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

SONARJAVA-6383 Fix FP on S2077 when using conditional operators or integer constants #6406

Show file tree
Hide file tree
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
13 changes: 12 additions & 1 deletion java-checks-test-sources/default/src/main/java/checks/SQLInjection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ private static void makeQuery(Connection p_con) {
PersistenceManager pm;

void jdo(int id, String name) {
javax.jdo.Query q = pm.newQuery(Test.class, id + " > query_id "); // Noncompliant
javax.jdo.Query q = pm.newQuery(Test.class, id + " > query_id "); // Compliant
q.setFilter("name == " + name); // Noncompliant
}

Expand Down Expand Up @@ -391,4 +391,15 @@ public void plusAssignmentClassName(String input) throws SQLException {
query3 += SQLInjection.class.getName() + input;
this.stmt.execute(query3); // Noncompliant
}

public void constantTernaryAndPrimitives(boolean asc, int offset, Integer limit, String input, EntityManager em) {
em.createNativeQuery("SELECT * FROM entity ORDER BY x " + (asc ? "ASC" : "DESC")); // Compliant
em.createNativeQuery("SELECT * FROM entity OFFSET " + offset + " LIMIT " + limit); // Compliant
String query = "SELECT * FROM entity OFFSET " + offset;
query += " LIMIT " + limit;
em.createNativeQuery(query); // Compliant
em.createNativeQuery("SELECT * FROM entity ORDER BY " + (asc ? "ASC" : input)); // Noncompliant
em.createNativeQuery("SELECT * FROM entity ORDER BY " + (asc ? input : "DESC")); // Noncompliant
em.createNativeQuery("SELECT * FROM entity ORDER BY " + (asc ? (offset > 0 ? "A" : "B") : "C")); // Compliant
}
}
12 changes: 10 additions & 2 deletions java-checks/src/main/java/org/sonar/java/checks/SQLInjectionCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.sonar.plugins.java.api.semantic.Type;
import org.sonar.plugins.java.api.tree.AssignmentExpressionTree;
import org.sonar.plugins.java.api.tree.BinaryExpressionTree;
import org.sonar.plugins.java.api.tree.ConditionalExpressionTree;
import org.sonar.plugins.java.api.tree.ExpressionTree;
import org.sonar.plugins.java.api.tree.IdentifierTree;
import org.sonar.plugins.java.api.tree.MethodInvocationTree;
Expand Down Expand Up @@ -226,15 +227,22 @@ private static boolean isDynamicConcatenation(ExpressionTree arg) {

private static boolean hasDynamicConcatenationOperand(ExpressionTree arg) {
ExpressionTree expression = ExpressionUtils.skipParentheses(arg);
if (expression.asConstant().isPresent() || isSafeClassNameExpression(expression, new HashSet<>())) {
if (expression.asConstant().isPresent() || isPrimitiveOrWrapper(expression.symbolType()) || isSafeClassNameExpression(expression, new HashSet<>())) {
return false;
}
if (expression instanceof ConditionalExpressionTree conditional) {
return hasDynamicConcatenationOperand(conditional.trueExpression()) || hasDynamicConcatenationOperand(conditional.falseExpression());
}
if (expression instanceof BinaryExpressionTree binaryExpression && expression.is(Tree.Kind.PLUS)) {
return hasDynamicConcatenationOperand(binaryExpression.leftOperand()) || hasDynamicConcatenationOperand(binaryExpression.rightOperand());
}
return true;
}

private static boolean isPrimitiveOrWrapper(Type type) {
return type.isPrimitive() || type.isPrimitiveWrapper();
}

private static boolean isSafeClassNameExpression(ExpressionTree arg, Set<Symbol> visitedSymbols) {
ExpressionTree expression = ExpressionUtils.skipParentheses(arg);
if (expression instanceof MethodInvocationTree methodInvocation) {
Expand Down Expand Up @@ -266,7 +274,7 @@ private static boolean hasDynamicStringParameters(MethodInvocationTree mit) {
// `format` has a variant with Locale as the first argument - we do not need to check that parameter.
boolean isFirstLocaleArgument = firstArg && type.is("java.util.Locale");
// Primitives will not lead to SQL injection, so the code is compliant.
if (!isFirstLocaleArgument && !type.isUnknown() && !type.isPrimitive() && !type.isPrimitiveWrapper()
if (!isFirstLocaleArgument && !type.isUnknown() && !isPrimitiveOrWrapper(type)
&& arg.asConstant().isEmpty() && !isSafeClassNameExpression(arg, new HashSet<>())) {
return true;
}
Expand Down
Loading