JS: implement getADataNode for FetchUrlRequest

Esben Sparre Andreasen · Esben Sparre Andreasen · commit 977b287129a9 · 2018-10-16T08:51:30.000+02:00
diff --git a/javascript/ql/src/semmle/javascript/frameworks/ClientRequests.qll b/javascript/ql/src/semmle/javascript/frameworks/ClientRequests.qll
@@ -180,7 +180,10 @@ private class FetchUrlRequest extends CustomClientRequest {
   }
 
   override DataFlow::Node getADataNode() {
-    none()
+    exists (string name |
+      name = "headers" or name = "body" |
+      result = getOptionArgument(1, name)
+    )
   }
 
 }
diff --git a/javascript/ql/test/library-tests/frameworks/ClientRequests/ClientRequest.expected b/javascript/ql/test/library-tests/frameworks/ClientRequests/ClientRequest.expected
@@ -20,3 +20,4 @@
 | tst.js:55:5:55:34 | axios.g ... _data}) |
 | tst.js:57:5:57:39 | axios.p ... data2}) |
 | tst.js:59:5:59:52 | axios({ ... sData}) |
+| tst.js:61:5:61:60 | window. ... yData}) |
diff --git a/javascript/ql/test/library-tests/frameworks/ClientRequests/ClientRequest_getADataNode.expected b/javascript/ql/test/library-tests/frameworks/ClientRequests/ClientRequest_getADataNode.expected
@@ -3,3 +3,5 @@
 | tst.js:57:5:57:39 | axios.p ... data2}) | tst.js:57:33:57:37 | data2 |
 | tst.js:59:5:59:52 | axios({ ... sData}) | tst.js:59:21:59:30 | headerData |
 | tst.js:59:5:59:52 | axios({ ... sData}) | tst.js:59:41:59:50 | paramsData |
+| tst.js:61:5:61:60 | window. ... yData}) | tst.js:61:33:61:42 | headerData |
+| tst.js:61:5:61:60 | window. ... yData}) | tst.js:61:51:61:58 | bodyData |
diff --git a/javascript/ql/test/library-tests/frameworks/ClientRequests/ClientRequest_getUrl.expected b/javascript/ql/test/library-tests/frameworks/ClientRequests/ClientRequest_getUrl.expected
@@ -24,3 +24,4 @@
 | tst.js:55:5:55:34 | axios.g ... _data}) | tst.js:55:15:55:15 | x |
 | tst.js:57:5:57:39 | axios.p ... data2}) | tst.js:57:16:57:16 | x |
 | tst.js:59:5:59:52 | axios({ ... sData}) | tst.js:59:11:59:51 | {header ... msData} |
+| tst.js:61:5:61:60 | window. ... yData}) | tst.js:61:18:61:20 | url |
diff --git a/javascript/ql/test/library-tests/frameworks/ClientRequests/tst.js b/javascript/ql/test/library-tests/frameworks/ClientRequests/tst.js
@@ -57,4 +57,6 @@ import {ClientRequest, net} from 'electron';
     axios.post(x, data1, {data: data2});
 
     axios({headers: headerData, params: paramsData});
+
+    window.fetch(url, {headers: headerData, body: bodyData});
 });

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,10 @@ private class FetchUrlRequest extends CustomClientRequest {`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`override DataFlow::Node getADataNode() {`
`183`		`- none()`
	`183`	`+ exists (string name \|`
	`184`	`+ name = "headers" or name = "body" \|`
	`185`	`+ result = getOptionArgument(1, name)`
	`186`	`+ )`
`184`	`187`	`}`
`185`	`188`
`186`	`189`	`}`