Merge pull request github#12333 from kaspersv/kaspersv/fix-join-order

ReflectedXss: Prevent bad join order

Author: erik-krogh

javascript/ql/lib/semmle/javascript/security/dataflow/ReflectedXssCustomizations.qll

@@ -103,6 +103,12 @@ module ReflectedXss {
     )
   }
 
+  bindingset[headerBlock]
+  pragma[inline_late]
+  private predicate doesNotDominateCallback(ReachableBasicBlock headerBlock) {
+    not exists(Expr e | e instanceof Function | headerBlock.dominates(e.getBasicBlock()))
+  }
+
   /**
    * Holds if the HeaderDefinition `header` seems to be local.
    * A HeaderDefinition is local if it dominates exactly one `ResponseSendArgument`.
@@ -122,7 +128,7 @@ module ReflectedXss {
           header.getBasicBlock().(ReachableBasicBlock).dominates(sender.getBasicBlock())
         ) and
       // doesn't dominate something that looks like a callback.
-      not exists(Expr e | e instanceof Function | headerBlock.dominates(e.getBasicBlock()))
+      doesNotDominateCallback(headerBlock)
     )
   }