Skip to content

Commit b67b80c

Browse files
committed
Ruby: rack - rename App as RackApplication
1 parent de65473 commit b67b80c

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

ruby/ql/lib/codeql/ruby/frameworks/actiondispatch/internal/Request.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ module Request {
128128
private import codeql.ruby.frameworks.Rack
129129

130130
private class RackEnv extends Env {
131-
RackEnv() { this = any(Rack::App::App app).getEnv().getALocalUse() }
131+
RackEnv() { this = any(Rack::App::RackApplication app).getEnv().getALocalUse() }
132132
}
133133

134134
/**

ruby/ql/lib/codeql/ruby/frameworks/rack/internal/App.qll

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ module App {
9393
* taking a single argument and returns a rack response, or a lambda or
9494
* proc that takes a single `env` argument and returns a rack response.
9595
*/
96-
abstract class App extends TApp {
96+
abstract class RackApplication extends TApp {
9797
/** Gets a textual representation of this element. */
9898
string toString() { result = "Rack application" }
9999

@@ -112,11 +112,11 @@ module App {
112112
* an instance method or a singleton method named "call" which takes a
113113
* single `env` argument and returns a rack response.
114114
*/
115-
private class ClassApp extends TApp, App {
115+
private class ClassRackApplication extends TApp, RackApplication {
116116
private DataFlow::ClassNode cn;
117117
private CallNode call;
118118

119-
ClassApp() {
119+
ClassRackApplication() {
120120
this = TClassApp(cn, call) and
121121
call = [cn.getInstanceMethod("call"), cn.getSingletonMethod("call")]
122122
}
@@ -130,10 +130,10 @@ module App {
130130
* A rack application that is either a lambda or a proc, which takes a
131131
* single `env` argument and returns a rack response.
132132
*/
133-
private class AnonymousApp extends TApp, App {
133+
private class AnonymousRackApplication extends TApp, RackApplication {
134134
private CallNode call;
135135

136-
AnonymousApp() {
136+
AnonymousRackApplication() {
137137
this = TAnonymousApp(call) and
138138
not exists(DataFlow::ClassNode cn |
139139
call = [cn.getInstanceMethod(_), cn.getSingletonMethod(_)]

ruby/ql/lib/codeql/ruby/frameworks/rack/internal/Response.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ module Public {
9191
/** A `DataFlow::Node` returned from a rack request. */
9292
class ResponseNode extends Http::Server::HttpResponse::Range instanceof Private::PotentialResponseNode
9393
{
94-
ResponseNode() { this = any(A::App::App app).getAResponse() }
94+
ResponseNode() { this = any(A::App::RackApplication app).getAResponse() }
9595

9696
override DataFlow::Node getBody() { result = this.(Private::PotentialResponseNode).getBody() }
9797

ruby/ql/test/library-tests/frameworks/rack/Rack.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ private import codeql.ruby.frameworks.Rack
33
private import codeql.ruby.DataFlow
44

55
query predicate rackApps(
6-
Rack::App::App app, DataFlow::ParameterNode env, Rack::Response::ResponseNode resp
6+
Rack::App::RackApplication app, DataFlow::ParameterNode env, Rack::Response::ResponseNode resp
77
) {
88
env = app.getEnv() and resp = app.getAResponse()
99
}

0 commit comments

Comments
 (0)