Fix query matching against list query values

The existing code doesn't account for the fact that all query parameter values
can be multi-valued, even when there's only one value in the input URL. Also,
a query string literal can be satisfied by any of the values in the input URL,
whereas the existing code would insist that there exist no other value for the
key in the literal.

Author: adamthom-amzn

smithy-typescript-ssdk-libs/server-common/src/httpbinding/mux.spec.ts

@@ -18,7 +18,10 @@ import { HttpRequest } from "@aws-sdk/protocol-http";
 import { HttpBindingMux, UriSpec } from ".";
 
 describe("simple matching", () => {
-  const router = new HttpBindingMux<"Test", "A" | "LessSpecificA" | "Greedy" | "MiddleGreedy" | "Delete">([
+  const router = new HttpBindingMux<
+    "Test",
+    "A" | "LessSpecificA" | "Greedy" | "MiddleGreedy" | "Delete" | "QueryKeyOnly"
+  >([
     new UriSpec("GET", [{ type: "path_literal", value: "a" }, { type: "path" }, { type: "path" }], [], {
       service: "Test",
       operation: "A",
@@ -46,6 +49,10 @@ describe("simple matching", () => {
       ],
       { service: "Test", operation: "Delete" }
     ),
+    new UriSpec("GET", [{ type: "path_literal", value: "query_key_only" }], [{ type: "query_literal", key: "foo" }], {
+      service: "Test",
+      operation: "QueryKeyOnly",
+    }),
   ]);
 
   const matches: { [idx: string]: HttpRequest[] } = {
@@ -68,10 +75,20 @@ describe("simple matching", () => {
       new HttpRequest({ method: "GET", path: "/mg/a/b/c/d/z", query: { abc: "def" } }),
     ],
     "Test#Delete": [
+      new HttpRequest({ method: "DELETE", path: "/", query: { foo: "bar", baz: "quux" } }),
+      new HttpRequest({ method: "DELETE", path: "/", query: { foo: ["bar"], baz: "quux" } }),
+      new HttpRequest({ method: "DELETE", path: "/", query: { foo: ["bar", "corge"], baz: "quux" } }),
       new HttpRequest({ method: "DELETE", path: "/", query: { foo: "bar", baz: "quux" } }),
       new HttpRequest({ method: "DELETE", path: "/", query: { foo: "bar", baz: null } }),
       new HttpRequest({ method: "DELETE", path: "", query: { foo: "bar", baz: ["quux", "grault"] } }),
     ],
+    "Test#QueryKeyOnly": [
+      new HttpRequest({ method: "GET", path: "/query_key_only", query: { foo: "bar" } }),
+      new HttpRequest({ method: "GET", path: "/query_key_only", query: { foo: null } }),
+      new HttpRequest({ method: "GET", path: "/query_key_only", query: { foo: "" } }),
+      // this is actually what /query_key_only?foo will look like behind APIGateway
+      new HttpRequest({ method: "GET", path: "/query_key_only", query: { foo: [""] } }),
+    ],
   };
 
   const misses = [
@@ -87,7 +104,6 @@ describe("simple matching", () => {
     new HttpRequest({ method: "GET", path: "/mg/q" }),
     new HttpRequest({ method: "GET", path: "/mg/z" }),
     new HttpRequest({ method: "GET", path: "/mg/a/b/z/c" }),
-    new HttpRequest({ method: "DELETE", path: "/", query: { foo: ["bar", "corge"], baz: "quux" } }),
     new HttpRequest({ method: "DELETE", path: "/", query: { foo: "bar" } }),
     new HttpRequest({ method: "DELETE", path: "/", query: { baz: "quux" } }),
     new HttpRequest({ method: "DELETE", path: "/" }),

smithy-typescript-ssdk-libs/server-common/src/httpbinding/mux.ts

@@ -129,7 +129,12 @@ export class UriSpec<S extends string, O extends string> {
         return false;
       }
       if (querySegment.type === "query_literal") {
-        if (querySegment.value && querySegment.value !== req.query[querySegment.key]) {
+        const input_query_value = req.query[querySegment.key];
+        if (Array.isArray(input_query_value)) {
+          if (querySegment.value && !input_query_value.includes(querySegment.value)) {
+            return false;
+          }
+        } else if (querySegment.value && querySegment.value !== input_query_value) {
           return false;
         }
       }