Skip to content

Commit bc1d3de

Browse files
codeql-cicodeql-ci
authored
Merge pull request #4376 from erik-krogh/simpParam
Approved by asgerf
2 parents 75d55c8 + 18f7f2b commit bc1d3de

25 files changed

+86
-38
lines changed

‎javascript/ql/src/semmle/javascript/AMD.qll‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ class AmdModuleDefinition extends CallExpr {
113113
/**
114114
* Gets the `i`th parameter of the factory function of this module.
115115
*/
116-
private SimpleParameter getFactoryParameter(int i) {
116+
private Parameter getFactoryParameter(int i) {
117117
getFactoryNodeInternal().asExpr().(Function).getParameter(i) = result
118118
}
119119

120120
/**
121121
* Gets the parameter corresponding to the pseudo-dependency `require`.
122122
*/
123-
SimpleParameter getRequireParameter() {
123+
Parameter getRequireParameter() {
124124
result = getDependencyParameter("require")
125125
or
126126
// if no dependencies are listed, the first parameter is assumed to be `require`
@@ -133,7 +133,7 @@ class AmdModuleDefinition extends CallExpr {
133133
/**
134134
* Gets the parameter corresponding to the pseudo-dependency `exports`.
135135
*/
136-
SimpleParameter getExportsParameter() {
136+
Parameter getExportsParameter() {
137137
result = getDependencyParameter("exports")
138138
or
139139
// if no dependencies are listed, the second parameter is assumed to be `exports`
@@ -143,7 +143,7 @@ class AmdModuleDefinition extends CallExpr {
143143
/**
144144
* Gets the parameter corresponding to the pseudo-dependency `module`.
145145
*/
146-
SimpleParameter getModuleParameter() {
146+
Parameter getModuleParameter() {
147147
result = getDependencyParameter("module")
148148
or
149149
// if no dependencies are listed, the third parameter is assumed to be `module`

‎javascript/ql/src/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -819,27 +819,27 @@ class LinkFunction extends Function {
819819
/**
820820
* Gets the scope parameter of this function.
821821
*/
822-
SimpleParameter getScopeParameter() { result = getParameter(0) }
822+
Parameter getScopeParameter() { result = getParameter(0) }
823823

824824
/**
825825
* Gets the element parameter of this function (contains a jqLite-wrapped DOM element).
826826
*/
827-
SimpleParameter getElementParameter() { result = getParameter(1) }
827+
Parameter getElementParameter() { result = getParameter(1) }
828828

829829
/**
830830
* Gets the attributes parameter of this function.
831831
*/
832-
SimpleParameter getAttributesParameter() { result = getParameter(2) }
832+
Parameter getAttributesParameter() { result = getParameter(2) }
833833

834834
/**
835835
* Gets the controller parameter of this function.
836836
*/
837-
SimpleParameter getControllerParameter() { result = getParameter(3) }
837+
Parameter getControllerParameter() { result = getParameter(3) }
838838

839839
/**
840840
* Gets the transclude-function parameter of this function.
841841
*/
842-
SimpleParameter getTranscludeFnParameter() { result = getParameter(4) }
842+
Parameter getTranscludeFnParameter() { result = getParameter(4) }
843843
}
844844

845845
/**
@@ -868,7 +868,7 @@ class AngularScope extends TAngularScope {
868868
*/
869869
Expr getAnAccess() {
870870
exists(CustomDirective d | this = d.getAScope() |
871-
exists(SimpleParameter p |
871+
exists(Parameter p |
872872
p = d.getController().getDependencyParameter("$scope") or
873873
p = d.getALinkFunction().getParameter(0)
874874
|
@@ -884,7 +884,7 @@ class AngularScope extends TAngularScope {
884884
d.hasIsolateScope() and result = d.getMember("scope").asExpr()
885885
)
886886
or
887-
exists(DirectiveController c, DOM::ElementDefinition elem, SimpleParameter p |
887+
exists(DirectiveController c, DOM::ElementDefinition elem, Parameter p |
888888
c.boundTo(elem) and
889889
this.mayApplyTo(elem) and
890890
p = c.getFactoryFunction().getDependencyParameter("$scope") and

‎javascript/ql/src/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ abstract class DependencyInjection extends DataFlow::ValueNode {
4141
*/
4242
abstract class InjectableFunction extends DataFlow::ValueNode {
4343
/** Gets the parameter corresponding to dependency `name`. */
44-
abstract SimpleParameter getDependencyParameter(string name);
44+
abstract Parameter getDependencyParameter(string name);
4545

4646
/**
4747
* Gets the `i`th dependency declaration, which is also named `name`.
@@ -67,7 +67,7 @@ abstract class InjectableFunction extends DataFlow::ValueNode {
6767
/**
6868
* Gets a service corresponding to the dependency-injected `parameter`.
6969
*/
70-
ServiceReference getAResolvedDependency(SimpleParameter parameter) {
70+
ServiceReference getAResolvedDependency(Parameter parameter) {
7171
exists(string name, InjectableFunctionServiceRequest request |
7272
this = request.getAnInjectedFunction() and
7373
parameter = getDependencyParameter(name) and
@@ -79,7 +79,7 @@ abstract class InjectableFunction extends DataFlow::ValueNode {
7979
* Gets a Custom service corresponding to the dependency-injected `parameter`.
8080
* (this is a convenience variant of `getAResolvedDependency`)
8181
*/
82-
DataFlow::Node getCustomServiceDependency(SimpleParameter parameter) {
82+
DataFlow::Node getCustomServiceDependency(Parameter parameter) {
8383
exists(CustomServiceDefinition custom |
8484
custom.getServiceReference() = getAResolvedDependency(parameter) and
8585
result = custom.getAService()
@@ -99,11 +99,11 @@ private class FunctionWithImplicitDependencyAnnotation extends InjectableFunctio
9999
not exists(getAPropertyDependencyInjection(astNode))
100100
}
101101

102-
override SimpleParameter getDependencyParameter(string name) {
102+
override Parameter getDependencyParameter(string name) {
103103
result = astNode.getParameterByName(name)
104104
}
105105

106-
override SimpleParameter getDependencyDeclaration(int i, string name) {
106+
override Parameter getDependencyDeclaration(int i, string name) {
107107
result.getName() = name and
108108
result = astNode.getParameter(i)
109109
}
@@ -139,7 +139,7 @@ private class FunctionWithInjectProperty extends InjectableFunction {
139139
)
140140
}
141141

142-
override SimpleParameter getDependencyParameter(string name) {
142+
override Parameter getDependencyParameter(string name) {
143143
exists(int i | exists(getDependencyDeclaration(i, name)) | result = astNode.getParameter(i))
144144
}
145145

@@ -170,7 +170,7 @@ private class FunctionWithExplicitDependencyAnnotation extends InjectableFunctio
170170
function.flowsToExpr(astNode.getElement(astNode.getSize() - 1))
171171
}
172172

173-
override SimpleParameter getDependencyParameter(string name) {
173+
override Parameter getDependencyParameter(string name) {
174174
exists(int i | astNode.getElement(i).mayHaveStringValue(name) |
175175
result = asFunction().getParameter(i)
176176
)

‎javascript/ql/src/semmle/javascript/frameworks/AngularJS/ServiceDefinitions.qll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ abstract class ServiceRequest extends Expr {
479479
/**
480480
* Gets the parameter of this request into which `service` is injected.
481481
*/
482-
abstract SimpleParameter getDependencyParameter(ServiceReference service);
482+
abstract Parameter getDependencyParameter(ServiceReference service);
483483
}
484484

485485
/**
@@ -488,7 +488,7 @@ abstract class ServiceRequest extends Expr {
488488
private class LinkFunctionWithScopeInjection extends ServiceRequest {
489489
LinkFunctionWithScopeInjection() { this instanceof LinkFunction }
490490

491-
override SimpleParameter getDependencyParameter(ServiceReference service) {
491+
override Parameter getDependencyParameter(ServiceReference service) {
492492
service instanceof ScopeServiceReference and
493493
result = this.(LinkFunction).getScopeParameter()
494494
}
@@ -521,7 +521,7 @@ class InjectableFunctionServiceRequest extends ServiceRequest {
521521
result.isInjectable()
522522
}
523523

524-
override SimpleParameter getDependencyParameter(ServiceReference service) {
524+
override Parameter getDependencyParameter(ServiceReference service) {
525525
service = injectedFunction.getAResolvedDependency(result)
526526
}
527527
}

‎javascript/ql/src/semmle/javascript/frameworks/Connect.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ module Connect {
3030
*
3131
* `kind` is one of: "error", "request", "response", "next".
3232
*/
33-
abstract SimpleParameter getRouteHandlerParameter(string kind);
33+
abstract Parameter getRouteHandlerParameter(string kind);
3434

3535
/**
3636
* Gets the parameter of the route handler that contains the request object.
3737
*/
38-
SimpleParameter getRequestParameter() { result = getRouteHandlerParameter("request") }
38+
Parameter getRequestParameter() { result = getRouteHandlerParameter("request") }
3939

4040
/**
4141
* Gets the parameter of the route handler that contains the response object.
4242
*/
43-
SimpleParameter getResponseParameter() { result = getRouteHandlerParameter("response") }
43+
Parameter getResponseParameter() { result = getRouteHandlerParameter("response") }
4444
}
4545

4646
/**
@@ -51,7 +51,7 @@ module Connect {
5151

5252
StandardRouteHandler() { this = any(RouteSetup setup).getARouteHandler() }
5353

54-
override SimpleParameter getRouteHandlerParameter(string kind) {
54+
override Parameter getRouteHandlerParameter(string kind) {
5555
result = getRouteHandlerParameter(astNode, kind)
5656
}
5757
}
@@ -180,7 +180,7 @@ module Connect {
180180
HTTP::Servers::StandardRouteHandler, DataFlow::FunctionNode {
181181
TrackedRouteHandlerCandidateWithSetup() { this = any(RouteSetup s).getARouteHandler() }
182182

183-
override SimpleParameter getRouteHandlerParameter(string kind) {
183+
override Parameter getRouteHandlerParameter(string kind) {
184184
result = getRouteHandlerParameter(astNode, kind)
185185
}
186186
}

‎javascript/ql/src/semmle/javascript/frameworks/Firebase.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ module Firebase {
223223

224224
RouteHandler() { this = any(RouteSetup setup).getARouteHandler() }
225225

226-
override SimpleParameter getRouteHandlerParameter(string kind) {
226+
override Parameter getRouteHandlerParameter(string kind) {
227227
kind = "request" and result = astNode.getParameter(0)
228228
or
229229
kind = "response" and result = astNode.getParameter(1)

‎javascript/ql/src/semmle/javascript/frameworks/Hapi.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ module Hapi {
3030
/**
3131
* Gets the parameter of the route handler that contains the request object.
3232
*/
33-
SimpleParameter getRequestParameter() { result = function.getParameter(0) }
33+
Parameter getRequestParameter() { result = function.getParameter(0) }
3434
}
3535

3636
/**

‎javascript/ql/src/semmle/javascript/frameworks/Koa.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ module Koa {
4747
/**
4848
* Gets the parameter of the route handler that contains the context object.
4949
*/
50-
SimpleParameter getContextParameter() { result = function.getParameter(0) }
50+
Parameter getContextParameter() { result = function.getParameter(0) }
5151

5252
/**
5353
* Gets an expression that contains the "context" object of

‎javascript/ql/src/semmle/javascript/frameworks/NodeJSLib.qll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ module NodeJSLib {
9191
/**
9292
* Gets the parameter of the route handler that contains the request object.
9393
*/
94-
SimpleParameter getRequestParameter() { result = getFunction().getParameter(0) }
94+
Parameter getRequestParameter() { result = getFunction().getParameter(0) }
9595

9696
/**
9797
* Gets the parameter of the route handler that contains the response object.
9898
*/
99-
SimpleParameter getResponseParameter() { result = getFunction().getParameter(1) }
99+
Parameter getResponseParameter() { result = getFunction().getParameter(1) }
100100
}
101101

102102
/**

‎javascript/ql/src/semmle/javascript/frameworks/Restify.qll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ module Restify {
3030
/**
3131
* Gets the parameter of the route handler that contains the request object.
3232
*/
33-
SimpleParameter getRequestParameter() { result = function.getParameter(0) }
33+
Parameter getRequestParameter() { result = function.getParameter(0) }
3434

3535
/**
3636
* Gets the parameter of the route handler that contains the response object.
3737
*/
38-
SimpleParameter getResponseParameter() { result = function.getParameter(1) }
38+
Parameter getResponseParameter() { result = function.getParameter(1) }
3939
}
4040

4141
/**

0 commit comments

Comments
 (0)