diff --git a/java/ql/lib/change-notes/2026-11-11-filenameutils-normalize.md b/java/ql/lib/change-notes/2026-11-11-filenameutils-normalize.md new file mode 100644 index 000000000000..8b53ee2a50d7 --- /dev/null +++ b/java/ql/lib/change-notes/2026-11-11-filenameutils-normalize.md @@ -0,0 +1,4 @@ +--- +category: minorAnalysis +--- +* Added contextual path-normalization recognition for `org.apache.commons.io.FilenameUtils.normalize`, reducing path-injection false positives. \ No newline at end of file diff --git a/java/ql/lib/semmle/code/java/security/PathSanitizer.qll b/java/ql/lib/semmle/code/java/security/PathSanitizer.qll index 6648f1b948e8..363d2720fede 100644 --- a/java/ql/lib/semmle/code/java/security/PathSanitizer.qll +++ b/java/ql/lib/semmle/code/java/security/PathSanitizer.qll @@ -292,6 +292,9 @@ private class PathNormalizeSanitizer extends MethodCall { or t instanceof TypeFile and this.getMethod().hasName(["getCanonicalPath", "getCanonicalFile"]) + or + t.hasQualifiedName("org.apache.commons.io", "FilenameUtils") and + this.getMethod().hasName("normalize") ) } } diff --git a/java/ql/test/library-tests/pathsanitizer/Test.java b/java/ql/test/library-tests/pathsanitizer/Test.java index 44a1110d0a9a..e956fdab535f 100644 --- a/java/ql/test/library-tests/pathsanitizer/Test.java +++ b/java/ql/test/library-tests/pathsanitizer/Test.java @@ -4,6 +4,7 @@ import java.nio.file.Paths; import android.net.Uri; import com.google.common.base.CharMatcher; +import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; public class Test { @@ -623,6 +624,17 @@ public void fileConstructorSanitizer() throws Exception { sink(source); // $ hasTaintFlow sink(normalized); // $ hasTaintFlow } + { + String source = (String) source(); + String normalized = FilenameUtils.normalize(source); + String normalizedWithSeparator = FilenameUtils.normalize(source, true); + File f1 = new File("safe/file.txt"); + File f2 = new File(f1, normalized); + File f3 = new File(f1, normalizedWithSeparator); + sink(f2); // Safe + sink(f3); // Safe + sink(normalized); // $ hasTaintFlow + } } private void directoryCharsValidation(String path) throws Exception { diff --git a/java/ql/test/library-tests/pathsanitizer/options b/java/ql/test/library-tests/pathsanitizer/options index 816c75501e1d..6fe8083bd4cb 100644 --- a/java/ql/test/library-tests/pathsanitizer/options +++ b/java/ql/test/library-tests/pathsanitizer/options @@ -1,2 +1,2 @@ -//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/google-android-9.0.0:${testdir}/../../stubs/apache-commons-lang3-3.7:${testdir}/../../stubs/guava-30.0 +//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/google-android-9.0.0:${testdir}/../../stubs/apache-commons-lang3-3.7:${testdir}/../../stubs/guava-30.0:${testdir}/../../stubs/apache-commons-io-2.6 //codeql-extractor-kotlin-options: ${testdir}/../../stubs/google-android-9.0.0 diff --git a/java/ql/test/stubs/apache-commons-io-2.6/org/apache/commons/io/FilenameUtils.java b/java/ql/test/stubs/apache-commons-io-2.6/org/apache/commons/io/FilenameUtils.java new file mode 100644 index 000000000000..4321407940b5 --- /dev/null +++ b/java/ql/test/stubs/apache-commons-io-2.6/org/apache/commons/io/FilenameUtils.java @@ -0,0 +1,6 @@ +package org.apache.commons.io; + +public class FilenameUtils { + public static String normalize(String filename) { return null; } + public static String normalize(String filename, boolean unixSeparator) { return null; } +}