Skip to content

Commit 9a36d3d

Browse files
mbaludambaluda
committed
improved sink tests
1 parent 744bf21 commit 9a36d3d

File tree

6 files changed

+36
-20
lines changed

6 files changed

+36
-20
lines changed

‎javascript/frameworks/ui5/test/models/sink/UI5ViewSinkTest.expected‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
| sink1.xml:5:5:5:44 | content={path: '/input'} | The binding path `content={path: '/input'}` is an HTML injection sink. |
1+
| sink1.xml:6:5:6:44 | content={path: '/input'} | The binding path `content={path: '/input'}` is an HTML injection sink. |
2+
| sink1.xml:7:5:7:67 | content={path: '/input'} | The binding path `content={path: '/input'}` is an HTML injection sink. |
3+
| sink1.xml:8:5:8:51 | value={path: '/input'} | The binding path `value={path: '/input'}` is an HTML injection sink. |
4+
| sink1.xml:9:5:9:72 | value={path: '/input'} | The binding path `value={path: '/input'}` is an HTML injection sink. |

‎javascript/frameworks/ui5/test/models/sink/UI5ViewSinkTest.ql‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ import javascript
99
import advanced_security.javascript.frameworks.ui5.UI5View
1010

1111
from UI5BindingPath bp
12-
where
13-
bp = any(UI5View ui5v).getAnHtmlISink() and
14-
not bp.getControlDeclaration().isSanitizedControl()
12+
where bp = any(UI5View ui5v).getAnHtmlISink()
1513
select bp, "The binding path `" + bp.toString() + "` is an HTML injection sink."

‎javascript/frameworks/ui5/test/models/sink/logSinkTest.expected‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
| sink.js:24:38:24:42 | code0 | SAP UI5 log injection sink with kind: ui5-log-injection |
2-
| sink.js:24:45:24:49 | code1 | SAP UI5 log injection sink with kind: ui5-log-injection |
3-
| sink.js:24:52:24:56 | code2 | SAP UI5 log injection sink with kind: ui5-log-injection |
4-
| sink.js:25:38:25:42 | code0 | SAP UI5 log injection sink with kind: ui5-log-injection |
5-
| sink.js:25:45:25:49 | code1 | SAP UI5 log injection sink with kind: ui5-log-injection |
6-
| sink.js:25:52:25:56 | code2 | SAP UI5 log injection sink with kind: ui5-log-injection |
7-
| sink.js:27:40:27:44 | code0 | SAP UI5 log injection sink with kind: ui5-log-injection |
8-
| sink.js:27:47:27:51 | code1 | SAP UI5 log injection sink with kind: ui5-log-injection |
9-
| sink.js:27:54:27:58 | code2 | SAP UI5 log injection sink with kind: ui5-log-injection |
1+
| sink.js:26:38:26:42 | code0 | SAP UI5 log injection sink with kind: ui5-log-injection |
2+
| sink.js:26:45:26:49 | code1 | SAP UI5 log injection sink with kind: ui5-log-injection |
3+
| sink.js:26:52:26:56 | code2 | SAP UI5 log injection sink with kind: ui5-log-injection |
4+
| sink.js:27:38:27:42 | code0 | SAP UI5 log injection sink with kind: ui5-log-injection |
5+
| sink.js:27:45:27:49 | code1 | SAP UI5 log injection sink with kind: ui5-log-injection |
6+
| sink.js:27:52:27:56 | code2 | SAP UI5 log injection sink with kind: ui5-log-injection |
7+
| sink.js:28:40:28:44 | code0 | SAP UI5 log injection sink with kind: ui5-log-injection |
8+
| sink.js:28:47:28:51 | code1 | SAP UI5 log injection sink with kind: ui5-log-injection |
9+
| sink.js:28:54:28:58 | code2 | SAP UI5 log injection sink with kind: ui5-log-injection |
1010
| sink.js:29:37:29:41 | code0 | SAP UI5 log injection sink with kind: ui5-log-injection |
1111
| sink.js:29:44:29:48 | code1 | SAP UI5 log injection sink with kind: ui5-log-injection |
1212
| sink.js:29:51:29:55 | code2 | SAP UI5 log injection sink with kind: ui5-log-injection |

‎javascript/frameworks/ui5/test/models/sink/sink.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ sap.ui.define(
88
"sap/base/util/Properties",
99
"sap/ui/core/RenderManager",
1010
"sap/ui/util/Storage",
11-
"sap/ui/core/util/File"
11+
"sap/ui/core/util/File",
12+
"sap/ui/richtexteditor/RichTextEditor"
1213
],
1314
function (
1415
LoaderExtensions,
@@ -19,13 +20,12 @@ sap.ui.define(
1920
Properties,
2021
RenderManager,
2122
Storage,
22-
File
23+
File,
24+
RichTextEditor
2325
) {
2426
var value = jQuery.sap.log.fatal(code0, code1, code2);
2527
var value = jQuery.sap.log.error(code0, code1, code2);
26-
2728
var value = jQuery.sap.log.warning(code0, code1, code2);
28-
2929
var value = jQuery.sap.log.info(code0, code1, code2);
3030

3131
var value = jQuery.sap.log.debug(code0, code1, code2);
@@ -94,7 +94,7 @@ sap.ui.define(
9494
var value = obj.registerResourcePath(code0, code1);
9595
var obj = new Properties();
9696
var value = obj.create(code0);
97-
var obj = new HTML({content: code0});
97+
var obj = new HTML({ content: code0 });
9898
obj.content = code0;
9999
obj.setContent(code0);
100100
var obj = new Patcher();
@@ -125,5 +125,12 @@ sap.ui.define(
125125
var value = sap.ui.core.util.File.save(code0, code1, "csv", "text/csv", code4, code5);
126126
var value = sap.ui.core.util.File.save(code0, code1, "csv", "text/plain", code4, code5);
127127
var value = sap.ui.core.util.File.save(code0, code1, code2, code3, code4, code5);
128+
129+
var obj = new HTML({ content: code0, sanitizeContent: true });
130+
var obj = new HTML({ content: code0, sanitizeContent: false });
131+
132+
var obj = new RichTextEditor({ value: code0 });
133+
var obj = new RichTextEditor({ value: code0, sanitizeValue: true });
134+
var obj = new RichTextEditor({ value: code0, sanitizeValue: false });
128135
},
129136
);

‎javascript/frameworks/ui5/test/models/sink/sink1.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<mvc:View controllerName="codeql-sap-js.controller.app"
22
xmlns="sap.m"
33
xmlns:core="sap.ui.core"
4-
xmlns:mvc="sap.ui.core.mvc">
4+
xmlns:mvc="sap.ui.core.mvc"
5+
xmlns:rte="sap.ui.richtexteditor">
56
<core:HTML content="{path: '/input'}"/> <!--XSS sink sap.ui.core.HTML.content -->
67
<core:HTML content="{path: '/input'}" sanitizeContent="true"/> <!--sanitized XSS sink sap.ui.core.HTML.content -->
8+
<rte:RichTextEditor value="{path: '/input'}"/> <!--XSS sink sap.ui.core.HTML.content -->
9+
<rte:RichTextEditor value="{path: '/input'}" sanitizeValue="true"/> <!--sanitized XSS sink sap.ui.core.HTML.content -->
710
</mvc:View>

‎javascript/frameworks/ui5/test/models/sink/xssSinkTest.expected‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
| sink.js:61:39:61:43 | code0 | code0 |
2-
| sink.js:97:34:97:38 | code0 | code0 |
2+
| sink.js:97:35:97:39 | code0 | code0 |
33
| sink.js:98:19:98:23 | code0 | code0 |
44
| sink.js:99:20:99:24 | code0 | code0 |
55
| sink.js:101:32:101:36 | code0 | code0 |
@@ -10,3 +10,8 @@
1010
| sink.js:109:37:109:41 | code1 | code1 |
1111
| sink.js:111:30:111:34 | code0 | code0 |
1212
| sink.js:113:32:113:36 | code0 | code0 |
13+
| sink.js:129:35:129:39 | code0 | code0 |
14+
| sink.js:130:35:130:39 | code0 | code0 |
15+
| sink.js:132:43:132:47 | code0 | code0 |
16+
| sink.js:133:43:133:47 | code0 | code0 |
17+
| sink.js:134:43:134:47 | code0 | code0 |

0 commit comments

Comments
 (0)