Add ability to disable cookie processing altogether by setting cookie…

README.md

@@ -280,6 +280,7 @@ application/json, text/*;0.9, */*;q=0.8
 
 where `Cookie` is a [`tough-cookie` Cookie](https://www.npmjs.com/package/tough-cookie#cookie).
 
+`cookieJar` can also be set to undefined, which will cause `fetch-h2` to not process/store cookies.
 
 ### Content encodings (compression)
 

lib/context.ts

@@ -82,7 +82,7 @@ export class Context
 	private _userAgent: string | PerOrigin< string >;
 	private _overwriteUserAgent: boolean | PerOrigin< boolean >;
 	private _accept: string | PerOrigin< string >;
-	private _cookieJar: CookieJar;
+	private _cookieJar: undefined | CookieJar;
 	private _decoders:
 		ReadonlyArray< Decoder > | PerOrigin< ReadonlyArray< Decoder > >;
 	private _sessionOptions:
@@ -122,10 +122,7 @@ export class Context
 	{
 		opts = opts || { };
 
-		this._cookieJar = "cookieJar" in opts
-			? ( opts.cookieJar || new CookieJar( ) )
-			: new CookieJar( );
-
+		this._cookieJar = "cookieJar" in opts ? opts.cookieJar : new CookieJar( );
 		this._userAgent = parsePerOrigin( opts.userAgent, "" );
 		this._overwriteUserAgent =
 			parsePerOrigin( opts.overwriteUserAgent, false );

lib/fetch-common.ts

@@ -135,8 +135,8 @@ export async function setupFetch(
 
 	const headers = new Headers( request.headers );
 
-	const cookies = ( await session.cookieJar.getCookies( url ) )
-		.map( cookie => cookie.cookieString( ) );
+	const cookies = session.cookieJar ? ( await session.cookieJar.getCookies( url ) )
+		.map( cookie => cookie.cookieString( ) ) : [];
 
 	const contentDecoders = session.contentDecoders( );
 

lib/fetch-http1.ts

@@ -181,7 +181,7 @@ export async function fetchImpl(
 
 				const isRedirected = isRedirectStatus[ "" + statusCode ];
 
-				if ( headers[ HTTP1_HEADER_SET_COOKIE ] )
+				if ( session.cookieJar && headers[ HTTP1_HEADER_SET_COOKIE ] )
 				{
 					const setCookies =
 						arrayify( headers[ HTTP1_HEADER_SET_COOKIE ] );

lib/fetch-http2.ts

@@ -274,7 +274,7 @@ async function fetchImpl(
 
 				const isRedirected = isRedirectStatus[ status ];
 
-				if ( headers[ HTTP2_HEADER_SET_COOKIE ] )
+				if ( session.cookieJar && headers[ HTTP2_HEADER_SET_COOKIE ] )
 				{
 					const setCookies =
 						arrayify( headers[ HTTP2_HEADER_SET_COOKIE ] );

lib/simple-session.ts

@@ -12,7 +12,7 @@ export interface SimpleSession
 {
 	protocol: HttpProtocols;
 
-	cookieJar: CookieJar;
+	cookieJar:  CookieJar | undefined;
 
 	userAgent( ): string;
 	accept( ): string;

test/fetch-h2/context.ts

@@ -166,7 +166,7 @@ describe( `context (${version} over ${proto.replace( ":", "" )})`, ( ) =>
 	{
 		it( "should be able to specify custom cookie jar", async ( ) =>
 		{
-			const { server, port } = await makeServer( );
+			const { server, port, receivedCookies: serverReceivedCookies } = await makeServer( );
 
 			const cookieJar = new CookieJar( );
 
@@ -181,11 +181,14 @@ describe( `context (${version} over ${proto.replace( ":", "" )})`, ( ) =>
 				userAgent: "foobar",
 			} );
 
-			await fetch( `${proto}//localhost:${port}/set-cookie`, {
+			const response1 = await fetch( `${proto}//localhost:${port}/set-cookie`, {
 				json: [ "a=b" , "c=d" ],
 				method: "POST",
+				allowForbiddenHeaders: true,
 			} );
 
+			expect(serverReceivedCookies).toHaveLength(0);
+			expect(response1.headers.get('set-cookie')).not.toBeNull();
 			const cookies =
 				await cookieJar.getCookies( `${proto}//localhost:${port}/` );
 
@@ -198,6 +201,8 @@ describe( `context (${version} over ${proto.replace( ":", "" )})`, ( ) =>
 			// Next request should maintain cookies
 
 			await fetch( `${proto}//localhost:${port}/echo` );
+			expect(serverReceivedCookies.length).toBe(1);
+			expect(serverReceivedCookies).toEqual(["a=b; c=d"]);
 
 			const cookies2 =
 				await cookieJar.getCookies( `${proto}//localhost:${port}/` );
@@ -207,10 +212,13 @@ describe( `context (${version} over ${proto.replace( ":", "" )})`, ( ) =>
 			// If we manually clear the cookie jar, subsequent requests
 			// shouldn't have any cookies
 
+			serverReceivedCookies.splice(0);
 			cookieJar.reset( );
 
 			await fetch( `${proto}//localhost:${port}/echo` );
 
+			expect(serverReceivedCookies.length).toBe(0);
+
 			const cookies3 =
 				await cookieJar.getCookies( `${proto}//localhost:${port}/` );
 
@@ -221,7 +229,74 @@ describe( `context (${version} over ${proto.replace( ":", "" )})`, ( ) =>
 			await server.shutdown( );
 		} );
 
-		it( "shouldn't be able to read cookie headers be default", async ( ) =>
+		it( "should be able to specify undefined cookie jar to indicate not to manage cookies", async ( ) =>
+		{
+			const { server, port, receivedCookies: serverReceivedCookies } = await makeServer( );
+
+			const { disconnectAll, fetch } = context( {
+				...cycleOpts,
+				cookieJar: undefined,
+				overwriteUserAgent: true,
+				userAgent: "foobar",
+			} );
+
+			await fetch( `${proto}//localhost:${port}/set-cookie`, {
+				json: [ "a=b" , "c=d" ],
+				method: "POST",
+			} );
+
+			expect(serverReceivedCookies).toHaveLength(0);
+
+			// Next request should not return cookies
+			await fetch( `${proto}//localhost:${port}/set-cookie`, {
+				json: [ "x=y" , "y=z" ],
+				method: "POST",
+			} );
+
+			expect(serverReceivedCookies).toHaveLength(0);
+
+			await fetch( `${proto}//localhost:${port}/echo` );
+
+			expect(serverReceivedCookies).toHaveLength(0);
+
+			disconnectAll( );
+
+			await server.shutdown( );
+		} );
+
+		it( "should be able to not specify cookie jar and have its setup by default, cookies working", async ( ) =>
+		{
+			const { server, port, receivedCookies: serverReceivedCookies } = await makeServer( );
+
+
+			const { disconnectAll, fetch } = context( {
+				...cycleOpts,
+				overwriteUserAgent: true,
+				userAgent: "foobar",
+			} );
+
+			const response1 = await fetch( `${proto}//localhost:${port}/set-cookie`, {
+				json: [ "a=b" , "c=d" ],
+				method: "POST",
+				allowForbiddenHeaders: true,
+			} );
+
+			expect(serverReceivedCookies).toHaveLength(0);
+			expect(response1.headers.get('set-cookie')).not.toBeNull();
+
+			// Next request should maintain cookies
+
+			await fetch( `${proto}//localhost:${port}/echo` );
+			expect(serverReceivedCookies.length).toBe(1);
+			expect(serverReceivedCookies).toEqual(["a=b; c=d"]);
+
+			disconnectAll( );
+
+			await server.shutdown( );
+		} );
+
+
+		it( "shouldn't be able to read cookie headers by default", async ( ) =>
 		{
 			const { server, port } = await makeServer( );
 

test/lib/server-common.ts

@@ -41,10 +41,10 @@ export interface ServerOptions
 export abstract class Server
 {
 	public port: number | null = null;
+	public receivedCookies: Array<string> = new Array<string>();
 	protected _opts: ServerOptions = { };
 	protected _server: HttpServer | HttpsServer | Http2Server = < any >void 0;
 
-
 	public async listen( port: number | undefined = void 0 ): Promise< number >
 	{
 		return new Promise< void >( ( resolve, _reject ) =>

test/lib/server-http1.ts

@@ -95,6 +95,10 @@ export class ServerHttp1 extends TypedServer< HttpServer | HttpsServer >
 		if ( path == null )
 			throw new Error( "Internal test error" );
 
+		if (request.headers.cookie) {
+			this.receivedCookies.push(request.headers.cookie);
+		}
+
 		const sendHeaders = ( headers: RawHeaders ) =>
 		{
 			const { ":status": status = 200, ...rest } = { ...headers };
@@ -310,11 +314,11 @@ export class ServerHttp1 extends TypedServer< HttpServer | HttpsServer >
 }
 
 export async function makeServer( opts: ServerOptions = { } )
-: Promise< { server: Server; port: number | null; } >
+: Promise< { server: Server; port: number | null; receivedCookies: Array<string> } >
 {
 	opts = opts || { };
 
 	const server = new ServerHttp1( opts );
 	await server.listen( opts.port );
-	return { server, port: server.port };
+	return { server, port: server.port, receivedCookies: server.receivedCookies };
 }

test/lib/server-http2.ts

@@ -92,6 +92,10 @@ export class ServerHttp2 extends TypedServer< Http2Server >
 		const path = headers[ HTTP2_HEADER_PATH ] as string;
 		let m;
 
+		if (headers.cookie) {
+			this.receivedCookies.push(headers.cookie);
+		}
+
 		if ( path === "/headers" )
 		{
 			stream.respond( {
@@ -129,7 +133,6 @@ export class ServerHttp2 extends TypedServer< Http2Server >
 				( < any >responseHeaders[ HTTP2_HEADER_SET_COOKIE ] )
 					.push( cookie );
 			} );
-
 			stream.respond( responseHeaders );
 			stream.end( );
 		}
@@ -360,11 +363,11 @@ export class ServerHttp2 extends TypedServer< Http2Server >
 }
 
 export async function makeServer( opts: ServerOptions = { } )
-: Promise< { server: Server; port: number | null; } >
+: Promise< { server: Server; port: number | null; receivedCookies: Array<string> } >
 {
 	opts = opts || { };
 
 	const server = new ServerHttp2( opts );
 	await server.listen( opts.port );
-	return { server, port: server.port };
+	return { server, port: server.port, receivedCookies: server.receivedCookies };
 }