Revert "Decouple from #10177"

This reverts commit 7b34b10.

Author: atorralba

java/ql/lib/semmle/code/java/security/UnsafeContentUriResolution.qll

@@ -3,6 +3,7 @@
 import java
 private import semmle.code.java.dataflow.TaintTracking
 private import semmle.code.java.frameworks.android.Android
+private import semmle.code.java.security.PathSanitizer
 
 /** A URI that gets resolved by a `ContentResolver`. */
 abstract class ContentUriResolutionSink extends DataFlow::Node { }
@@ -49,6 +50,9 @@ private class UninterestingTypeSanitizer extends ContentUriResolutionSanitizer {
   }
 }
 
+private class PathSanitizer extends ContentUriResolutionSanitizer instanceof PathInjectionSanitizer {
+}
+
 private class FilenameOnlySanitizer extends ContentUriResolutionSanitizer {
   FilenameOnlySanitizer() {
     exists(Method m | this.asExpr().(MethodAccess).getMethod() = m |

java/ql/test/query-tests/security/CWE-441/Test.java

@@ -53,13 +53,13 @@ public void onCreate() {
             Uri uri = (Uri) getIntent().getParcelableExtra("URI_EXTRA");
             if (!uri.equals(Uri.parse("content://safe/uri")))
                 throw new SecurityException();
-            contentResolver.openInputStream(uri); // $ SPURIOUS: hasTaintFlow
+            contentResolver.openInputStream(uri); // Safe
         }
         {
             ContentResolver contentResolver = getContentResolver();
             Uri uri = (Uri) getIntent().getParcelableExtra("URI_EXTRA");
             validateWithEquals(uri);
-            contentResolver.openInputStream(uri); // $ SPURIOUS: hasTaintFlow
+            contentResolver.openInputStream(uri); // Safe
         }
         // Allow list checks
         {
@@ -78,13 +78,13 @@ public void onCreate() {
                     java.nio.file.FileSystems.getDefault().getPath(path).normalize();
             if (!normalized.startsWith("/safe/path"))
                 throw new SecurityException();
-            contentResolver.openInputStream(uri); // $ SPURIOUS: hasTaintFlow
+            contentResolver.openInputStream(uri); // Safe
         }
         {
             ContentResolver contentResolver = getContentResolver();
             Uri uri = (Uri) getIntent().getParcelableExtra("URI_EXTRA");
             validateWithAllowList(uri);
-            contentResolver.openInputStream(uri);// $ SPURIOUS: hasTaintFlow
+            contentResolver.openInputStream(uri); // Safe
         }
         // Block list checks
         {
@@ -103,13 +103,13 @@ public void onCreate() {
                     java.nio.file.FileSystems.getDefault().getPath(path).normalize();
             if (normalized.startsWith("/data"))
                 throw new SecurityException();
-            contentResolver.openInputStream(uri); // $ SPURIOUS: hasTaintFlow
+            contentResolver.openInputStream(uri); // Safe
         }
         {
             ContentResolver contentResolver = getContentResolver();
             Uri uri = (Uri) getIntent().getParcelableExtra("URI_EXTRA");
             validateWithBlockList(uri);
-            contentResolver.openInputStream(uri); // $ SPURIOUS: hasTaintFlow
+            contentResolver.openInputStream(uri); // Safe
         }
     }
 }