Skip to content

Address CodeQL warnings #133

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
merged 1 commit into from
Jul 30, 2024
Merged

Address CodeQL warnings #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions javascript/frameworks/cap/ext/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ library: true
name: advanced-security/javascript-sap-cap-models
version: 0.2.0
extensionTargets:
codeql/javascript-all: "^1.1.0"
codeql/javascript-queries: "^1.0.3"
dataExtensions:
- "*.model.yml"
codeql/javascript-all: "^1.1.1"
codeql/javascript-queries: "^1.1.0"
20 changes: 10 additions & 10 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,23 +2,23 @@
lockVersion: 1.0.0
dependencies:
codeql/dataflow:
version: 1.0.3
version: 1.0.4
codeql/javascript-all:
version: 1.1.0
version: 1.1.1
codeql/mad:
version: 1.0.3
version: 1.0.4
codeql/regex:
version: 1.0.3
version: 1.0.4
codeql/ssa:
version: 1.0.3
version: 1.0.4
codeql/tutorial:
version: 1.0.3
version: 1.0.4
codeql/typetracking:
version: 1.0.3
version: 1.0.4
codeql/util:
version: 1.0.3
version: 1.0.4
codeql/xml:
version: 1.0.3
version: 1.0.4
codeql/yaml:
version: 1.0.3
version: 1.0.4
compiled: false
2 changes: 1 addition & 1 deletion javascript/frameworks/cap/lib/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ version: 0.2.0
suites: codeql-suites
extractor: javascript
dependencies:
codeql/javascript-all: "^1.1.0"
codeql/javascript-all: "^1.1.1"
advanced-security/javascript-sap-cap-models: "^0.2.0"
20 changes: 10 additions & 10 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,23 +2,23 @@
lockVersion: 1.0.0
dependencies:
codeql/dataflow:
version: 1.0.3
version: 1.0.4
codeql/javascript-all:
version: 1.1.0
version: 1.1.1
codeql/mad:
version: 1.0.3
version: 1.0.4
codeql/regex:
version: 1.0.3
version: 1.0.4
codeql/ssa:
version: 1.0.3
version: 1.0.4
codeql/tutorial:
version: 1.0.3
version: 1.0.4
codeql/typetracking:
version: 1.0.3
version: 1.0.4
codeql/util:
version: 1.0.3
version: 1.0.4
codeql/xml:
version: 1.0.3
version: 1.0.4
codeql/yaml:
version: 1.0.3
version: 1.0.4
compiled: false
2 changes: 1 addition & 1 deletion javascript/frameworks/cap/src/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: 0.2.0
suites: codeql-suites
extractor: javascript
dependencies:
codeql/javascript-all: "^1.1.0"
codeql/javascript-all: "^1.1.1"
advanced-security/javascript-sap-cap-models: "^0.2.0"
advanced-security/javascript-sap-cap-all: "^0.2.0"
default-suite-file: codeql-suites/javascript-code-scanning.qls
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/dataflow:
version: 1.0.3
version: 1.0.4
codeql/javascript-all:
version: 1.1.0
version: 1.1.1
codeql/javascript-queries:
version: 1.0.3
version: 1.1.0
codeql/mad:
version: 1.0.3
version: 1.0.4
codeql/regex:
version: 1.0.3
version: 1.0.4
codeql/ssa:
version: 1.0.3
version: 1.0.4
codeql/suite-helpers:
version: 1.0.3
version: 1.0.4
codeql/tutorial:
version: 1.0.3
version: 1.0.4
codeql/typetracking:
version: 1.0.3
version: 1.0.4
codeql/typos:
version: 1.0.3
version: 1.0.4
codeql/util:
version: 1.0.3
version: 1.0.4
codeql/xml:
version: 1.0.3
version: 1.0.4
codeql/yaml:
version: 1.0.3
version: 1.0.4
compiled: false
4 changes: 2 additions & 2 deletions javascript/frameworks/cap/test/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: advanced-security/javascript-sap-cap-queries-tests
version: 0.2.0
extractor: javascript
dependencies:
codeql/javascript-all: "^1.1.0"
codeql/javascript-queries: "^1.0.3"
codeql/javascript-all: "^1.1.1"
codeql/javascript-queries: "^1.1.0"
advanced-security/javascript-sap-cap-queries: "^0.2.0"
advanced-security/javascript-sap-cap-models: "^0.2.0"
advanced-security/javascript-sap-cap-all: "^0.2.0"
2 changes: 1 addition & 1 deletion javascript/frameworks/ui5/ext/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ library: true
name: advanced-security/javascript-sap-ui5-models
version: 0.6.0
extensionTargets:
codeql/javascript-all: "^1.1.0"
codeql/javascript-all: "^1.1.1"
dataExtensions:
- "*.model.yml"
16 changes: 5 additions & 11 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 @@ -956,8 +956,6 @@ class UI5Handler extends FunctionNode {
* Models controller references in event handlers as types
*/
class ControlTypeInHandlerModel extends ModelInput::TypeModel {
// TODO (see https://github.com/github/codeql/pull/14120)
// override predicate isTypeUsed(string type) { type = any(UI5Control c).getImportPath() }
override DataFlow::CallNode getASource(string type) {
// oEvent.getSource() is of the type of the Control calling the handler
exists(UI5Handler h |
Expand All @@ -972,14 +970,10 @@ class ControlTypeInHandlerModel extends ModelInput::TypeModel {
result = c.getAReference()
)
}
}

/**
* A workaround for the interfearence of pruning with TypeModel
* TODO remove after https://github.com/github/codeql/pull/14120
*/
class DisablePruning extends ModelInput::TypeModelCsv {
override predicate row(string row) {
row = any(UI5Control c).getImportPath() + ";global;DummyAccessPathForPruning"
}
/**
* Prevents model pruning for `ControlType`types
*/
bindingset[type]
override predicate isTypeUsed(string type) { any() }
}
20 changes: 10 additions & 10 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,23 +2,23 @@
lockVersion: 1.0.0
dependencies:
codeql/dataflow:
version: 1.0.3
version: 1.0.4
codeql/javascript-all:
version: 1.1.0
version: 1.1.1
codeql/mad:
version: 1.0.3
version: 1.0.4
codeql/regex:
version: 1.0.3
version: 1.0.4
codeql/ssa:
version: 1.0.3
version: 1.0.4
codeql/tutorial:
version: 1.0.3
version: 1.0.4
codeql/typetracking:
version: 1.0.3
version: 1.0.4
codeql/util:
version: 1.0.3
version: 1.0.4
codeql/xml:
version: 1.0.3
version: 1.0.4
codeql/yaml:
version: 1.0.3
version: 1.0.4
compiled: false
2 changes: 1 addition & 1 deletion javascript/frameworks/ui5/lib/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ version: 0.6.0
suites: codeql-suites
extractor: javascript
dependencies:
codeql/javascript-all: "^1.1.0"
codeql/javascript-all: "^1.1.1"
advanced-security/javascript-sap-ui5-models: "^0.6.0"
20 changes: 10 additions & 10 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,23 +2,23 @@
lockVersion: 1.0.0
dependencies:
codeql/dataflow:
version: 1.0.3
version: 1.0.4
codeql/javascript-all:
version: 1.1.0
version: 1.1.1
codeql/mad:
version: 1.0.3
version: 1.0.4
codeql/regex:
version: 1.0.3
version: 1.0.4
codeql/ssa:
version: 1.0.3
version: 1.0.4
codeql/tutorial:
version: 1.0.3
version: 1.0.4
codeql/typetracking:
version: 1.0.3
version: 1.0.4
codeql/util:
version: 1.0.3
version: 1.0.4
codeql/xml:
version: 1.0.3
version: 1.0.4
codeql/yaml:
version: 1.0.3
version: 1.0.4
compiled: false
2 changes: 1 addition & 1 deletion javascript/frameworks/ui5/src/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: 0.6.0
suites: codeql-suites
extractor: javascript
dependencies:
codeql/javascript-all: "^1.1.0"
codeql/javascript-all: "^1.1.1"
advanced-security/javascript-sap-ui5-models: "^0.6.0"
advanced-security/javascript-sap-ui5-all: "^0.6.0"
default-suite-file: codeql-suites/javascript-code-scanning.qls
26 changes: 13 additions & 13 deletions javascript/frameworks/ui5/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/dataflow:
version: 1.0.3
version: 1.0.4
codeql/javascript-all:
version: 1.1.0
version: 1.1.1
codeql/javascript-queries:
version: 1.0.3
version: 1.1.0
codeql/mad:
version: 1.0.3
version: 1.0.4
codeql/regex:
version: 1.0.3
version: 1.0.4
codeql/ssa:
version: 1.0.3
version: 1.0.4
codeql/suite-helpers:
version: 1.0.3
version: 1.0.4
codeql/tutorial:
version: 1.0.3
version: 1.0.4
codeql/typetracking:
version: 1.0.3
version: 1.0.4
codeql/typos:
version: 1.0.3
version: 1.0.4
codeql/util:
version: 1.0.3
version: 1.0.4
codeql/xml:
version: 1.0.3
version: 1.0.4
codeql/yaml:
version: 1.0.3
version: 1.0.4
compiled: false
4 changes: 2 additions & 2 deletions javascript/frameworks/ui5/test/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: advanced-security/javascript-sap-ui5-queries-tests
version: 0.6.0
extractor: javascript
dependencies:
codeql/javascript-all: "^1.1.0"
codeql/javascript-queries: "^1.0.3"
codeql/javascript-all: "^1.1.1"
codeql/javascript-queries: "^1.1.0"
advanced-security/javascript-sap-ui5-queries: "^0.6.0"
advanced-security/javascript-sap-ui5-models: "^0.6.0"
advanced-security/javascript-sap-ui5-all: "^0.6.0"
4 changes: 2 additions & 2 deletions javascript/frameworks/xsjs/ext/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ library: true
name: advanced-security/javascript-sap-async-xsjs-models
version: 0.1.0
extensionTargets:
codeql/javascript-all: "^1.1.0"
codeql/javascript-queries: "^1.0.3"
codeql/javascript-all: "^1.1.1"
codeql/javascript-queries: "^1.1.0"
dataExtensions:
- "*.model.yml"
3 changes: 2 additions & 1 deletion ...ipt/frameworks/xsjs/lib/advanced_security/javascript/frameworks/xsjs/XSJSZipSlipQuery.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ class ZipEntryPathIndexOfCallEqualsZeroGuard extends TaintTracking::SanitizerGua
receiver = targetFilePath.asExpr() and
targetFilePath = indexOfCall.getReceiver() and
forLoopVariable = forLoop.getAnIterationVariable().getAnAccess().flow() and
TaintedPath::isAdditionalTaintedPathFlowStep(forLoopVariable, targetFilePath.getALocalSource(), _, _) and
TaintedPath::isAdditionalTaintedPathFlowStep(forLoopVariable,
targetFilePath.getALocalSource(), _, _) and
outcome = equalityTest.getPolarity()
)
}
Expand Down
20 changes: 10 additions & 10 deletions javascript/frameworks/xsjs/lib/codeql-pack.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
lockVersion: 1.0.0
dependencies:
codeql/dataflow:
version: 1.0.3
version: 1.0.4
codeql/javascript-all:
version: 1.1.0
version: 1.1.1
codeql/mad:
version: 1.0.3
version: 1.0.4
codeql/regex:
version: 1.0.3
version: 1.0.4
codeql/ssa:
version: 1.0.3
version: 1.0.4
codeql/tutorial:
version: 1.0.3
version: 1.0.4
codeql/typetracking:
version: 1.0.3
version: 1.0.4
codeql/util:
version: 1.0.3
version: 1.0.4
codeql/xml:
version: 1.0.3
version: 1.0.4
codeql/yaml:
version: 1.0.3
version: 1.0.4
compiled: false
2 changes: 1 addition & 1 deletion javascript/frameworks/xsjs/lib/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ version: 0.1.0
suites: codeql-suites
extractor: javascript
dependencies:
codeql/javascript-all: "^1.1.0"
codeql/javascript-all: "^1.1.1"
Loading