Move AccessPath into interprocedural and rename as TaintAccessPath

Summary: This change would allow the follow-ups to use `AccessPath.t` in `target.ml`, which would define parameterized callables. This diff also renames `AccessPath` to `TaintAccessPath` to indicate that this is only used by the taint analysis. Reviewed By: arthaud Differential Revision: D64151987 fbshipit-source-id: 64308298322546ac9031c0ef3c0b006b6969cc9d
facebook · Oct 11, 2024 · 4dae77a · 4dae77a
1 parent 04583c0
commit 4dae77a
Show file tree

Hide file tree

Showing 27 changed files with 27 additions and 10 deletions.
diff --git a/source/interprocedural/interprocedural.ml b/source/interprocedural/interprocedural.ml
@@ -7,6 +7,7 @@
 
 (* Taint: here we expose modules for the `pyrelib.interprocedural` library *)
 
+module AccessPath = TaintAccessPath
 module FixpointAnalysis = FixpointAnalysis
 module Target = Target
 module CallGraph = CallGraph

diff --git a/...erprocedural_analyses/taint/accessPath.ml → source/interprocedural/taintAccessPath.ml b/...erprocedural_analyses/taint/accessPath.ml → source/interprocedural/taintAccessPath.ml
@@ -384,7 +384,7 @@ let create root path = { root; path }
 let extend { root; path = original_path } ~path = { root; path = original_path @ path }
 
 let get_index expression =
-  match Interprocedural.CallResolution.extract_constant_name expression with
+  match CallResolution.extract_constant_name expression with
   | Some "True" -> Abstract.TreeDomain.Label.Index "1"
   | Some "False" -> Abstract.TreeDomain.Label.Index "0"
   | Some name -> Abstract.TreeDomain.Label.Index name

diff --git a/...rprocedural_analyses/taint/accessPath.mli → source/interprocedural/taintAccessPath.mli b/...rprocedural_analyses/taint/accessPath.mli → source/interprocedural/taintAccessPath.mli
diff --git a/source/interprocedural/test/dune b/source/interprocedural/test/dune
@@ -11,7 +11,8 @@
   fetchCallablesTest
   overrideGraphTest
   changedPathsTest
-  globalConstantsTest)
+  globalConstantsTest
+  taintAccessPathTest)
  (preprocess
   (pps
    ppx_deriving.eq

diff --git a/...ral_analyses/taint/test/accessPathTest.ml → ...terprocedural/test/taintAccessPathTest.ml b/...ral_analyses/taint/test/accessPathTest.ml → ...terprocedural/test/taintAccessPathTest.ml
@@ -7,8 +7,8 @@
 
 open OUnit2
 open Core
-open Taint
 open Test
+module AccessPath = Interprocedural.AccessPath
 
 let test_of_expression _ =
   let ( !+ ) expression = Test.parse_single_expression expression in

diff --git a/...al_analyses/taint/test/accessPathTest.mli → ...erprocedural/test/taintAccessPathTest.mli b/...al_analyses/taint/test/accessPathTest.mli → ...erprocedural/test/taintAccessPathTest.mli
diff --git a/source/interprocedural_analyses/taint/annotationParser.ml b/source/interprocedural_analyses/taint/annotationParser.ml
@@ -11,6 +11,7 @@
 
 open Core
 open Result
+module AccessPath = Interprocedural.AccessPath
 
 (* Represents a source or sink kind from a model (e.g, UserControlled). *)
 module KindExpression = struct

diff --git a/source/interprocedural_analyses/taint/annotationParser.mli b/source/interprocedural_analyses/taint/annotationParser.mli
@@ -12,7 +12,7 @@ module KindExpression : sig
         name: string;
         subkind: string option;
       }
-    | Updates of AccessPath.Root.t
+    | Updates of Interprocedural.AccessPath.Root.t
   [@@deriving equal]
 
   val from_name : string -> t

diff --git a/source/interprocedural_analyses/taint/backwardAnalysis.ml b/source/interprocedural_analyses/taint/backwardAnalysis.ml
@@ -34,6 +34,7 @@ open Expression
 open Pyre
 open Domains
 module CallGraph = Interprocedural.CallGraph
+module AccessPath = Interprocedural.AccessPath
 module PyrePysaEnvironment = Analysis.PyrePysaEnvironment
 module PyrePysaLogic = Analysis.PyrePysaLogic
 

diff --git a/source/interprocedural_analyses/taint/features.ml b/source/interprocedural_analyses/taint/features.ml
@@ -14,6 +14,7 @@ open Core
 open Ast
 open Pyre
 module PyrePysaEnvironment = Analysis.PyrePysaEnvironment
+module AccessPath = Interprocedural.AccessPath
 
 module MakeInterner (T : sig
   type t

diff --git a/source/interprocedural_analyses/taint/forwardAnalysis.ml b/source/interprocedural_analyses/taint/forwardAnalysis.ml
@@ -41,6 +41,7 @@ open Pyre
 open Domains
 module CallGraph = Interprocedural.CallGraph
 module CallResolution = Interprocedural.CallResolution
+module AccessPath = Interprocedural.AccessPath
 module PyrePysaEnvironment = Analysis.PyrePysaEnvironment
 module PyrePysaLogic = Analysis.PyrePysaLogic
 

diff --git a/source/interprocedural_analyses/taint/globalModel.ml b/source/interprocedural_analyses/taint/globalModel.ml
@@ -16,6 +16,7 @@ open Expression
 open Pyre
 open Domains
 module CallGraph = Interprocedural.CallGraph
+module AccessPath = Interprocedural.AccessPath
 module PyrePysaEnvironment = Analysis.PyrePysaEnvironment
 
 type t = {

diff --git a/source/interprocedural_analyses/taint/modelParseResult.ml b/source/interprocedural_analyses/taint/modelParseResult.ml
@@ -10,6 +10,7 @@ open Core
 open Interprocedural
 open Pyre
 module PyrePysaLogic = Analysis.PyrePysaLogic
+module AccessPath = Interprocedural.AccessPath
 
 (* ModelParseResult: defines the result of parsing pysa model files (`.pysa`). *)
 

diff --git a/source/interprocedural_analyses/taint/modelParseResult.mli b/source/interprocedural_analyses/taint/modelParseResult.mli
@@ -7,6 +7,8 @@
 
 (* ModelParseResult: defines the result of parsing pysa model files (`.pysa`). *)
 
+module AccessPath = Interprocedural.AccessPath
+
 module CollapseDepth : sig
   type t =
     | Value of int

diff --git a/source/interprocedural_analyses/taint/modelVerificationError.ml b/source/interprocedural_analyses/taint/modelVerificationError.ml
@@ -10,6 +10,7 @@
 
 open Core
 open Ast
+module AccessPath = Interprocedural.AccessPath
 
 module IncompatibleModelError = struct
   type reason =

diff --git a/source/interprocedural_analyses/taint/modelVerificationError.mli b/source/interprocedural_analyses/taint/modelVerificationError.mli
@@ -20,7 +20,7 @@ module IncompatibleModelError : sig
     | InvalidNamedParameterPosition of {
         name: string;
         position: int;
-        valid_roots: AccessPath.Root.t list;
+        valid_roots: Interprocedural.AccessPath.Root.t list;
       }
   [@@deriving sexp, equal, compare]
 

diff --git a/source/interprocedural_analyses/taint/modelVerifier.ml b/source/interprocedural_analyses/taint/modelVerifier.ml
@@ -13,6 +13,7 @@ open Ast
 open Expression
 module PyrePysaEnvironment = Analysis.PyrePysaEnvironment
 module PyrePysaLogic = Analysis.PyrePysaLogic
+module AccessPath = Interprocedural.AccessPath
 
 type parameter_requirements = {
   anonymous_parameters_positions: Int.Set.t;

diff --git a/source/interprocedural_analyses/taint/modelVerifier.mli b/source/interprocedural_analyses/taint/modelVerifier.mli
@@ -15,7 +15,7 @@ val demangle_class_attribute : string -> string
 val verify_signature
   :  path:PyrePath.t option ->
   location:Location.t ->
-  normalized_model_parameters:AccessPath.NormalizedParameter.t list ->
+  normalized_model_parameters:Interprocedural.AccessPath.NormalizedParameter.t list ->
   name:Reference.t ->
   Type.Callable.t option ->
   (unit, ModelVerificationError.t) result

diff --git a/source/interprocedural_analyses/taint/sanitize.ml b/source/interprocedural_analyses/taint/sanitize.ml
@@ -9,6 +9,7 @@
  * domain. *)
 
 open Core
+module AccessPath = Interprocedural.AccessPath
 
 type sanitize = {
   sources: SanitizeTransform.SourceSet.t;

diff --git a/source/interprocedural_analyses/taint/sinks.ml b/source/interprocedural_analyses/taint/sinks.ml
@@ -11,6 +11,7 @@
  *)
 
 open Core
+module AccessPath = Interprocedural.AccessPath
 
 let name = "sink"
 

diff --git a/source/interprocedural_analyses/taint/sinks.mli b/source/interprocedural_analyses/taint/sinks.mli
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module AccessPath = Interprocedural.AccessPath
+
 module PartialSink : sig
   type t = string [@@deriving compare, hash, sexp, equal, show]
 

diff --git a/source/interprocedural_analyses/taint/taint.ml b/source/interprocedural_analyses/taint/taint.ml
@@ -7,7 +7,6 @@
 
 (* Taint: here we expose modules for the `pyrelib.taint` library *)
 
-module AccessPath = AccessPath
 module BackwardAnalysis = BackwardAnalysis
 module Rule = Rule
 module SourceSinkFilter = SourceSinkFilter

diff --git a/source/interprocedural_analyses/taint/test/annotationParserTest.ml b/source/interprocedural_analyses/taint/test/annotationParserTest.ml
@@ -8,6 +8,7 @@
 open OUnit2
 open Core
 open Taint
+module AccessPath = Interprocedural.AccessPath
 
 let named name = { AnnotationParser.KindDefinition.name; kind = Named; location = None }
 

diff --git a/source/interprocedural_analyses/taint/test/domainTest.ml b/source/interprocedural_analyses/taint/test/domainTest.ml
@@ -31,7 +31,7 @@ let test_partition_call_map context =
       ~location
       ~callee
       ~arguments:[]
-      ~port:AccessPath.Root.LocalResult
+      ~port:Interprocedural.AccessPath.Root.LocalResult
       ~path:[Abstract.TreeDomain.Label.create_name_index "a"]
       ~is_class_method:false
       ~is_static_method:false
@@ -45,7 +45,7 @@ let test_partition_call_map context =
       ~location
       ~callee
       ~arguments:[]
-      ~port:AccessPath.Root.LocalResult
+      ~port:Interprocedural.AccessPath.Root.LocalResult
       ~path:[Abstract.TreeDomain.Label.create_name_index "a"]
       ~is_class_method:false
       ~is_static_method:false

diff --git a/source/interprocedural_analyses/taint/test/dune b/source/interprocedural_analyses/taint/test/dune
@@ -15,7 +15,6 @@
 
 (tests
  (names
-  accessPathTest
   annotationParserTest
   configurationTest
   domainTest

diff --git a/source/interprocedural_analyses/taint/test/kindCoverageTest.ml b/source/interprocedural_analyses/taint/test/kindCoverageTest.ml
@@ -8,6 +8,7 @@
 open Core
 open OUnit2
 open Taint
+module AccessPath = Interprocedural.AccessPath
 
 let test_from_source _ =
   let assert_sources ~expected ~actual =

diff --git a/source/interprocedural_analyses/taint/test/modelTest.ml b/source/interprocedural_analyses/taint/test/modelTest.ml
@@ -12,6 +12,7 @@ open Test
 open TestHelper
 open Taint
 module PyrePysaEnvironment = Analysis.PyrePysaEnvironment
+module AccessPath = Interprocedural.AccessPath
 
 let get_stubs_and_definitions ~source_file_name ~project =
   let pyre_api = Test.ScratchProject.pyre_pysa_read_only_api project in