add ParseHTTPVersion

http/server.ts

@@ -102,6 +102,8 @@ export class ServerRequest {
  url: string;
  method: string;
  proto: string;
+ protoMinor: number;
+ protoMajor: number;
  headers: Headers;
  r: BufReader;
  w: BufWriter;
@@ -215,6 +217,37 @@ function fixLength(req: ServerRequest): void {
  }
 }
 
+// ParseHTTPVersion parses a HTTP version string.
+// "HTTP/1.0" returns (1, 0, true).
+// Ported from https://github.com/golang/go/blob/f5c43b9/src/net/http/request.go#L766-L792
+function ParseHTTPVersion(vers: string): [number, number, boolean] {
+ const Big = 1000000; // arbitrary upper bound
+ let major: number;
+ let minor: number;
+ switch (vers) {
+ case "HTTP/1.1":
+ return [1, 1, true];
+ case "HTTP/1.0":
+ return [1, 0, true];
+ }
+ if (!vers.startsWith("HTTP/")) {
+ return [0, 0, false];
+ }
+ const dot = vers.indexOf(".");
+ if (dot < 0) {
+ return [0, 0, false];
+ }
+ major = parseInt(vers[dot - 1]);
+ if (isNaN(major) || major < 0 || major > Big) {
+ return [0, 0, false];
+ }
+ minor = parseInt(vers[dot + 1]);
+ if (isNaN(minor) || minor < 0 || minor > Big) {
+ return [0, 0, false];
+ }
+ return [major, minor, true];
+}
+
 export async function readRequest(
  bufr: BufReader
 ): Promise<[ServerRequest, BufState]> {
@@ -229,6 +262,13 @@ export async function readRequest(
  return [null, err];
  }
  [req.method, req.url, req.proto] = firstLine.split(" ", 3);
+
+ let ok: boolean;
+ [req.protoMinor, req.protoMajor, ok] = ParseHTTPVersion(req.proto);
+ if (!ok) {
+ throw Error(`malformed HTTP version ${req.proto}`);
+ }
+
  [req.headers, err] = await tp.readMIMEHeader();
  fixLength(req);
  // TODO(zekth) : add parsing of headers eg:

http/server_test.ts

@@ -364,6 +364,21 @@ test(async function testReadRequestError(): Promise<void> {
  in: "HEAD / HTTP/1.1\r\nContent-Length:0\r\nContent-Length: 0\r\n\r\n",
  headers: [{ key: "Content-Length", value: "0" }],
  err: null
+ },
+ 11: {
+ in: "GET / HTTP/1.A\r\nContent-Length:0\r\n\r\n",
+ headers: [{ key: "Content-Length", value: "0" }],
+ err: `malformed HTTP version HTTP/1.A`
+ },
+ 12: {
+ in: "GET / HTTP/A.1\r\nContent-Length:0\r\n\r\n",
+ headers: [],
+ err: `malformed HTTP version HTTP/A.1`
+ },
+ 13: {
+ in: "GET / HTTP/1.0\r\nContent-Length:4\r\n\r\n",
+ headers: [{ key: "Content-Length", value: "4" }],
+ err: null
  }
  };
  for (const p in testCases) {