Skip to content

Commit 1c141c4

Browse files
knewbury01knewbury01
committed
Merge branch 'knewbury01/e2-pii-cap' of https://github.com/advanced-security/codeql-sap-js into knewbury01/e2-pii-cap
2 parents 9f14a4d + 98b9a52 commit 1c141c4

File tree

26 files changed

+137
-144
lines changed

26 files changed

+137
-144
lines changed

‎javascript/frameworks/cap/ext/qlpack.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@ library: true
33
name: advanced-security/javascript-sap-cap-models
44
version: 0.2.0
55
extensionTargets:
6-
codeql/javascript-all: "^1.1.0"
7-
codeql/javascript-queries: "^1.0.3"
8-
dataExtensions:
9-
- "*.model.yml"
6+
codeql/javascript-all: "^1.1.1"
7+
codeql/javascript-queries: "^1.1.0"

‎javascript/frameworks/cap/lib/codeql-pack.lock.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/dataflow:
5-
version: 1.0.3
5+
version: 1.0.4
66
codeql/javascript-all:
7-
version: 1.1.0
7+
version: 1.1.1
88
codeql/mad:
9-
version: 1.0.3
9+
version: 1.0.4
1010
codeql/regex:
11-
version: 1.0.3
11+
version: 1.0.4
1212
codeql/ssa:
13-
version: 1.0.3
13+
version: 1.0.4
1414
codeql/tutorial:
15-
version: 1.0.3
15+
version: 1.0.4
1616
codeql/typetracking:
17-
version: 1.0.3
17+
version: 1.0.4
1818
codeql/util:
19-
version: 1.0.3
19+
version: 1.0.4
2020
codeql/xml:
21-
version: 1.0.3
21+
version: 1.0.4
2222
codeql/yaml:
23-
version: 1.0.3
23+
version: 1.0.4
2424
compiled: false

‎javascript/frameworks/cap/lib/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ version: 0.2.0
55
suites: codeql-suites
66
extractor: javascript
77
dependencies:
8-
codeql/javascript-all: "^1.1.0"
8+
codeql/javascript-all: "^1.1.1"
99
advanced-security/javascript-sap-cap-models: "^0.2.0"

‎javascript/frameworks/cap/src/codeql-pack.lock.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/dataflow:
5-
version: 1.0.3
5+
version: 1.0.4
66
codeql/javascript-all:
7-
version: 1.1.0
7+
version: 1.1.1
88
codeql/mad:
9-
version: 1.0.3
9+
version: 1.0.4
1010
codeql/regex:
11-
version: 1.0.3
11+
version: 1.0.4
1212
codeql/ssa:
13-
version: 1.0.3
13+
version: 1.0.4
1414
codeql/tutorial:
15-
version: 1.0.3
15+
version: 1.0.4
1616
codeql/typetracking:
17-
version: 1.0.3
17+
version: 1.0.4
1818
codeql/util:
19-
version: 1.0.3
19+
version: 1.0.4
2020
codeql/xml:
21-
version: 1.0.3
21+
version: 1.0.4
2222
codeql/yaml:
23-
version: 1.0.3
23+
version: 1.0.4
2424
compiled: false

‎javascript/frameworks/cap/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version: 0.2.0
55
suites: codeql-suites
66
extractor: javascript
77
dependencies:
8-
codeql/javascript-all: "^1.1.0"
8+
codeql/javascript-all: "^1.1.1"
99
advanced-security/javascript-sap-cap-models: "^0.2.0"
1010
advanced-security/javascript-sap-cap-all: "^0.2.0"
1111
default-suite-file: codeql-suites/javascript-code-scanning.qls

‎javascript/frameworks/cap/test/codeql-pack.lock.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/dataflow:
5-
version: 1.0.3
5+
version: 1.0.4
66
codeql/javascript-all:
7-
version: 1.1.0
7+
version: 1.1.1
88
codeql/javascript-queries:
9-
version: 1.0.3
9+
version: 1.1.0
1010
codeql/mad:
11-
version: 1.0.3
11+
version: 1.0.4
1212
codeql/regex:
13-
version: 1.0.3
13+
version: 1.0.4
1414
codeql/ssa:
15-
version: 1.0.3
15+
version: 1.0.4
1616
codeql/suite-helpers:
17-
version: 1.0.3
17+
version: 1.0.4
1818
codeql/tutorial:
19-
version: 1.0.3
19+
version: 1.0.4
2020
codeql/typetracking:
21-
version: 1.0.3
21+
version: 1.0.4
2222
codeql/typos:
23-
version: 1.0.3
23+
version: 1.0.4
2424
codeql/util:
25-
version: 1.0.3
25+
version: 1.0.4
2626
codeql/xml:
27-
version: 1.0.3
27+
version: 1.0.4
2828
codeql/yaml:
29-
version: 1.0.3
29+
version: 1.0.4
3030
compiled: false

‎javascript/frameworks/cap/test/qlpack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: advanced-security/javascript-sap-cap-queries-tests
33
version: 0.2.0
44
extractor: javascript
55
dependencies:
6-
codeql/javascript-all: "^1.1.0"
7-
codeql/javascript-queries: "^1.0.3"
6+
codeql/javascript-all: "^1.1.1"
7+
codeql/javascript-queries: "^1.1.0"
88
advanced-security/javascript-sap-cap-queries: "^0.2.0"
99
advanced-security/javascript-sap-cap-models: "^0.2.0"
1010
advanced-security/javascript-sap-cap-all: "^0.2.0"

‎javascript/frameworks/ui5/ext/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ library: true
33
name: advanced-security/javascript-sap-ui5-models
44
version: 0.6.0
55
extensionTargets:
6-
codeql/javascript-all: "^1.1.0"
6+
codeql/javascript-all: "^1.1.1"
77
dataExtensions:
88
- "*.model.yml"

‎javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/UI5View.qll

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -956,8 +956,6 @@ class UI5Handler extends FunctionNode {
956956
* Models controller references in event handlers as types
957957
*/
958958
class ControlTypeInHandlerModel extends ModelInput::TypeModel {
959-
// TODO (see https://github.com/github/codeql/pull/14120)
960-
// override predicate isTypeUsed(string type) { type = any(UI5Control c).getImportPath() }
961959
override DataFlow::CallNode getASource(string type) {
962960
// oEvent.getSource() is of the type of the Control calling the handler
963961
exists(UI5Handler h |
@@ -972,14 +970,10 @@ class ControlTypeInHandlerModel extends ModelInput::TypeModel {
972970
result = c.getAReference()
973971
)
974972
}
975-
}
976973

977-
/**
978-
* A workaround for the interfearence of pruning with TypeModel
979-
* TODO remove after https://github.com/github/codeql/pull/14120
980-
*/
981-
class DisablePruning extends ModelInput::TypeModelCsv {
982-
override predicate row(string row) {
983-
row = any(UI5Control c).getImportPath() + ";global;DummyAccessPathForPruning"
984-
}
974+
/**
975+
* Prevents model pruning for `ControlType`types
976+
*/
977+
bindingset[type]
978+
override predicate isTypeUsed(string type) { any() }
985979
}

‎javascript/frameworks/ui5/lib/codeql-pack.lock.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/dataflow:
5-
version: 1.0.3
5+
version: 1.0.4
66
codeql/javascript-all:
7-
version: 1.1.0
7+
version: 1.1.1
88
codeql/mad:
9-
version: 1.0.3
9+
version: 1.0.4
1010
codeql/regex:
11-
version: 1.0.3
11+
version: 1.0.4
1212
codeql/ssa:
13-
version: 1.0.3
13+
version: 1.0.4
1414
codeql/tutorial:
15-
version: 1.0.3
15+
version: 1.0.4
1616
codeql/typetracking:
17-
version: 1.0.3
17+
version: 1.0.4
1818
codeql/util:
19-
version: 1.0.3
19+
version: 1.0.4
2020
codeql/xml:
21-
version: 1.0.3
21+
version: 1.0.4
2222
codeql/yaml:
23-
version: 1.0.3
23+
version: 1.0.4
2424
compiled: false

0 commit comments

Comments
 (0)