Model StartWithContext

Co-authored-by: Chris Smowton <smowton@github.com>

Author: atorralba

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

@@ -45,7 +45,7 @@ private class StartOrNewHandlerFunction extends Function {
       ]) and
     handlerArgPos = 0
     or
-    this.hasQualifiedName(awsLambdaPkg(), "StartHandlerWithContext") and
+    this.hasQualifiedName(awsLambdaPkg(), ["StartHandlerWithContext", "StartWithContext"]) and
     handlerArgPos = 1
   }
 

go/ql/test/library-tests/semmle/go/frameworks/AwsLambda/test.go

@@ -148,6 +148,14 @@ func Handler16(ctx context.Context, event Event) (*Response, error) {
 	return &Response{Message: ""}, nil
 }
 
+func Handler17(ctx context.Context, event Event) (*Response, error) {
+	sink(ctx)        // safe
+	sink(event.Name) // $ hasTaintFlow="selection of Name"
+	sink(event.Age)  // $ hasTaintFlow="selection of Age"
+	sink(event)      // $ hasTaintFlow="event"
+	return &Response{Message: ""}, nil
+}
+
 func main() {
 	lambda.Start(Handler0)
 	lambda.Start(Handler1)
@@ -177,23 +185,31 @@ func main() {
 	})
 	lambda.StartHandlerWithContext(context.Background(), MyHandlerFunc(Handler12))
 	lambda.StartHandlerWithContext(context.Background(), &Handler13{})
-	lambda.StartWithOptions(Handler14)
+	lambda.StartWithContext(context.Background(), Handler14)
+	lambda.StartWithContext(context.Background(), func(ctx context.Context, event Event) (*Response, error) {
+		sink(ctx)        // safe
+		sink(event.Name) // $ hasTaintFlow="selection of Name"
+		sink(event.Age)  // $ hasTaintFlow="selection of Age"
+		sink(event)      // $ hasTaintFlow="event"
+		return &Response{Message: ""}, nil
+	})
+	lambda.StartWithOptions(Handler15)
 	lambda.StartWithOptions(func(ctx context.Context, event Event) (*Response, error) {
 		sink(ctx)        // safe
 		sink(event.Name) // $ hasTaintFlow="selection of Name"
 		sink(event.Age)  // $ hasTaintFlow="selection of Age"
 		sink(event)      // $ hasTaintFlow="event"
 		return &Response{Message: ""}, nil
 	})
-	lambda.NewHandler(Handler15)
+	lambda.NewHandler(Handler16)
 	lambda.NewHandler(func(ctx context.Context, event Event) (*Response, error) {
 		sink(ctx)        // safe
 		sink(event.Name) // $ hasTaintFlow="selection of Name"
 		sink(event.Age)  // $ hasTaintFlow="selection of Age"
 		sink(event)      // $ hasTaintFlow="event"
 		return &Response{Message: ""}, nil
 	})
-	lambda.NewHandlerWithOptions(Handler16)
+	lambda.NewHandlerWithOptions(Handler17)
 	lambda.NewHandlerWithOptions(func(ctx context.Context, event Event) (*Response, error) {
 		sink(ctx)        // safe
 		sink(event.Name) // $ hasTaintFlow="selection of Name"