Chore: Fix logical operator priority (regression) to disallow GET/HEAD with non-empty body (#1369)

Maxim Shirshin · web-flow · commit eb33090b8144 · 2021-12-06T17:14:42.000+01:00
diff --git a/src/request.js b/src/request.js
@@ -59,7 +59,7 @@ export default class Request extends Body {
 		method = method.toUpperCase();
 
 		// eslint-disable-next-line no-eq-null, eqeqeq
-		if (((init.body != null || isRequest(input)) && input.body !== null) &&
+		if ((init.body != null || (isRequest(input) && input.body !== null)) &&
 			(method === 'GET' || method === 'HEAD')) {
 			throw new TypeError('Request with GET/HEAD method cannot have body');
 		}
diff --git a/test/request.js b/test/request.js
@@ -123,6 +123,8 @@ describe('Request', () => {
 			.to.throw(TypeError);
 		expect(() => new Request(base, {body: 'a', method: 'head'}))
 			.to.throw(TypeError);
+		expect(() => new Request(new Request(base), {body: 'a'}))
+			.to.throw(TypeError);
 	});
 
 	it('should throw error when including credentials', () => {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ export default class Request extends Body {`
`59`	`59`	`method = method.toUpperCase();`
`60`	`60`
`61`	`61`	`// eslint-disable-next-line no-eq-null, eqeqeq`
`62`		`- if (((init.body != null \|\| isRequest(input)) && input.body !== null) &&`
	`62`	`+ if ((init.body != null \|\| (isRequest(input) && input.body !== null)) &&`
`63`	`63`	`(method === 'GET' \|\| method === 'HEAD')) {`
`64`	`64`	`throw new TypeError('Request with GET/HEAD method cannot have body');`
`65`	`65`	`}`