address review feedback

Author: Alvaro Muñoz

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

@@ -7,7 +7,7 @@ import semmle.go.security.RequestForgery
 module Twirp {
   /**
    * A *.pb.go file generated by Twirp.
-   * This file will all the types representing protobuf messages and should have a companion *.twirp.go file.
+   * This file contains all the types representing protobuf messages and should have a companion *.twirp.go file.
    */
   class ProtobufGeneratedFile extends File {
     ProtobufGeneratedFile() {
@@ -77,12 +77,10 @@ module Twirp {
    * A Twirp client
    */
   class ServiceClient extends NamedType {
-    PointerType pointerType;
-
     ServiceClient() {
-      exists(ServiceInterface i |
-        pointerType.implements(i) and
-        this = pointerType.getBaseType() and
+      exists(ServiceInterface i, PointerType p |
+        p.implements(i) and
+        this = p.getBaseType() and
         this.getName().toLowerCase() = i.getName().toLowerCase() + ["protobuf", "json"] + "client"
       )
     }
@@ -101,7 +99,7 @@ module Twirp {
   }
 
   /**
-   * Twirp function to construct a Client
+   * A Twirp function to construct a Client
    */
   class ClientConstructor extends Function {
     ClientConstructor() {
@@ -114,7 +112,7 @@ module Twirp {
   }
 
   /**
-   * Twirp function to construct a Server
+   * A Twirp function to construct a Server
    * Its first argument should be an implementation of the service interface
    */
   class ServerConstructor extends Function {
@@ -127,7 +125,7 @@ module Twirp {
   }
 
   /**
-   * SSRF sink for the Client constructor
+   * An SSRF sink for the Client constructor
    */
   class ClientRequestUrlAsSink extends RequestForgery::Sink {
     ClientRequestUrlAsSink() {
@@ -146,22 +144,19 @@ module Twirp {
    * A service handler
    */
   class ServiceHandler extends Method {
-    Method m;
-
     ServiceHandler() {
       exists(DataFlow::CallNode call, Type handlerType, ServiceInterface i |
         call.getTarget() instanceof ServerConstructor and
         call.getArgument(0).getType() = handlerType and
         handlerType.implements(i) and
         this = handlerType.getMethod(_) and
-        this.implements(m) and
-        i.getNamedType().getMethod(_) = m
+        this.implements(i.getNamedType().getMethod(_))
       )
     }
   }
 
   /**
-   * A request comming to the service handler
+   * A request coming to the service handler
    */
   class Request extends UntrustedFlowSource::Range, DataFlow::ParameterNode {
     ServiceHandler handler;