fix(parse): fix to parsing pattern

Author: TomokiMiyauci

_abnf.ts

@@ -24,7 +24,7 @@ const challenge = sequence(
     suffix("+", SP),
     either(
       namedCapture("token68", token68),
-      namedCapture("authParam", /.+/),
+      namedCapture("authParam", /.*/),
     ),
   ),
 );
@@ -61,7 +61,7 @@ const authParam = sequence(
 );
 
 if (import.meta.main) {
-  console.log("challenge:", challenge);
+  console.log("challenge:", optimize(challenge).toRegExp());
   console.log("element: ", element);
   console.log("authParam: ", optimize(authParam).toRegExp());
   console.log("token: ", optimize(token).toRegExp());

auth_param.json

@@ -57,8 +57,13 @@
     "must_fail": true
   },
   {
-    "name": "invalid quoted-pair",
+    "name": "invalid quoted-pair char",
     "header": "a=\"\u0000\"",
     "must_fail": true
+  },
+  {
+    "name": "invalid quoted-pair syntax",
+    "header": "a=\"a\\\"",
+    "must_fail": true
   }
 ]

authorization.json

@@ -1,4 +1,21 @@
 [
+  {
+    "name": "no params",
+    "header": "A",
+    "expected": {
+      "authScheme": "A",
+      "params": null
+    }
+  },
+  {
+    "name": "empty params",
+    "header": "B ",
+    "expected": {
+      "authScheme": "B",
+      "params": {}
+    },
+    "normalize": "B"
+  },
   {
     "name": "basic",
     "ref": "https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization#basic_authentication",

parse.ts

@@ -6,8 +6,9 @@ import { head, isString, toLowerCase } from "./deps.ts";
 import { Msg } from "./constants.ts";
 import type { Authorization, AuthParams } from "./types.ts";
 
+/** Generate from _abnf.ts. */
 const reAuthorization =
-  /^(?<authScheme>[!#$%&'*+.^_`|~\dA-Za-z-]+)(?: +(?:(?<token68>(?:[A-Za-z]|\d|[-._~+/])+=*)|(?<authParam>.+)))?$/;
+  /^(?<authScheme>[\w!#$%&'*+.^`|~-]+)(?: +(?:(?<token68>(?:[A-Za-z]|\d|[+./_~-])+=*)|(?<authParam>.*)))?$/;
 
 /** Parse string into {@link Authorization}.
  *
@@ -57,6 +58,7 @@ type ParsedGroups = {
   readonly authParam: string | undefined;
 };
 
+/** Generate from _abnf.ts. */
 const reAuthParam =
   /^(?<key>[\w!#$%&'*+.^`|~-]+)[\t ]*=[\t ]*(?:(?<token>[\w!#$%&'*+.^`|~-]+)|(?<quotedString>"(?:\t| |!|[ \x23-\x5B\x5D-\x7E]|[\x80-\xFF]|\\(?:\t| |[\x21-\x7E]|[\x80-\xFF]))*"))$/;
 

stringify_test.ts

@@ -51,9 +51,11 @@ describe("stringifyAuthorization", () => {
   authorization.forEach((suite) => {
     it(suite.name, () => {
       if (!suite.must_fail) {
+        const input = suite.normalize ?? suite.header;
+
         assertEquals(
           stringifyAuthorization(suite.expected as Authorization),
-          suite.header,
+          input,
         );
       }
     });