Skip to content

Upgrade CodeQL CLI dependency to v2.24.0 #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
data-douser merged 12 commits into from
Jan 30, 2026
Merged

Upgrade CodeQL CLI dependency to v2.24.0 #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
75557a1
Fix `setSanitizeContent` and `setSanitizeValue` name capitalization
mbaluda Dec 22, 2025
98a9458
- Adds a test case for sanitizers
mbaluda Jan 21, 2026
0176dd4
Merge branch 'main' into mbaluda/get-sanitized-content
mbaluda Jan 28, 2026
a71ec82
Models the flow between the `getContent` and `setContent` methods in …
mbaluda Jan 28, 2026
7ef7a35
Update javascript/frameworks/ui5/lib/advanced_security/javascript/fra…
mbaluda Jan 28, 2026
316aae3
Update expected file
mbaluda Jan 28, 2026
810b15a
Upgrade CodeQL CLI dependency to v2.24.0
data-douser Jan 29, 2026
7e2b76c
Merge pull request #278 from advanced-security/mbaluda/get-sanitized-…
data-douser Jan 29, 2026
40464ae
Upgrade CodeQL CLI dependency to v2.24.0
data-douser Jan 29, 2026
eb8c2d3
Merge branch 'codeql/upgrade-to-v2.24.0' of github.com:advanced-secur…
data-douser Jan 29, 2026
86dfa41
Fix overlay[local] errors for CodeQL 2.24.0 upgrade
data-douser Jan 29, 2026
b49acc1
Restore javascript.sarif.expected from main
data-douser Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/javascript.sarif.expected
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions javascript/frameworks/cap/lib/codeql-pack.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
lockVersion: 1.0.0
dependencies:
codeql/concepts:
version: 0.0.12
version: 0.0.14
codeql/controlflow:
version: 2.0.22
version: 2.0.24
codeql/dataflow:
version: 2.0.22
version: 2.0.24
codeql/javascript-all:
version: 2.6.18
version: 2.6.20
codeql/mad:
version: 1.0.38
version: 1.0.40
codeql/regex:
version: 1.0.38
version: 1.0.40
codeql/ssa:
version: 2.0.14
version: 2.0.16
codeql/threat-models:
version: 1.0.38
version: 1.0.40
codeql/tutorial:
version: 1.0.38
version: 1.0.40
codeql/typetracking:
version: 2.0.22
version: 2.0.24
codeql/util:
version: 2.0.25
version: 2.0.27
codeql/xml:
version: 1.0.38
version: 1.0.40
codeql/yaml:
version: 1.0.38
version: 1.0.40
compiled: false
26 changes: 13 additions & 13 deletions javascript/frameworks/cap/src/codeql-pack.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
lockVersion: 1.0.0
dependencies:
codeql/concepts:
version: 0.0.12
version: 0.0.14
codeql/controlflow:
version: 2.0.22
version: 2.0.24
codeql/dataflow:
version: 2.0.22
version: 2.0.24
codeql/javascript-all:
version: 2.6.18
version: 2.6.20
codeql/mad:
version: 1.0.38
version: 1.0.40
codeql/regex:
version: 1.0.38
version: 1.0.40
codeql/ssa:
version: 2.0.14
version: 2.0.16
codeql/threat-models:
version: 1.0.38
version: 1.0.40
codeql/tutorial:
version: 1.0.38
version: 1.0.40
codeql/typetracking:
version: 2.0.22
version: 2.0.24
codeql/util:
version: 2.0.25
version: 2.0.27
codeql/xml:
version: 1.0.38
version: 1.0.40
codeql/yaml:
version: 1.0.38
version: 1.0.40
compiled: false
26 changes: 13 additions & 13 deletions javascript/frameworks/cap/test/codeql-pack.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
lockVersion: 1.0.0
dependencies:
codeql/concepts:
version: 0.0.12
version: 0.0.14
codeql/controlflow:
version: 2.0.22
version: 2.0.24
codeql/dataflow:
version: 2.0.22
version: 2.0.24
codeql/javascript-all:
version: 2.6.18
version: 2.6.20
codeql/mad:
version: 1.0.38
version: 1.0.40
codeql/regex:
version: 1.0.38
version: 1.0.40
codeql/ssa:
version: 2.0.14
version: 2.0.16
codeql/threat-models:
version: 1.0.38
version: 1.0.40
codeql/tutorial:
version: 1.0.38
version: 1.0.40
codeql/typetracking:
version: 2.0.22
version: 2.0.24
codeql/util:
version: 2.0.25
version: 2.0.27
codeql/xml:
version: 1.0.38
version: 1.0.40
codeql/yaml:
version: 1.0.38
version: 1.0.40
compiled: false
26 changes: 13 additions & 13 deletions javascript/frameworks/ui5-webcomponents/test/codeql-pack.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
lockVersion: 1.0.0
dependencies:
codeql/concepts:
version: 0.0.12
version: 0.0.14
codeql/controlflow:
version: 2.0.22
version: 2.0.24
codeql/dataflow:
version: 2.0.22
version: 2.0.24
codeql/javascript-all:
version: 2.6.18
version: 2.6.20
codeql/mad:
version: 1.0.38
version: 1.0.40
codeql/regex:
version: 1.0.38
version: 1.0.40
codeql/ssa:
version: 2.0.14
version: 2.0.16
codeql/threat-models:
version: 1.0.38
version: 1.0.40
codeql/tutorial:
version: 1.0.38
version: 1.0.40
codeql/typetracking:
version: 2.0.22
version: 2.0.24
codeql/util:
version: 2.0.25
version: 2.0.27
codeql/xml:
version: 1.0.38
version: 1.0.40
codeql/yaml:
version: 1.0.38
version: 1.0.40
compiled: false
4 changes: 4 additions & 0 deletions javascript/frameworks/ui5/ext/ui5.model.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ extensions:
- ["SapUICoreInstance", "global", "Member[sap].Member[ui].Member[getCore].ReturnValue"]
- ["Control", "Control", "Instance"]
- ["Control", "sap/ui/core/Control", ""]
- ["Control", "UI5HTMLControl", ""]
- ["Control", "UI5InputControl", ""]
- ["Control", "CustomControl", ""]
- ["Control", "global", "Member[sap].Member[ui].Member[core].Member[Control]"]
- ["Controller", "Controller", "Instance"]
- ["Controller", "sap/ui/core/mvc/Controller", ""]
Expand Down Expand Up @@ -112,6 +115,7 @@ extensions:
data:
- ["UI5InputControl", "Member[value]", "remote"]
- ["UI5InputControl", "Member[getValue].ReturnValue", "remote"]
- ["UI5HTMLControl", "Member[getContent].ReturnValue", "remote"]
- ["UI5CodeEditor", "Member[value]", "remote"]
- ["UI5CodeEditor", "Member[getCurrentValue].ReturnValue", "remote"]
- ["global", "Member[jQuery].Member[sap].Member[syncHead,syncGet,syncGetText,syncPost,syncPostText].ReturnValue", "remote"]
Expand Down
2 changes: 2 additions & 0 deletions javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/UI5.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ class FragmentModule extends DataFlow::SourceNode {
/**
* A user-defined module through `sap.ui.define` or `jQuery.sap.declare`.
*/
overlay[local?]
abstract class UserModule extends CallExpr {
abstract string getADependency();

Expand All @@ -183,6 +184,7 @@ abstract class UserModule extends CallExpr {
* A user-defined module through `sap.ui.define`.
* https://sapui5.hana.ondemand.com/sdk/#/api/sap.ui%23methods/sap.ui.define
*/
overlay[local?]
class SapDefineModule extends AmdModuleDefinition::Range, MethodCallExpr, UserModule {
SapDefineModule() {
/*
Expand Down
13 changes: 10 additions & 3 deletions javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/UI5View.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,8 @@ private newtype TUI5Control =
.(ArrayLiteralNode)
.asExpr()
)
or
control = ModelOutput::getATypeNode("Control").getAnInvocation()
}

class UI5Control extends TUI5Control {
Expand Down Expand Up @@ -852,7 +854,9 @@ class UI5Control extends TUI5Control {
)
or
exists(NewNode control | control = this.asJsControl() |
result = this.asJsControl().asExpr().getAChildExpr().(DotExpr).getQualifiedName()
result = control.asExpr().getAChildExpr().(PropAccess).getQualifiedName()
or
control = API::moduleImport(result).getAnInvocation()
)
}

Expand Down Expand Up @@ -988,9 +992,12 @@ class UI5Control extends TUI5Control {
)
or
/* 3. `sanitizeContent` attribute is set programmatically using a setter. */
exists(CallNode node |
node = this.getAReference().getAMemberCall("setS" + propName.suffix(1)) and
exists(CallNode node, string setterName |
setterName = "set" + propName.prefix(1).toUpperCase() + propName.suffix(1) and
not node.getArgument(0).mayHaveBooleanValue(val.booleanNot())
|
node = this.getAReference().getAMemberCall(setterName) or
node = this.asJsControl().getAMemberCall(setterName)
)
}
}
Expand Down
25 changes: 21 additions & 4 deletions javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/UI5XssQuery.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ module UI5Xss implements DataFlow::ConfigSig {
node.(DataFlow::CallNode).getReceiver().asExpr().(PropAccess).getQualifiedName() = "jQuery.sap" and
node.(DataFlow::CallNode).getCalleeName() =
["encodeCSS", "encodeJS", "encodeURL", "encodeURLParameters", "encodeXML", "encodeHTML"]
or
/* Block flow through setContent/getContent of a sanitized UI5Control */
exists(UI5Control control, DataFlow::MethodCallNode content |
control.asJsControl() = content.getReceiver().getALocalSource() and
control.isHTMLSanitized() and
content.getMethodName() = ["setContent", "getContent"] and
node = [content, content.getArgument(0)]
)
}

predicate isSink(DataFlow::Node node) {
Expand All @@ -56,6 +64,19 @@ module UI5Xss implements DataFlow::ConfigSig {

end = h.getParameter(0)
)
or
/* Flow from `setContent` to `getContent` of a control */
exists(
UI5Control control, DataFlow::MethodCallNode getContent, DataFlow::MethodCallNode setContent
|
control.asJsControl() = setContent.getReceiver().getALocalSource() and
control.asJsControl() = getContent.getReceiver().getALocalSource() and
setContent.getMethodName() = "setContent" and
getContent.getMethodName() = "getContent" and
start = setContent.getArgument(0) and
end = getContent and
not control.isHTMLSanitized()
)
}
}

Expand Down Expand Up @@ -93,10 +114,6 @@ private class UI5ExtHtmlISink extends DataFlow::Node {
}
}

private class HTMLControlInstantiation extends ElementInstantiation {
HTMLControlInstantiation() { typeModel("UI5HTMLControl", this.getImportPath(), _) }
}

private module TrackPlaceAtCallConfigFlow = TaintTracking::Global<TrackPlaceAtCallConfig>;

abstract class DynamicallySetElementValueOfHTML extends DataFlow::Node { }
Expand Down
26 changes: 13 additions & 13 deletions javascript/frameworks/ui5/lib/codeql-pack.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
lockVersion: 1.0.0
dependencies:
codeql/concepts:
version: 0.0.12
version: 0.0.14
codeql/controlflow:
version: 2.0.22
version: 2.0.24
codeql/dataflow:
version: 2.0.22
version: 2.0.24
codeql/javascript-all:
version: 2.6.18
version: 2.6.20
codeql/mad:
version: 1.0.38
version: 1.0.40
codeql/regex:
version: 1.0.38
version: 1.0.40
codeql/ssa:
version: 2.0.14
version: 2.0.16
codeql/threat-models:
version: 1.0.38
version: 1.0.40
codeql/tutorial:
version: 1.0.38
version: 1.0.40
codeql/typetracking:
version: 2.0.22
version: 2.0.24
codeql/util:
version: 2.0.25
version: 2.0.27
codeql/xml:
version: 1.0.38
version: 1.0.40
codeql/yaml:
version: 1.0.38
version: 1.0.40
compiled: false
26 changes: 13 additions & 13 deletions javascript/frameworks/ui5/src/codeql-pack.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
lockVersion: 1.0.0
dependencies:
codeql/concepts:
version: 0.0.12
version: 0.0.14
codeql/controlflow:
version: 2.0.22
version: 2.0.24
codeql/dataflow:
version: 2.0.22
version: 2.0.24
codeql/javascript-all:
version: 2.6.18
version: 2.6.20
codeql/mad:
version: 1.0.38
version: 1.0.40
codeql/regex:
version: 1.0.38
version: 1.0.40
codeql/ssa:
version: 2.0.14
version: 2.0.16
codeql/threat-models:
version: 1.0.38
version: 1.0.40
codeql/tutorial:
version: 1.0.38
version: 1.0.40
codeql/typetracking:
version: 2.0.22
version: 2.0.24
codeql/util:
version: 2.0.25
version: 2.0.27
codeql/xml:
version: 1.0.38
version: 1.0.40
codeql/yaml:
version: 1.0.38
version: 1.0.40
compiled: false
Loading
Loading