docs: fix include in data flow slides

james · james · commit 387147ede2ec · 2019-08-29T11:53:19.000+01:00
diff --git a/docs/language/ql-training-rst/java/apache-struts-java.rst b/docs/language/ql-training-rst/java/apache-struts-java.rst
@@ -47,12 +47,12 @@ RCE in Apache Struts
 
 - Vulnerable code looked like this (`original <https://lgtm.com/projects/g/apache/struts/snapshot/b434c23f95e0f9d5bde789bfa07f8fc1d5a8951d/files/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java?sort=name&dir=ASC&mode=heatmap#L45>`__):
 
-.. code-block:: java
-
-   public void toObject(Reader in, Object target) {
-     XStream xstream = createXStream();
-     xstream.fromXML(in, target);
-   }
+   .. code-block:: java
+   
+      public void toObject(Reader in, Object target) {
+        XStream xstream = createXStream();
+        xstream.fromXML(in, target);
+      }
 
 - Xstream allows deserialization of **dynamic proxies**, which permit remote code execution.
 
diff --git a/docs/language/ql-training-rst/java/data-flow-java.rst b/docs/language/ql-training-rst/java/data-flow-java.rst
@@ -98,118 +98,11 @@ We want to improve our query to catch more of these cases.
    
    Here the concatenation occurs before the call, so the existing query would miss this - the string concatenation does not occur *directly* as the first argument of the call.
 
-Data flow analysis
-==================
+.. include general data flow slides
 
-- Models flow of data through the program.
-- Implemented in the module ``semmle.code.java.dataflow.DataFlow``.
-- Class ``DataFlow::Node`` represents program elements that have a value, such as expressions and function parameters.
+.. include:: ../slide-snippets/local-data-flow.rst
 
-  - Nodes of the data flow graph.
-
-- Various predicated represent flow between these nodes.
-  
-  - Edges of the data flow graph.
-
-.. note::
-
-  The solution here is to use *data flow*. Data flow is, as the name suggests, about tracking the flow of data through the program. It helps answers questions like: *does this expression ever hold a value that originates from a particular other place in the program*?
-
-  We can visualize the data flow problem as one of finding paths through a directed graph, where the nodes of the graph are elements in program, and the edges represent the flow of data between those elements. If a path exists, then the data flows between those two edges.
-
-Local vs global data flow
-=========================
-
-- Local (“intra-procedural”) data flow models flow within one function; feasible to compute for all functions in a snapshot
-- Global (“inter-procedural”) data flow models flow across function calls; not feasible to compute for all functions in a snapshot
-- Different APIs, so discussed separately
-- This slide deck focuses on the former.
-
-.. note::
-
-  For further information, see:
-
-  - `Introduction to data flow analysis in QL <https://help.semmle.com/QL/learn-ql/ql/intro-to-data-flow.html>`__
-  - `Analyzing data flow in Java <https://help.semmle.com/QL/learn-ql/ql/java/dataflow.html>`__
-
-.. rst-class:: background2
-
-Local data flow
-===============
-
-Importing data flow
-===================
-
-To use the data flow library, add the following import:
-
-.. code-block:: ql
-
-   import semmle.code.java.dataflow.DataFlow
-
-**Note**: this library contains an explicit “module” declaration:
-
-.. code-block:: ql
-
-   module DataFlow {
-     class Node extends ... { ... }
-     predicate localFlow(Node source, Node sink) {
-               localFlowStep*(source, sink)
-            }
-     ... 
-   }
-
-So all references will need to be qualified (that is, ``DataFlow::Node``)
-
-.. note::
-
-  A **query library** is file with the extension ``.qll``. Query libraries do not contain a query clause, but may contain modules, classes, and predicates. For example, the `Java data flow library <https://help.semmle.com/qldoc/java/semmle/code/java/dataflow/DataFlow.qll/module.DataFlow.html>`__ is contained in the ``semmle/code/java/dataflow/DataFlow.qll`` QLL file, and can be imported as shown above.
-
-  A **module** is a way of organizing QL code by grouping together related predicates, classes, and (sub-)modules. They can be either explicitly declared or implicit. A query library implicitly declares a module with the same name as the QLL file.
-
-  For further information on libraries and modules in QL, see the chapter on `Modules <https://help.semmle.com/QL/ql-handbook/modules.html>`__ in the QL language handbook.
-
-  For further information on importing QL libraries and modules, see the chapter on `Name resolution <https://help.semmle.com/QL/ql-handbook/name-resolution.html>`__ in the QL language handbook.
-
-Data flow graph
-===============
-
-- Class ``DataFlow::Node`` represents data flow graph nodes
-- Predicate ``DataFlow::localFlowStep`` represents local data flow graph edges, ``DataFlow::localFlow`` is its transitive closure
-- Data flow graph nodes are *not* AST nodes, but they correspond to AST nodes, and there are predicates for mapping between them:
-
-  - ``Expr Node.asExpr()``
-  - ``Parameter Node.asParameter()``
-  - ``DataFlow::Node DataFlow::exprNode(Expr e)``
-  - ``DataFlow::Node DataFlow::parameterNode(Parameter p)``
-  - ``etc.``
-
-.. note::
-
-  The ``DataFlow::Node`` class is shared between both the local and global data flow graphs–the primary difference is the edges, which in the “global” case can link different functions.
-
-  ``localFlowStep`` is the “single step” flow relation–that is, it describes single edges in the local data flow graph. ``localFlow`` represents the `transitive <https://help.semmle.com/QL/ql-handbook/recursion.html#transitive-closures>`__ closure of this relation–in other words, it contains every pair of nodes where the second node is reachable from the first in the data flow graph.
-
-  The data flow graph is separate from the `AST <https://en.wikipedia.org/wiki/Abstract_syntax_tree>`__, to allow for flexibility in how data flow is modeled. There are a small number of data flow node types–expression nodes, parameter nodes, uninitialized variable nodes, and definition by reference nodes. Each node provides mapping functions to and from the relevant AST (for example ``Expr``, ``Parameter`` etc.) or symbol table (for example ``Variable``) classes.
-
-Taint tracking
-==============
-
-- Usually, we want to generalise slightly by not only considering plain data flow, but also “taint” propagation, that is, whether a value is influenced by or derived from another.
-
-- Examples:
-
-  .. code-block:: java
-  
-    sink = source;        // source -> sink: data and taint
-    strcat(sink, source); // source -> sink: taint, not data
-
-- Library ``semmle.code.java.dataflow.TaintTracking`` provides predicates for tracking taint; ``TaintTracking::localTaintStep`` represents one (local) taint step, ``TaintTracking::localTaint`` is its transitive closure.
-
-.. note::
-
-  Taint tracking can be thought of as another type of data flow graph. It usually extends the standard data flow graph for a problem by adding edges between nodes where one one node influences or *taints* another.
-
-  The `API <https://help.semmle.com/qldoc/java/semmle/code/java/dataflow/TaintTracking.qll/module.TaintTracking.html>`__ is almost identical to that of the local data flow. All we need to do to switch to taint tracking is ``import semmle.code.java.dataflow.TaintTracking`` instead of ``semmle.code.java.dataflow.DataFlow``, and instead of using ``localFlow``, we use ``localTaint``.
+.. resume language-specific slides
 
 Exercise: revisiting SPARQL injection
 =====================================
