Python: ExternalAPIs.qll: Swap order of classes

Co-authored-by: yoff <[email protected]>

Author: RasmusWL

python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll

@@ -111,44 +111,44 @@ abstract class InterestingExternalApiCall extends TInterestingExternalApiCall {
   abstract string getApiName();
 }
 
-class ResolvedCall extends InterestingExternalApiCall, TResolvedCall {
-  DataFlowPrivate::DataFlowCall dfCall;
+class UnresolvedCall extends InterestingExternalApiCall, TUnresolvedCall {
+  DataFlow::CallCfgNode call;
 
-  ResolvedCall() { this = TResolvedCall(dfCall) }
+  UnresolvedCall() { this = TUnresolvedCall(call) }
 
   override DataFlow::Node getArgument(DataFlowPrivate::ArgumentPosition apos) {
-    result = dfCall.getArgument(apos)
+    exists(int i | apos.isPositional(i) | result = call.getArg(i))
+    or
+    exists(string name | apos.isKeyword(name) | result = call.getArgByName(name))
   }
 
   override string toString() {
-    result = "ExternalAPI:ResolvedCall: " + dfCall.getNode().getNode().toString()
+    result = "ExternalAPI:UnresolvedCall: " + call.getNode().getNode().toString()
   }
 
   override string getApiName() {
-    exists(DataFlow::CallCfgNode call, API::Node apiNode | dfCall.getNode() = call.getNode() |
+    exists(API::Node apiNode |
       result = apiNodeToStringRepr(apiNode) and
       apiNode.getACall() = call
     )
   }
 }
 
-class UnresolvedCall extends InterestingExternalApiCall, TUnresolvedCall {
-  DataFlow::CallCfgNode call;
+class ResolvedCall extends InterestingExternalApiCall, TResolvedCall {
+  DataFlowPrivate::DataFlowCall dfCall;
 
-  UnresolvedCall() { this = TUnresolvedCall(call) }
+  ResolvedCall() { this = TResolvedCall(dfCall) }
 
   override DataFlow::Node getArgument(DataFlowPrivate::ArgumentPosition apos) {
-    exists(int i | apos.isPositional(i) | result = call.getArg(i))
-    or
-    exists(string name | apos.isKeyword(name) | result = call.getArgByName(name))
+    result = dfCall.getArgument(apos)
   }
 
   override string toString() {
-    result = "ExternalAPI:UnresolvedCall: " + call.getNode().getNode().toString()
+    result = "ExternalAPI:ResolvedCall: " + dfCall.getNode().getNode().toString()
   }
 
   override string getApiName() {
-    exists(API::Node apiNode |
+    exists(DataFlow::CallCfgNode call, API::Node apiNode | dfCall.getNode() = call.getNode() |
       result = apiNodeToStringRepr(apiNode) and
       apiNode.getACall() = call
     )