mirror of
https://github.com/denoland/deno.git
synced 2024-12-24 08:09:08 -05:00
textproto: fix invalid header error and move tests (denoland/deno_std#369)
Original: b6aaddbcc0
This commit is contained in:
parent
adf9cf9949
commit
80161217d3
3 changed files with 175 additions and 85 deletions
|
@ -119,7 +119,11 @@ export class TextProtoReader {
|
||||||
}
|
}
|
||||||
let value = str(kv.subarray(i));
|
let value = str(kv.subarray(i));
|
||||||
|
|
||||||
m.append(key, value);
|
// In case of invalid header we swallow the error
|
||||||
|
// example: "Audio Mode" => invalid due to space in the key
|
||||||
|
try {
|
||||||
|
m.append(key, value);
|
||||||
|
} catch {}
|
||||||
|
|
||||||
if (err != null) {
|
if (err != null) {
|
||||||
throw err;
|
throw err;
|
||||||
|
|
167
textproto/reader_test.ts
Normal file
167
textproto/reader_test.ts
Normal file
|
@ -0,0 +1,167 @@
|
||||||
|
// 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, ProtocolError } from "./mod.ts";
|
||||||
|
import { stringsReader } from "../io/util.ts";
|
||||||
|
import { assert, assertEquals, assertThrows } from "../testing/asserts.ts";
|
||||||
|
import { test } from "../testing/mod.ts";
|
||||||
|
|
||||||
|
function reader(s: string): TextProtoReader {
|
||||||
|
return new TextProtoReader(new BufReader(stringsReader(s)));
|
||||||
|
}
|
||||||
|
// test({
|
||||||
|
// name: "[textproto] Reader : DotBytes",
|
||||||
|
// async fn(): Promise<void> {
|
||||||
|
// const input =
|
||||||
|
// "dotlines\r\n.foo\r\n..bar\n...baz\nquux\r\n\r\n.\r\nanot.her\r\n";
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
||||||
|
test(async function textprotoReadEmpty(): Promise<void> {
|
||||||
|
let r = reader("");
|
||||||
|
let [, err] = await r.readMIMEHeader();
|
||||||
|
// Should not crash!
|
||||||
|
assertEquals(err, "EOF");
|
||||||
|
});
|
||||||
|
|
||||||
|
test(async function textprotoReader(): Promise<void> {
|
||||||
|
let r = reader("line1\nline2\n");
|
||||||
|
let [s, err] = await r.readLine();
|
||||||
|
assertEquals(s, "line1");
|
||||||
|
assert(err == null);
|
||||||
|
|
||||||
|
[s, err] = await r.readLine();
|
||||||
|
assertEquals(s, "line2");
|
||||||
|
assert(err == null);
|
||||||
|
|
||||||
|
[s, err] = await r.readLine();
|
||||||
|
assertEquals(s, "");
|
||||||
|
assert(err == "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, err] = await r.readMIMEHeader();
|
||||||
|
assertEquals(m.get("My-Key"), "Value 1, Value 2");
|
||||||
|
assertEquals(m.get("Long-key"), "Even Longer Value");
|
||||||
|
assert(!err);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test({
|
||||||
|
name: "[textproto] Reader : MIME Header Single",
|
||||||
|
async fn(): Promise<void> {
|
||||||
|
const input = "Foo: bar\n\n";
|
||||||
|
const r = reader(input);
|
||||||
|
let [m, err] = await r.readMIMEHeader();
|
||||||
|
assertEquals(m.get("Foo"), "bar");
|
||||||
|
assert(!err);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test({
|
||||||
|
name: "[textproto] Reader : MIME Header No Key",
|
||||||
|
async fn(): Promise<void> {
|
||||||
|
const input = ": bar\ntest-1: 1\n\n";
|
||||||
|
const r = reader(input);
|
||||||
|
let [m, err] = await r.readMIMEHeader();
|
||||||
|
assertEquals(m.get("Test-1"), "1");
|
||||||
|
assert(!err);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test({
|
||||||
|
name: "[textproto] Reader : Large MIME Header",
|
||||||
|
async fn(): Promise<void> {
|
||||||
|
const data = [];
|
||||||
|
// 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`);
|
||||||
|
let [m] = await r.readMIMEHeader();
|
||||||
|
assertEquals(m.get("Cookie"), sdata);
|
||||||
|
// TODO re-enable, here err === "EOF" is has to be null
|
||||||
|
// assert(!err);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 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);
|
||||||
|
let [m, err] = await r.readMIMEHeader();
|
||||||
|
assertEquals(m.get("Foo"), "bar");
|
||||||
|
assertEquals(m.get("Content-Language"), "en");
|
||||||
|
assertEquals(m.get("SID"), "0");
|
||||||
|
assertEquals(m.get("Privilege"), "127");
|
||||||
|
assert(!err);
|
||||||
|
// 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 ProtocolError);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
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 ProtocolError);
|
||||||
|
}
|
||||||
|
});
|
|
@ -3,84 +3,10 @@
|
||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
import { BufReader } from "../io/bufio.ts";
|
import { append } from "./mod.ts";
|
||||||
import { TextProtoReader, append } from "./mod.ts";
|
import { assertEquals } from "../testing/asserts.ts";
|
||||||
import { stringsReader } from "../io/util.ts";
|
|
||||||
import { assert, assertEquals } from "../testing/asserts.ts";
|
|
||||||
import { test } from "../testing/mod.ts";
|
import { test } from "../testing/mod.ts";
|
||||||
|
import "./reader_test.ts";
|
||||||
function reader(s: string): TextProtoReader {
|
|
||||||
return new TextProtoReader(new BufReader(stringsReader(s)));
|
|
||||||
}
|
|
||||||
|
|
||||||
test(async function textprotoReader(): Promise<void> {
|
|
||||||
let r = reader("line1\nline2\n");
|
|
||||||
let [s, err] = await r.readLine();
|
|
||||||
assertEquals(s, "line1");
|
|
||||||
assert(err == null);
|
|
||||||
|
|
||||||
[s, err] = await r.readLine();
|
|
||||||
assertEquals(s, "line2");
|
|
||||||
assert(err == null);
|
|
||||||
|
|
||||||
[s, err] = await r.readLine();
|
|
||||||
assertEquals(s, "");
|
|
||||||
assert(err == "EOF");
|
|
||||||
});
|
|
||||||
|
|
||||||
/*
|
|
||||||
test(async function textprotoReadMIMEHeader() {
|
|
||||||
let r = reader("my-key: Value 1 \r\nLong-key: Even \n Longer Value\r\nmy-Key: Value 2\r\n\n");
|
|
||||||
let [m, err] = await r.readMIMEHeader();
|
|
||||||
|
|
||||||
console.log("Got headers", m.toString());
|
|
||||||
want := MIMEHeader{
|
|
||||||
"My-Key": {"Value 1", "Value 2"},
|
|
||||||
"Long-Key": {"Even Longer Value"},
|
|
||||||
}
|
|
||||||
if !reflect.DeepEqual(m, want) || err != nil {
|
|
||||||
t.Fatalf("ReadMIMEHeader: %v, %v; want %v", m, err, want)
|
|
||||||
}
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
|
|
||||||
test(async function textprotoReadMIMEHeaderSingle(): Promise<void> {
|
|
||||||
let r = reader("Foo: bar\n\n");
|
|
||||||
let [m, err] = await r.readMIMEHeader();
|
|
||||||
assertEquals(m.get("Foo"), "bar");
|
|
||||||
assert(!err);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Test that we read slightly-bogus MIME headers seen in the wild,
|
|
||||||
// with spaces before colons, and spaces in keys.
|
|
||||||
test(async function textprotoReadMIMEHeaderNonCompliant(): Promise<void> {
|
|
||||||
// Invalid HTTP response header as sent by an Axis security
|
|
||||||
// camera: (this is handled by IE, Firefox, Chrome, curl, etc.)
|
|
||||||
let r = reader(
|
|
||||||
"Foo: bar\r\n" +
|
|
||||||
"Content-Language: en\r\n" +
|
|
||||||
"SID : 0\r\n" +
|
|
||||||
// TODO Re-enable Currently fails with:
|
|
||||||
// "TypeError: audio mode is not a legal HTTP header name"
|
|
||||||
// "Audio Mode : None\r\n" +
|
|
||||||
"Privilege : 127\r\n\r\n"
|
|
||||||
);
|
|
||||||
let [m, err] = await r.readMIMEHeader();
|
|
||||||
console.log(m.toString());
|
|
||||||
assert(!err);
|
|
||||||
/*
|
|
||||||
let want = MIMEHeader{
|
|
||||||
"Foo": {"bar"},
|
|
||||||
"Content-Language": {"en"},
|
|
||||||
"Sid": {"0"},
|
|
||||||
"Audio Mode": {"None"},
|
|
||||||
"Privilege": {"127"},
|
|
||||||
}
|
|
||||||
if !reflect.DeepEqual(m, want) || err != nil {
|
|
||||||
t.Fatalf("ReadMIMEHeader =\n%v, %v; want:\n%v", m, err, want)
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
});
|
|
||||||
|
|
||||||
test(async function textprotoAppend(): Promise<void> {
|
test(async function textprotoAppend(): Promise<void> {
|
||||||
const enc = new TextEncoder();
|
const enc = new TextEncoder();
|
||||||
|
@ -90,10 +16,3 @@ test(async function textprotoAppend(): Promise<void> {
|
||||||
const joined = append(u1, u2);
|
const joined = append(u1, u2);
|
||||||
assertEquals(dec.decode(joined), "Hello World");
|
assertEquals(dec.decode(joined), "Hello World");
|
||||||
});
|
});
|
||||||
|
|
||||||
test(async function textprotoReadEmpty(): Promise<void> {
|
|
||||||
let r = reader("");
|
|
||||||
let [, err] = await r.readMIMEHeader();
|
|
||||||
// Should not crash!
|
|
||||||
assertEquals(err, "EOF");
|
|
||||||
});
|
|
||||||
|
|
Loading…
Reference in a new issue