Skip to content

Commit f96a3d0

Browse files
Luqmansonarclaude
andauthored
SONARJAVA-6383 Fix FP on S2077 when using conditional operators or integer constants (#6406)
Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
1 parent 6acced2 commit f96a3d0

2 files changed

Lines changed: 22 additions & 3 deletions

File tree

‎java-checks-test-sources/default/src/main/java/checks/SQLInjection.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ private static void makeQuery(Connection p_con) {
187187
PersistenceManager pm;
188188

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

@@ -391,4 +391,15 @@ public void plusAssignmentClassName(String input) throws SQLException {
391391
query3 += SQLInjection.class.getName() + input;
392392
this.stmt.execute(query3); // Noncompliant
393393
}
394+
395+
public void constantTernaryAndPrimitives(boolean asc, int offset, Integer limit, String input, EntityManager em) {
396+
em.createNativeQuery("SELECT * FROM entity ORDER BY x " + (asc ? "ASC" : "DESC")); // Compliant
397+
em.createNativeQuery("SELECT * FROM entity OFFSET " + offset + " LIMIT " + limit); // Compliant
398+
String query = "SELECT * FROM entity OFFSET " + offset;
399+
query += " LIMIT " + limit;
400+
em.createNativeQuery(query); // Compliant
401+
em.createNativeQuery("SELECT * FROM entity ORDER BY " + (asc ? "ASC" : input)); // Noncompliant
402+
em.createNativeQuery("SELECT * FROM entity ORDER BY " + (asc ? input : "DESC")); // Noncompliant
403+
em.createNativeQuery("SELECT * FROM entity ORDER BY " + (asc ? (offset > 0 ? "A" : "B") : "C")); // Compliant
404+
}
394405
}

‎java-checks/src/main/java/org/sonar/java/checks/SQLInjectionCheck.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.sonar.plugins.java.api.semantic.Type;
3636
import org.sonar.plugins.java.api.tree.AssignmentExpressionTree;
3737
import org.sonar.plugins.java.api.tree.BinaryExpressionTree;
38+
import org.sonar.plugins.java.api.tree.ConditionalExpressionTree;
3839
import org.sonar.plugins.java.api.tree.ExpressionTree;
3940
import org.sonar.plugins.java.api.tree.IdentifierTree;
4041
import org.sonar.plugins.java.api.tree.MethodInvocationTree;
@@ -226,15 +227,22 @@ private static boolean isDynamicConcatenation(ExpressionTree arg) {
226227

227228
private static boolean hasDynamicConcatenationOperand(ExpressionTree arg) {
228229
ExpressionTree expression = ExpressionUtils.skipParentheses(arg);
229-
if (expression.asConstant().isPresent() || isSafeClassNameExpression(expression, new HashSet<>())) {
230+
if (expression.asConstant().isPresent() || isPrimitiveOrWrapper(expression.symbolType()) || isSafeClassNameExpression(expression, new HashSet<>())) {
230231
return false;
231232
}
233+
if (expression instanceof ConditionalExpressionTree conditional) {
234+
return hasDynamicConcatenationOperand(conditional.trueExpression()) || hasDynamicConcatenationOperand(conditional.falseExpression());
235+
}
232236
if (expression instanceof BinaryExpressionTree binaryExpression && expression.is(Tree.Kind.PLUS)) {
233237
return hasDynamicConcatenationOperand(binaryExpression.leftOperand()) || hasDynamicConcatenationOperand(binaryExpression.rightOperand());
234238
}
235239
return true;
236240
}
237241

242+
private static boolean isPrimitiveOrWrapper(Type type) {
243+
return type.isPrimitive() || type.isPrimitiveWrapper();
244+
}
245+
238246
private static boolean isSafeClassNameExpression(ExpressionTree arg, Set<Symbol> visitedSymbols) {
239247
ExpressionTree expression = ExpressionUtils.skipParentheses(arg);
240248
if (expression instanceof MethodInvocationTree methodInvocation) {
@@ -266,7 +274,7 @@ private static boolean hasDynamicStringParameters(MethodInvocationTree mit) {
266274
// `format` has a variant with Locale as the first argument - we do not need to check that parameter.
267275
boolean isFirstLocaleArgument = firstArg && type.is("java.util.Locale");
268276
// Primitives will not lead to SQL injection, so the code is compliant.
269-
if (!isFirstLocaleArgument && !type.isUnknown() && !type.isPrimitive() && !type.isPrimitiveWrapper()
277+
if (!isFirstLocaleArgument && !type.isUnknown() && !isPrimitiveOrWrapper(type)
270278
&& arg.asConstant().isEmpty() && !isSafeClassNameExpression(arg, new HashSet<>())) {
271279
return true;
272280
}

0 commit comments

Comments
 (0)