Python: Modernise falcon library

RasmusWL · RasmusWL · commit 7a112f37cba4 · 2019-10-15T11:22:46.000+02:00
diff --git a/python/ql/src/semmle/python/web/falcon/General.qll b/python/ql/src/semmle/python/web/falcon/General.qll
@@ -3,21 +3,21 @@ import semmle.python.web.Http
 
 
 /** The falcon API class */
-ClassObject theFalconAPIClass() {
-    result = ModuleObject::named("falcon").attr("API")
+ClassValue theFalconAPIClass() {
+    result = Value::named("falcon.API")
 }
 
 
 /** Holds if `route` is routed to `resource`
  */
-private predicate api_route(CallNode route_call, ControlFlowNode route, ClassObject resource) {
-    route_call.getFunction().(AttrNode).getObject("add_route").refersTo(_, theFalconAPIClass(), _) and
+private predicate api_route(CallNode route_call, ControlFlowNode route, ClassValue resource) {
+    route_call.getFunction().(AttrNode).getObject("add_route").pointsTo().getClass() = theFalconAPIClass() and
     route_call.getArg(0) = route and
-    route_call.getArg(1).refersTo(_, resource, _)
+    route_call.getArg(1).pointsTo().getClass() = resource
 }
 
 private predicate route(FalconRoute route, Function target, string funcname) {
-    route.getResourceClass().lookupAttribute("on_" + funcname).(FunctionObject).getFunction() = target
+    route.getResourceClass().lookup("on_" + funcname).(FunctionValue).getScope() = target
 }
 
 class FalconRoute extends ControlFlowNode {
@@ -33,7 +33,7 @@ class FalconRoute extends ControlFlowNode {
         )
     }
 
-    ClassObject getResourceClass() {
+    ClassValue getResourceClass() {
         api_route(this, _, result)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3,21 +3,21 @@ import semmle.python.web.Http`
`3`	`3`
`4`	`4`
`5`	`5`	`/** The falcon API class */`
`6`		`-ClassObject theFalconAPIClass() {`
`7`		`- result = ModuleObject::named("falcon").attr("API")`
	`6`	`+ClassValue theFalconAPIClass() {`
	`7`	`+ result = Value::named("falcon.API")`
`8`	`8`	`}`
`9`	`9`
`10`	`10`
`11`	`11`	/** Holds if `route` is routed to `resource`
`12`	`12`	`*/`
`13`		`-private predicate api_route(CallNode route_call, ControlFlowNode route, ClassObject resource) {`
`14`		`- route_call.getFunction().(AttrNode).getObject("add_route").refersTo(_, theFalconAPIClass(), _) and`
	`13`	`+private predicate api_route(CallNode route_call, ControlFlowNode route, ClassValue resource) {`
	`14`	`+ route_call.getFunction().(AttrNode).getObject("add_route").pointsTo().getClass() = theFalconAPIClass() and`
`15`	`15`	`route_call.getArg(0) = route and`
`16`		`- route_call.getArg(1).refersTo(_, resource, _)`
	`16`	`+ route_call.getArg(1).pointsTo().getClass() = resource`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`private predicate route(FalconRoute route, Function target, string funcname) {`
`20`		`- route.getResourceClass().lookupAttribute("on_" + funcname).(FunctionObject).getFunction() = target`
	`20`	`+ route.getResourceClass().lookup("on_" + funcname).(FunctionValue).getScope() = target`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`class FalconRoute extends ControlFlowNode {`
`@@ -33,7 +33,7 @@ class FalconRoute extends ControlFlowNode {`
`33`	`33`	`)`
`34`	`34`	`}`
`35`	`35`
`36`		`- ClassObject getResourceClass() {`
	`36`	`+ ClassValue getResourceClass() {`
`37`	`37`	`api_route(this, _, result)`
`38`	`38`	`}`
`39`	`39`