summaryrefslogtreecommitdiff
path: root/std/textproto
diff options
context:
space:
mode:
Diffstat (limited to 'std/textproto')
-rw-r--r--std/textproto/mod.ts20
-rw-r--r--std/textproto/reader_test.ts180
-rw-r--r--std/textproto/test.ts183
3 files changed, 177 insertions, 206 deletions
diff --git a/std/textproto/mod.ts b/std/textproto/mod.ts
index b27b1d59b..760a068b5 100644
--- a/std/textproto/mod.ts
+++ b/std/textproto/mod.ts
@@ -5,24 +5,14 @@
import { BufReader } from "../io/bufio.ts";
import { charCode } from "../io/util.ts";
+import { concat } from "../bytes/mod.ts";
+import { decode } from "../strings/mod.ts";
-const asciiDecoder = new TextDecoder();
function str(buf: Uint8Array | null | undefined): string {
if (buf == null) {
return "";
} else {
- return asciiDecoder.decode(buf);
- }
-}
-
-export function append(a: Uint8Array, b: Uint8Array): Uint8Array {
- if (a == null) {
- return b;
- } else {
- const output = new Uint8Array(a.length + b.length);
- output.set(a, 0);
- output.set(b, a.length);
- return output;
+ return decode(buf);
}
}
@@ -146,9 +136,7 @@ export class TextProtoReader {
}
return l;
}
-
- // @ts-ignore
- line = append(line, l);
+ line = line ? concat(line, l) : l;
if (!more) {
break;
}
diff --git a/std/textproto/reader_test.ts b/std/textproto/reader_test.ts
deleted file mode 100644
index f0ae63894..000000000
--- a/std/textproto/reader_test.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-// Based on https://github.com/golang/go/blob/master/src/net/textproto/reader_test.go
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-import { BufReader } from "../io/bufio.ts";
-import { TextProtoReader } from "./mod.ts";
-import { stringsReader } from "../io/util.ts";
-import {
- assert,
- assertEquals,
- assertThrows,
- assertNotEOF
-} from "../testing/asserts.ts";
-const { test } = Deno;
-
-function reader(s: string): TextProtoReader {
- return new TextProtoReader(new BufReader(stringsReader(s)));
-}
-
-test({
- ignore: true,
- name: "[textproto] Reader : DotBytes",
- fn(): Promise<void> {
- const _input =
- "dotlines\r\n.foo\r\n..bar\n...baz\nquux\r\n\r\n.\r\nanot.her\r\n";
- return Promise.resolve();
- }
-});
-
-test(async function textprotoReadEmpty(): Promise<void> {
- const r = reader("");
- const m = await r.readMIMEHeader();
- assertEquals(m, Deno.EOF);
-});
-
-test(async function textprotoReader(): Promise<void> {
- const r = reader("line1\nline2\n");
- let s = await r.readLine();
- assertEquals(s, "line1");
-
- s = await r.readLine();
- assertEquals(s, "line2");
-
- s = await r.readLine();
- assert(s === Deno.EOF);
-});
-
-test({
- name: "[textproto] Reader : MIME Header",
- async fn(): Promise<void> {
- const input =
- "my-key: Value 1 \r\nLong-key: Even Longer Value\r\nmy-Key: " +
- "Value 2\r\n\n";
- const r = reader(input);
- const m = assertNotEOF(await r.readMIMEHeader());
- assertEquals(m.get("My-Key"), "Value 1, Value 2");
- assertEquals(m.get("Long-key"), "Even Longer Value");
- }
-});
-
-test({
- name: "[textproto] Reader : MIME Header Single",
- async fn(): Promise<void> {
- const input = "Foo: bar\n\n";
- const r = reader(input);
- const m = assertNotEOF(await r.readMIMEHeader());
- assertEquals(m.get("Foo"), "bar");
- }
-});
-
-test({
- name: "[textproto] Reader : MIME Header No Key",
- async fn(): Promise<void> {
- const input = ": bar\ntest-1: 1\n\n";
- const r = reader(input);
- const m = assertNotEOF(await r.readMIMEHeader());
- assertEquals(m.get("Test-1"), "1");
- }
-});
-
-test({
- name: "[textproto] Reader : Large MIME Header",
- async fn(): Promise<void> {
- const data: string[] = [];
- // Go test is 16*1024. But seems it can't handle more
- for (let i = 0; i < 1024; i++) {
- data.push("x");
- }
- const sdata = data.join("");
- const r = reader(`Cookie: ${sdata}\r\n\r\n`);
- const m = assertNotEOF(await r.readMIMEHeader());
- assertEquals(m.get("Cookie"), sdata);
- }
-});
-
-// Test that we read slightly-bogus MIME headers seen in the wild,
-// with spaces before colons, and spaces in keys.
-test({
- name: "[textproto] Reader : MIME Header Non compliant",
- async fn(): Promise<void> {
- const input =
- "Foo: bar\r\n" +
- "Content-Language: en\r\n" +
- "SID : 0\r\n" +
- "Audio Mode : None\r\n" +
- "Privilege : 127\r\n\r\n";
- const r = reader(input);
- const m = assertNotEOF(await r.readMIMEHeader());
- assertEquals(m.get("Foo"), "bar");
- assertEquals(m.get("Content-Language"), "en");
- assertEquals(m.get("SID"), "0");
- assertEquals(m.get("Privilege"), "127");
- // Not a legal http header
- assertThrows((): void => {
- assertEquals(m.get("Audio Mode"), "None");
- });
- }
-});
-
-test({
- name: "[textproto] Reader : MIME Header Malformed",
- async fn(): Promise<void> {
- const input = [
- "No colon first line\r\nFoo: foo\r\n\r\n",
- " No colon first line with leading space\r\nFoo: foo\r\n\r\n",
- "\tNo colon first line with leading tab\r\nFoo: foo\r\n\r\n",
- " First: line with leading space\r\nFoo: foo\r\n\r\n",
- "\tFirst: line with leading tab\r\nFoo: foo\r\n\r\n",
- "Foo: foo\r\nNo colon second line\r\n\r\n"
- ];
- const r = reader(input.join(""));
-
- let err;
- try {
- await r.readMIMEHeader();
- } catch (e) {
- err = e;
- }
- assert(err instanceof Deno.errors.InvalidData);
- }
-});
-
-test({
- name: "[textproto] Reader : MIME Header Trim Continued",
- async fn(): Promise<void> {
- const input =
- "" + // for code formatting purpose.
- "a:\n" +
- " 0 \r\n" +
- "b:1 \t\r\n" +
- "c: 2\r\n" +
- " 3\t\n" +
- " \t 4 \r\n\n";
- const r = reader(input);
- let err;
- try {
- await r.readMIMEHeader();
- } catch (e) {
- err = e;
- }
- assert(err instanceof Deno.errors.InvalidData);
- }
-});
-
-test({
- name: "[textproto] #409 issue : multipart form boundary",
- async fn(): Promise<void> {
- const input = [
- "Accept: */*\r\n",
- 'Content-Disposition: form-data; name="test"\r\n',
- " \r\n",
- "------WebKitFormBoundaryimeZ2Le9LjohiUiG--\r\n\n"
- ];
- const r = reader(input.join(""));
- const m = assertNotEOF(await r.readMIMEHeader());
- assertEquals(m.get("Accept"), "*/*");
- assertEquals(m.get("Content-Disposition"), 'form-data; name="test"');
- }
-});
diff --git a/std/textproto/test.ts b/std/textproto/test.ts
index 9a992a2cf..1dcbfd479 100644
--- a/std/textproto/test.ts
+++ b/std/textproto/test.ts
@@ -1,17 +1,180 @@
-// Based on https://github.com/golang/go/blob/891682/src/net/textproto/
+// Based on https://github.com/golang/go/blob/master/src/net/textproto/reader_test.go
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-import { append } from "./mod.ts";
-import { assertEquals } from "../testing/asserts.ts";
+import { BufReader } from "../io/bufio.ts";
+import { TextProtoReader } from "./mod.ts";
+import { stringsReader } from "../io/util.ts";
+import {
+ assert,
+ assertEquals,
+ assertThrows,
+ assertNotEOF
+} from "../testing/asserts.ts";
const { test } = Deno;
-test(function textprotoAppend(): void {
- const enc = new TextEncoder();
- const dec = new TextDecoder();
- const u1 = enc.encode("Hello ");
- const u2 = enc.encode("World");
- const joined = append(u1, u2);
- assertEquals(dec.decode(joined), "Hello World");
+function reader(s: string): TextProtoReader {
+ return new TextProtoReader(new BufReader(stringsReader(s)));
+}
+
+test({
+ ignore: true,
+ name: "[textproto] Reader : DotBytes",
+ fn(): Promise<void> {
+ const _input =
+ "dotlines\r\n.foo\r\n..bar\n...baz\nquux\r\n\r\n.\r\nanot.her\r\n";
+ return Promise.resolve();
+ }
+});
+
+test("[textproto] ReadEmpty", async () => {
+ const r = reader("");
+ const m = await r.readMIMEHeader();
+ assertEquals(m, Deno.EOF);
+});
+
+test("[textproto] Reader", async () => {
+ const r = reader("line1\nline2\n");
+ let s = await r.readLine();
+ assertEquals(s, "line1");
+
+ s = await r.readLine();
+ assertEquals(s, "line2");
+
+ s = await r.readLine();
+ assert(s === Deno.EOF);
+});
+
+test({
+ name: "[textproto] Reader : MIME Header",
+ async fn(): Promise<void> {
+ const input =
+ "my-key: Value 1 \r\nLong-key: Even Longer Value\r\nmy-Key: " +
+ "Value 2\r\n\n";
+ const r = reader(input);
+ const m = assertNotEOF(await r.readMIMEHeader());
+ assertEquals(m.get("My-Key"), "Value 1, Value 2");
+ assertEquals(m.get("Long-key"), "Even Longer Value");
+ }
+});
+
+test({
+ name: "[textproto] Reader : MIME Header Single",
+ async fn(): Promise<void> {
+ const input = "Foo: bar\n\n";
+ const r = reader(input);
+ const m = assertNotEOF(await r.readMIMEHeader());
+ assertEquals(m.get("Foo"), "bar");
+ }
+});
+
+test({
+ name: "[textproto] Reader : MIME Header No Key",
+ async fn(): Promise<void> {
+ const input = ": bar\ntest-1: 1\n\n";
+ const r = reader(input);
+ const m = assertNotEOF(await r.readMIMEHeader());
+ assertEquals(m.get("Test-1"), "1");
+ }
+});
+
+test({
+ name: "[textproto] Reader : Large MIME Header",
+ async fn(): Promise<void> {
+ const data: string[] = [];
+ // Go test is 16*1024. But seems it can't handle more
+ for (let i = 0; i < 1024; i++) {
+ data.push("x");
+ }
+ const sdata = data.join("");
+ const r = reader(`Cookie: ${sdata}\r\n\r\n`);
+ const m = assertNotEOF(await r.readMIMEHeader());
+ assertEquals(m.get("Cookie"), sdata);
+ }
+});
+
+// Test that we read slightly-bogus MIME headers seen in the wild,
+// with spaces before colons, and spaces in keys.
+test({
+ name: "[textproto] Reader : MIME Header Non compliant",
+ async fn(): Promise<void> {
+ const input =
+ "Foo: bar\r\n" +
+ "Content-Language: en\r\n" +
+ "SID : 0\r\n" +
+ "Audio Mode : None\r\n" +
+ "Privilege : 127\r\n\r\n";
+ const r = reader(input);
+ const m = assertNotEOF(await r.readMIMEHeader());
+ assertEquals(m.get("Foo"), "bar");
+ assertEquals(m.get("Content-Language"), "en");
+ assertEquals(m.get("SID"), "0");
+ assertEquals(m.get("Privilege"), "127");
+ // Not a legal http header
+ assertThrows((): void => {
+ assertEquals(m.get("Audio Mode"), "None");
+ });
+ }
+});
+
+test({
+ name: "[textproto] Reader : MIME Header Malformed",
+ async fn(): Promise<void> {
+ const input = [
+ "No colon first line\r\nFoo: foo\r\n\r\n",
+ " No colon first line with leading space\r\nFoo: foo\r\n\r\n",
+ "\tNo colon first line with leading tab\r\nFoo: foo\r\n\r\n",
+ " First: line with leading space\r\nFoo: foo\r\n\r\n",
+ "\tFirst: line with leading tab\r\nFoo: foo\r\n\r\n",
+ "Foo: foo\r\nNo colon second line\r\n\r\n"
+ ];
+ const r = reader(input.join(""));
+
+ let err;
+ try {
+ await r.readMIMEHeader();
+ } catch (e) {
+ err = e;
+ }
+ assert(err instanceof Deno.errors.InvalidData);
+ }
+});
+
+test({
+ name: "[textproto] Reader : MIME Header Trim Continued",
+ async fn(): Promise<void> {
+ const input =
+ "" + // for code formatting purpose.
+ "a:\n" +
+ " 0 \r\n" +
+ "b:1 \t\r\n" +
+ "c: 2\r\n" +
+ " 3\t\n" +
+ " \t 4 \r\n\n";
+ const r = reader(input);
+ let err;
+ try {
+ await r.readMIMEHeader();
+ } catch (e) {
+ err = e;
+ }
+ assert(err instanceof Deno.errors.InvalidData);
+ }
+});
+
+test({
+ name: "[textproto] #409 issue : multipart form boundary",
+ async fn(): Promise<void> {
+ const input = [
+ "Accept: */*\r\n",
+ 'Content-Disposition: form-data; name="test"\r\n',
+ " \r\n",
+ "------WebKitFormBoundaryimeZ2Le9LjohiUiG--\r\n\n"
+ ];
+ const r = reader(input.join(""));
+ const m = assertNotEOF(await r.readMIMEHeader());
+ assertEquals(m.get("Accept"), "*/*");
+ assertEquals(m.get("Content-Disposition"), 'form-data; name="test"');
+ }
});
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 18:03:51 +0000