Make QL more concise

Author: owen-mc

go/ql/lib/semmle/go/frameworks/Twirp.qll

@@ -40,10 +40,7 @@ module Twirp {
    */
   class ProtobufMessageType extends Type {
     ProtobufMessageType() {
-      exists(TypeEntity te |
-        te.getType() = this and
-        te.getDeclaration().getLocation().getFile() instanceof ProtobufGeneratedFile
-      )
+      this.hasLocationInfo(any(ProtobufGeneratedFile f).getAbsolutePath(), _, _, _, _)
     }
   }
 
@@ -54,11 +51,8 @@ module Twirp {
     NamedType namedType;
 
     ServiceInterfaceType() {
-      exists(TypeEntity te |
-        te.getType() = namedType and
-        namedType.getUnderlyingType() = this and
-        te.getDeclaration().getLocation().getFile() instanceof ServicesGeneratedFile
-      )
+      namedType.getUnderlyingType() = this and
+      namedType.hasLocationInfo(any(ServicesGeneratedFile f).getAbsolutePath(), _, _, _, _)
     }
 
     /**
@@ -77,12 +71,11 @@ module Twirp {
    */
   class ServiceClientType extends NamedType {
     ServiceClientType() {
-      exists(ServiceInterfaceType i, PointerType p, TypeEntity te |
+      exists(ServiceInterfaceType i, PointerType p |
         p.implements(i) and
         this = p.getBaseType() and
         this.getName().regexpMatch("(?i)" + i.getName() + "(protobuf|json)client") and
-        te.getType() = this and
-        te.getDeclaration().getLocation().getFile() instanceof ServicesGeneratedFile
+        this.hasLocationInfo(any(ServicesGeneratedFile f).getAbsolutePath(), _, _, _, _)
       )
     }
   }
@@ -92,11 +85,10 @@ module Twirp {
    */
   class ServiceServerType extends NamedType {
     ServiceServerType() {
-      exists(ServiceInterfaceType i, TypeEntity te |
+      exists(ServiceInterfaceType i |
         this.implements(i) and
         this.getName().regexpMatch("(?i)" + i.getName() + "server") and
-        te.getType() = this and
-        te.getDeclaration().getLocation().getFile() instanceof ServicesGeneratedFile
+        this.hasLocationInfo(any(ServicesGeneratedFile f).getAbsolutePath(), _, _, _, _)
       )
     }
   }
@@ -106,12 +98,10 @@ module Twirp {
    */
   class ClientConstructor extends Function {
     ClientConstructor() {
-      exists(ServiceClientType c |
-        this.getName().regexpMatch("(?i)new" + c.getName()) and
-        this.getParameterType(0) instanceof StringType and
-        this.getParameterType(1).getName() = "HTTPClient" and
-        this.getDeclaration().getLocation().getFile() instanceof ServicesGeneratedFile
-      )
+      this.getName().regexpMatch("(?i)new" + any(ServiceClientType c).getName()) and
+      this.getParameterType(0) instanceof StringType and
+      this.getParameterType(1).getName() = "HTTPClient" and
+      this.hasLocationInfo(any(ServicesGeneratedFile f).getAbsolutePath(), _, _, _, _)
     }
   }
 
@@ -122,11 +112,9 @@ module Twirp {
    */
   class ServerConstructor extends Function {
     ServerConstructor() {
-      exists(ServiceServerType c, ServiceInterfaceType i |
-        this.getName().regexpMatch("(?i)new" + c.getName()) and
-        this.getParameterType(0) = i.getNamedType() and
-        this.getDeclaration().getLocation().getFile() instanceof ServicesGeneratedFile
-      )
+      this.getName().regexpMatch("(?i)new" + any(ServiceServerType c).getName()) and
+      this.getParameterType(0) = any(ServiceInterfaceType i).getNamedType() and
+      this.hasLocationInfo(any(ServicesGeneratedFile f).getAbsolutePath(), _, _, _, _)
     }
   }
 
@@ -151,11 +139,10 @@ module Twirp {
    */
   class ServiceHandler extends Method {
     ServiceHandler() {
-      exists(DataFlow::CallNode call, Type handlerType, ServiceInterfaceType i |
+      exists(DataFlow::CallNode call |
         call.getTarget() instanceof ServerConstructor and
-        call.getArgument(0).getType() = handlerType and
-        this = handlerType.getMethod(_) and
-        this.implements(i.getNamedType().getMethod(_))
+        this = call.getArgument(0).getType().getMethod(_) and
+        this.implements(any(ServiceInterfaceType i).getNamedType().getMethod(_))
       )
     }
   }
@@ -165,8 +152,8 @@ module Twirp {
    */
   class Request extends UntrustedFlowSource::Range instanceof DataFlow::ParameterNode {
     Request() {
-      exists(FuncDef c, ServiceHandler handler | handler.getFuncDecl() = c |
-        this.asParameter().isParameterOf(c, 1) and
+      exists(ServiceHandler handler |
+        this.asParameter().isParameterOf(handler.getFuncDecl(), 1) and
         handler.getParameterType(0).hasQualifiedName("context", "Context") and
         this.getType().(PointerType).getBaseType() instanceof ProtobufMessageType
       )