Skip to content

Commit 9b50447

Browse files
mbaludambaluda
committed
Fix conflict
1 parent ee49547 commit 9b50447

2 files changed

Lines changed: 118 additions & 48 deletions

File tree

‎javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/UI5Xss.expected‎

Lines changed: 96 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,99 @@
11
nodes
2-
| webapp/controller/app.controller.js:9:17:9:28 | input0: null |
3-
| webapp/controller/app.controller.js:10:17:10:28 | input1: null |
4-
| webapp/controller/app.controller.js:11:17:11:28 | input2: null |
5-
| webapp/controller/app.controller.js:12:17:12:28 | input3: null |
6-
| webapp/controller/app.controller.js:13:17:13:28 | input4: null |
7-
| webapp/view/app.view.xml:5:5:7:29 | value={/input0} |
8-
| webapp/view/app.view.xml:8:5:8:37 | content={/input0} |
9-
| webapp/view/app.view.xml:10:5:12:29 | value={/input1} |
10-
| webapp/view/app.view.xml:13:5:13:79 | content={/input1} |
11-
| webapp/view/app.view.xml:15:5:17:29 | value={/input2} |
12-
| webapp/view/app.view.xml:18:5:18:59 | content={/input2} |
13-
| webapp/view/app.view.xml:20:5:22:29 | value={/input3} |
14-
| webapp/view/app.view.xml:23:5:23:59 | content={/input3} |
15-
| webapp/view/app.view.xml:25:5:27:29 | value={/input4} |
16-
| webapp/view/app.view.xml:28:5:28:80 | content={/input4} |
2+
| webapp/controller/app.controller.js:9:17:9:27 | input: null |
3+
| webapp/controller/app.controller.js:10:17:10:28 | input0: null |
4+
| webapp/controller/app.controller.js:11:17:11:28 | input1: null |
5+
| webapp/controller/app.controller.js:12:17:12:28 | input2: null |
6+
| webapp/controller/app.controller.js:13:17:13:28 | input3: null |
7+
| webapp/controller/app.controller.js:14:17:14:28 | input4: null |
8+
| webapp/view/app.view.xml:6:5:8:28 | value={/input} |
9+
| webapp/view/app.view.xml:9:5:10:28 | value={/input} |
10+
| webapp/view/app.view.xml:11:5:12:28 | value={/input} |
11+
| webapp/view/app.view.xml:13:5:14:28 | value={/input} |
12+
| webapp/view/app.view.xml:15:5:16:28 | value={/input} |
13+
| webapp/view/app.view.xml:17:5:18:28 | value={/input} |
14+
| webapp/view/app.view.xml:19:5:20:28 | value={/input} |
15+
| webapp/view/app.view.xml:21:5:22:28 | value={/input} |
16+
| webapp/view/app.view.xml:23:5:24:28 | value={/input} |
17+
| webapp/view/app.view.xml:25:5:25:36 | content={/input} |
18+
| webapp/view/app.view.xml:27:5:29:29 | value={/input0} |
19+
| webapp/view/app.view.xml:30:5:30:37 | content={/input0} |
20+
| webapp/view/app.view.xml:32:5:34:29 | value={/input1} |
21+
| webapp/view/app.view.xml:35:5:35:79 | content={/input1} |
22+
| webapp/view/app.view.xml:37:5:39:29 | value={/input2} |
23+
| webapp/view/app.view.xml:40:5:40:59 | content={/input2} |
24+
| webapp/view/app.view.xml:42:5:44:29 | value={/input3} |
25+
| webapp/view/app.view.xml:45:5:45:59 | content={/input3} |
26+
| webapp/view/app.view.xml:47:5:49:29 | value={/input4} |
27+
| webapp/view/app.view.xml:50:5:50:80 | content={/input4} |
1728
edges
18-
| webapp/controller/app.controller.js:9:17:9:28 | input0: null | webapp/view/app.view.xml:5:5:7:29 | value={/input0} |
19-
| webapp/controller/app.controller.js:9:17:9:28 | input0: null | webapp/view/app.view.xml:8:5:8:37 | content={/input0} |
20-
| webapp/controller/app.controller.js:10:17:10:28 | input1: null | webapp/view/app.view.xml:10:5:12:29 | value={/input1} |
21-
| webapp/controller/app.controller.js:10:17:10:28 | input1: null | webapp/view/app.view.xml:13:5:13:79 | content={/input1} |
22-
| webapp/controller/app.controller.js:11:17:11:28 | input2: null | webapp/view/app.view.xml:15:5:17:29 | value={/input2} |
23-
| webapp/controller/app.controller.js:11:17:11:28 | input2: null | webapp/view/app.view.xml:18:5:18:59 | content={/input2} |
24-
| webapp/controller/app.controller.js:12:17:12:28 | input3: null | webapp/view/app.view.xml:20:5:22:29 | value={/input3} |
25-
| webapp/controller/app.controller.js:12:17:12:28 | input3: null | webapp/view/app.view.xml:23:5:23:59 | content={/input3} |
26-
| webapp/controller/app.controller.js:13:17:13:28 | input4: null | webapp/view/app.view.xml:25:5:27:29 | value={/input4} |
27-
| webapp/controller/app.controller.js:13:17:13:28 | input4: null | webapp/view/app.view.xml:28:5:28:80 | content={/input4} |
28-
| webapp/controller/app.controller.js:15:26:15:45 | new JSONModel(oData) | webapp/view/app.view.xml:8:5:8:37 | content={/input0} |
29-
| webapp/controller/app.controller.js:15:26:15:45 | new JSONModel(oData) | webapp/view/app.view.xml:13:5:13:79 | content={/input1} |
30-
| webapp/controller/app.controller.js:15:26:15:45 | new JSONModel(oData) | webapp/view/app.view.xml:18:5:18:59 | content={/input2} |
31-
| webapp/controller/app.controller.js:15:26:15:45 | new JSONModel(oData) | webapp/view/app.view.xml:23:5:23:59 | content={/input3} |
32-
| webapp/controller/app.controller.js:15:26:15:45 | new JSONModel(oData) | webapp/view/app.view.xml:28:5:28:80 | content={/input4} |
33-
| webapp/view/app.view.xml:5:5:7:29 | value={/input0} | webapp/controller/app.controller.js:9:17:9:28 | input0: null |
34-
| webapp/view/app.view.xml:5:5:7:29 | value={/input0} | webapp/controller/app.controller.js:15:26:15:45 | new JSONModel(oData) |
35-
| webapp/view/app.view.xml:8:5:8:37 | content={/input0} | webapp/controller/app.controller.js:9:17:9:28 | input0: null |
36-
| webapp/view/app.view.xml:10:5:12:29 | value={/input1} | webapp/controller/app.controller.js:10:17:10:28 | input1: null |
37-
| webapp/view/app.view.xml:10:5:12:29 | value={/input1} | webapp/controller/app.controller.js:15:26:15:45 | new JSONModel(oData) |
38-
| webapp/view/app.view.xml:13:5:13:79 | content={/input1} | webapp/controller/app.controller.js:10:17:10:28 | input1: null |
39-
| webapp/view/app.view.xml:15:5:17:29 | value={/input2} | webapp/controller/app.controller.js:11:17:11:28 | input2: null |
40-
| webapp/view/app.view.xml:15:5:17:29 | value={/input2} | webapp/controller/app.controller.js:15:26:15:45 | new JSONModel(oData) |
41-
| webapp/view/app.view.xml:18:5:18:59 | content={/input2} | webapp/controller/app.controller.js:11:17:11:28 | input2: null |
42-
| webapp/view/app.view.xml:20:5:22:29 | value={/input3} | webapp/controller/app.controller.js:12:17:12:28 | input3: null |
43-
| webapp/view/app.view.xml:20:5:22:29 | value={/input3} | webapp/controller/app.controller.js:15:26:15:45 | new JSONModel(oData) |
44-
| webapp/view/app.view.xml:23:5:23:59 | content={/input3} | webapp/controller/app.controller.js:12:17:12:28 | input3: null |
45-
| webapp/view/app.view.xml:25:5:27:29 | value={/input4} | webapp/controller/app.controller.js:13:17:13:28 | input4: null |
46-
| webapp/view/app.view.xml:25:5:27:29 | value={/input4} | webapp/controller/app.controller.js:15:26:15:45 | new JSONModel(oData) |
47-
| webapp/view/app.view.xml:28:5:28:80 | content={/input4} | webapp/controller/app.controller.js:13:17:13:28 | input4: null |
29+
| webapp/controller/app.controller.js:9:17:9:27 | input: null | webapp/view/app.view.xml:6:5:8:28 | value={/input} |
30+
| webapp/controller/app.controller.js:9:17:9:27 | input: null | webapp/view/app.view.xml:9:5:10:28 | value={/input} |
31+
| webapp/controller/app.controller.js:9:17:9:27 | input: null | webapp/view/app.view.xml:11:5:12:28 | value={/input} |
32+
| webapp/controller/app.controller.js:9:17:9:27 | input: null | webapp/view/app.view.xml:13:5:14:28 | value={/input} |
33+
| webapp/controller/app.controller.js:9:17:9:27 | input: null | webapp/view/app.view.xml:15:5:16:28 | value={/input} |
34+
| webapp/controller/app.controller.js:9:17:9:27 | input: null | webapp/view/app.view.xml:17:5:18:28 | value={/input} |
35+
| webapp/controller/app.controller.js:9:17:9:27 | input: null | webapp/view/app.view.xml:19:5:20:28 | value={/input} |
36+
| webapp/controller/app.controller.js:9:17:9:27 | input: null | webapp/view/app.view.xml:21:5:22:28 | value={/input} |
37+
| webapp/controller/app.controller.js:9:17:9:27 | input: null | webapp/view/app.view.xml:23:5:24:28 | value={/input} |
38+
| webapp/controller/app.controller.js:9:17:9:27 | input: null | webapp/view/app.view.xml:25:5:25:36 | content={/input} |
39+
| webapp/controller/app.controller.js:10:17:10:28 | input0: null | webapp/view/app.view.xml:27:5:29:29 | value={/input0} |
40+
| webapp/controller/app.controller.js:10:17:10:28 | input0: null | webapp/view/app.view.xml:30:5:30:37 | content={/input0} |
41+
| webapp/controller/app.controller.js:11:17:11:28 | input1: null | webapp/view/app.view.xml:32:5:34:29 | value={/input1} |
42+
| webapp/controller/app.controller.js:11:17:11:28 | input1: null | webapp/view/app.view.xml:35:5:35:79 | content={/input1} |
43+
| webapp/controller/app.controller.js:12:17:12:28 | input2: null | webapp/view/app.view.xml:37:5:39:29 | value={/input2} |
44+
| webapp/controller/app.controller.js:12:17:12:28 | input2: null | webapp/view/app.view.xml:40:5:40:59 | content={/input2} |
45+
| webapp/controller/app.controller.js:13:17:13:28 | input3: null | webapp/view/app.view.xml:42:5:44:29 | value={/input3} |
46+
| webapp/controller/app.controller.js:13:17:13:28 | input3: null | webapp/view/app.view.xml:45:5:45:59 | content={/input3} |
47+
| webapp/controller/app.controller.js:14:17:14:28 | input4: null | webapp/view/app.view.xml:47:5:49:29 | value={/input4} |
48+
| webapp/controller/app.controller.js:14:17:14:28 | input4: null | webapp/view/app.view.xml:50:5:50:80 | content={/input4} |
49+
| webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) | webapp/view/app.view.xml:25:5:25:36 | content={/input} |
50+
| webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) | webapp/view/app.view.xml:30:5:30:37 | content={/input0} |
51+
| webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) | webapp/view/app.view.xml:35:5:35:79 | content={/input1} |
52+
| webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) | webapp/view/app.view.xml:40:5:40:59 | content={/input2} |
53+
| webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) | webapp/view/app.view.xml:45:5:45:59 | content={/input3} |
54+
| webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) | webapp/view/app.view.xml:50:5:50:80 | content={/input4} |
55+
| webapp/view/app.view.xml:6:5:8:28 | value={/input} | webapp/controller/app.controller.js:9:17:9:27 | input: null |
56+
| webapp/view/app.view.xml:6:5:8:28 | value={/input} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
57+
| webapp/view/app.view.xml:9:5:10:28 | value={/input} | webapp/controller/app.controller.js:9:17:9:27 | input: null |
58+
| webapp/view/app.view.xml:9:5:10:28 | value={/input} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
59+
| webapp/view/app.view.xml:11:5:12:28 | value={/input} | webapp/controller/app.controller.js:9:17:9:27 | input: null |
60+
| webapp/view/app.view.xml:13:5:14:28 | value={/input} | webapp/controller/app.controller.js:9:17:9:27 | input: null |
61+
| webapp/view/app.view.xml:13:5:14:28 | value={/input} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
62+
| webapp/view/app.view.xml:15:5:16:28 | value={/input} | webapp/controller/app.controller.js:9:17:9:27 | input: null |
63+
| webapp/view/app.view.xml:15:5:16:28 | value={/input} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
64+
| webapp/view/app.view.xml:17:5:18:28 | value={/input} | webapp/controller/app.controller.js:9:17:9:27 | input: null |
65+
| webapp/view/app.view.xml:17:5:18:28 | value={/input} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
66+
| webapp/view/app.view.xml:19:5:20:28 | value={/input} | webapp/controller/app.controller.js:9:17:9:27 | input: null |
67+
| webapp/view/app.view.xml:19:5:20:28 | value={/input} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
68+
| webapp/view/app.view.xml:21:5:22:28 | value={/input} | webapp/controller/app.controller.js:9:17:9:27 | input: null |
69+
| webapp/view/app.view.xml:21:5:22:28 | value={/input} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
70+
| webapp/view/app.view.xml:23:5:24:28 | value={/input} | webapp/controller/app.controller.js:9:17:9:27 | input: null |
71+
| webapp/view/app.view.xml:23:5:24:28 | value={/input} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
72+
| webapp/view/app.view.xml:25:5:25:36 | content={/input} | webapp/controller/app.controller.js:9:17:9:27 | input: null |
73+
| webapp/view/app.view.xml:27:5:29:29 | value={/input0} | webapp/controller/app.controller.js:10:17:10:28 | input0: null |
74+
| webapp/view/app.view.xml:27:5:29:29 | value={/input0} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
75+
| webapp/view/app.view.xml:30:5:30:37 | content={/input0} | webapp/controller/app.controller.js:10:17:10:28 | input0: null |
76+
| webapp/view/app.view.xml:32:5:34:29 | value={/input1} | webapp/controller/app.controller.js:11:17:11:28 | input1: null |
77+
| webapp/view/app.view.xml:32:5:34:29 | value={/input1} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
78+
| webapp/view/app.view.xml:35:5:35:79 | content={/input1} | webapp/controller/app.controller.js:11:17:11:28 | input1: null |
79+
| webapp/view/app.view.xml:37:5:39:29 | value={/input2} | webapp/controller/app.controller.js:12:17:12:28 | input2: null |
80+
| webapp/view/app.view.xml:37:5:39:29 | value={/input2} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
81+
| webapp/view/app.view.xml:40:5:40:59 | content={/input2} | webapp/controller/app.controller.js:12:17:12:28 | input2: null |
82+
| webapp/view/app.view.xml:42:5:44:29 | value={/input3} | webapp/controller/app.controller.js:13:17:13:28 | input3: null |
83+
| webapp/view/app.view.xml:42:5:44:29 | value={/input3} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
84+
| webapp/view/app.view.xml:45:5:45:59 | content={/input3} | webapp/controller/app.controller.js:13:17:13:28 | input3: null |
85+
| webapp/view/app.view.xml:47:5:49:29 | value={/input4} | webapp/controller/app.controller.js:14:17:14:28 | input4: null |
86+
| webapp/view/app.view.xml:47:5:49:29 | value={/input4} | webapp/controller/app.controller.js:16:26:16:45 | new JSONModel(oData) |
87+
| webapp/view/app.view.xml:50:5:50:80 | content={/input4} | webapp/controller/app.controller.js:14:17:14:28 | input4: null |
4888
#select
49-
| webapp/view/app.view.xml:8:5:8:37 | content={/input0} | webapp/view/app.view.xml:5:5:7:29 | value={/input0} | webapp/view/app.view.xml:8:5:8:37 | content={/input0} | XSS vulnerability due to $@. | webapp/view/app.view.xml:5:5:7:29 | value={/input0} | user-provided value |
50-
| webapp/view/app.view.xml:23:5:23:59 | content={/input3} | webapp/view/app.view.xml:20:5:22:29 | value={/input3} | webapp/view/app.view.xml:23:5:23:59 | content={/input3} | XSS vulnerability due to $@. | webapp/view/app.view.xml:20:5:22:29 | value={/input3} | user-provided value |
51-
| webapp/view/app.view.xml:28:5:28:80 | content={/input4} | webapp/view/app.view.xml:25:5:27:29 | value={/input4} | webapp/view/app.view.xml:28:5:28:80 | content={/input4} | XSS vulnerability due to $@. | webapp/view/app.view.xml:25:5:27:29 | value={/input4} | user-provided value |
89+
| webapp/view/app.view.xml:25:5:25:36 | content={/input} | webapp/view/app.view.xml:6:5:8:28 | value={/input} | webapp/view/app.view.xml:25:5:25:36 | content={/input} | XSS vulnerability due to $@. | webapp/view/app.view.xml:6:5:8:28 | value={/input} | user-provided value |
90+
| webapp/view/app.view.xml:25:5:25:36 | content={/input} | webapp/view/app.view.xml:9:5:10:28 | value={/input} | webapp/view/app.view.xml:25:5:25:36 | content={/input} | XSS vulnerability due to $@. | webapp/view/app.view.xml:9:5:10:28 | value={/input} | user-provided value |
91+
| webapp/view/app.view.xml:25:5:25:36 | content={/input} | webapp/view/app.view.xml:13:5:14:28 | value={/input} | webapp/view/app.view.xml:25:5:25:36 | content={/input} | XSS vulnerability due to $@. | webapp/view/app.view.xml:13:5:14:28 | value={/input} | user-provided value |
92+
| webapp/view/app.view.xml:25:5:25:36 | content={/input} | webapp/view/app.view.xml:15:5:16:28 | value={/input} | webapp/view/app.view.xml:25:5:25:36 | content={/input} | XSS vulnerability due to $@. | webapp/view/app.view.xml:15:5:16:28 | value={/input} | user-provided value |
93+
| webapp/view/app.view.xml:25:5:25:36 | content={/input} | webapp/view/app.view.xml:17:5:18:28 | value={/input} | webapp/view/app.view.xml:25:5:25:36 | content={/input} | XSS vulnerability due to $@. | webapp/view/app.view.xml:17:5:18:28 | value={/input} | user-provided value |
94+
| webapp/view/app.view.xml:25:5:25:36 | content={/input} | webapp/view/app.view.xml:19:5:20:28 | value={/input} | webapp/view/app.view.xml:25:5:25:36 | content={/input} | XSS vulnerability due to $@. | webapp/view/app.view.xml:19:5:20:28 | value={/input} | user-provided value |
95+
| webapp/view/app.view.xml:25:5:25:36 | content={/input} | webapp/view/app.view.xml:21:5:22:28 | value={/input} | webapp/view/app.view.xml:25:5:25:36 | content={/input} | XSS vulnerability due to $@. | webapp/view/app.view.xml:21:5:22:28 | value={/input} | user-provided value |
96+
| webapp/view/app.view.xml:25:5:25:36 | content={/input} | webapp/view/app.view.xml:23:5:24:28 | value={/input} | webapp/view/app.view.xml:25:5:25:36 | content={/input} | XSS vulnerability due to $@. | webapp/view/app.view.xml:23:5:24:28 | value={/input} | user-provided value |
97+
| webapp/view/app.view.xml:30:5:30:37 | content={/input0} | webapp/view/app.view.xml:27:5:29:29 | value={/input0} | webapp/view/app.view.xml:30:5:30:37 | content={/input0} | XSS vulnerability due to $@. | webapp/view/app.view.xml:27:5:29:29 | value={/input0} | user-provided value |
98+
| webapp/view/app.view.xml:45:5:45:59 | content={/input3} | webapp/view/app.view.xml:42:5:44:29 | value={/input3} | webapp/view/app.view.xml:45:5:45:59 | content={/input3} | XSS vulnerability due to $@. | webapp/view/app.view.xml:42:5:44:29 | value={/input3} | user-provided value |
99+
| webapp/view/app.view.xml:50:5:50:80 | content={/input4} | webapp/view/app.view.xml:47:5:49:29 | value={/input4} | webapp/view/app.view.xml:50:5:50:80 | content={/input4} | XSS vulnerability due to $@. | webapp/view/app.view.xml:47:5:49:29 | value={/input4} | user-provided value |

‎javascript/frameworks/ui5/test/queries/UI5Xss/xss-html-control/webapp/view/app.view.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,28 @@
22
xmlns="sap.m"
33
xmlns:core="sap.ui.core"
44
xmlns:mvc="sap.ui.core.mvc">
5+
6+
<Input placeholder="Enter Payload"
7+
description="Try: &lt;img src=x onerror=alert(&quot;XSS&quot;)&gt;"
8+
value="{/input}" /> <!--User input source sap.m.Input.value -->
9+
<ComboBoxTextField placeholder="Enter ComboBoxTextField Payload"
10+
value="{/input}" /> <!--User input source sap.m.ComboBoxTextField.value -->
11+
<DatePicker placeholder="Enter DatePicker Payload"
12+
value="{/input}" /> <!--User input source sap.m.DatePicker.value -->
13+
<TextArea placeholder="Enter TextArea Payload"
14+
value="{/input}" /> <!--User input source sap.m.TextArea.value -->
15+
<ComboBoxBase placeholder="Enter ComboBoxBase Payload"
16+
value="{/input}" /> <!--User input source sap.m.ComboBoxBase.value -->
17+
<SearchField placeholder="Enter SearchField Payload"
18+
value="{/input}" /> <!--User input source sap.m.SearchField.value -->
19+
<MultiInput placeholder="Enter MultiInput Payload"
20+
value="{/input}" /> <!--User input source sap.m.MultiInput.value -->
21+
<FeedInput placeholder="Enter FeedInput Payload"
22+
value="{/input}" /> <!--User input source sap.m.FeedInput.value -->
23+
<InputBase placeholder="Enter InputBase Payload"
24+
value="{/input}" /> <!--User input source sap.m.InputBase.value -->
25+
<core:HTML content="{/input}"/> <!--XSS sink sap.ui.core.HTML.content -->
26+
527
<Input placeholder="Enter Payload"
628
description="Try: &lt;img src=x onerror=alert(&quot;XSS&quot;)&gt;"
729
value="{/input0}" /> <!--User input source sap.m.Input.value -->

0 commit comments

Comments
 (0)