fs: do basic arg validation of truncate in js #2498

thefourtheye · 2015-08-22T20:07:00Z

This patch moves the basic validation of arguments to truncate family
of functions to the JavaScript from the C++ layer.

cc @bnoordhuis

CI Run: https://jenkins-iojs.nodesource.com/job/node-test-pull-request/131/

targos · 2015-08-22T21:17:49Z

lib/fs.js

    len = 0;
+  } else if (typeof len !== 'number' || !isFinite(len)) {


I think Number.isFinite does both checks in one call

@targos Ah, you are correct. I updated now. PTAL.

mscdex · 2015-08-22T22:34:22Z

Out of curiousity, what was the motivation behind these changes?

thefourtheye · 2015-08-22T22:35:54Z

@mscdex The FIXME in the node_file.cc

targos · 2015-08-23T09:41:05Z

lib/fs.js

    len = 0;
+  } else if (!Number.isFinite(len) || len < 0) {
+    throw new TypeError('length must be a positive integer');


Just seeing the error message. If you want to ensure it is an integer, you can drop Number.isFinite and use Number.isInteger instead

@targos Man, that's wonderful. I didn't know about that function and that is exactly what we need here. Thanks :-) Updated the PR.

thefourtheye · 2015-08-27T10:46:28Z

@bnoordhuis Ping!

trevnorris · 2015-09-01T22:41:12Z

lib/fs.js

@@ -688,14 +688,19 @@ fs.renameSync = function(oldPath, newPath) {
 };

 fs.truncate = function(path, len, callback) {
-  if (typeof path === 'number') {
+  if (Number.isInteger(path) && path >= 0)


Change in functionality. Here's an approximate test:

if (typeof path === 'number' && !Number.isInteger(path)) throw new TypeError('Not an integer');

or are you just short-circuiting for the fast path?

This is a legacy functionality it seems. If we pass an fd to truncate it internally delegates it to ftruncate. So we cannot throw error here. We are just checking if it is a positive integer and move on to the next check if is not.

Are you suggesting to not to call ftruncate at all?

I just followed the logic paths for current and this patch, and there seemed to be a discrepancy.

@trevnorris Agree, but wouldn't this check be better?

My assumption was to land most these changes on a minor, then making any breaking changes, that push this to semver-major, to another PR. If you're cool with this staying on major then I'll have another look from that perspective.

@trevnorris I am okay with this being in major :-) Let's get this done right. Please suggest improvements as well :-)

thefourtheye · 2015-09-21T07:17:44Z

Bump!

trevnorris · 2015-09-21T18:10:13Z

src/node_file.cc

-      !IsInt64(len_v->NumberValue())) {
-    return env->ThrowTypeError("Not an integer");
-  }
-


Change this and the below line to:

CHECK(args[1]->IsNumber()); const int64_t = args[1]->IntegerValue();

Reason for the CHECK() is because we're now making an assumption about the incoming value. Always want to catch that if incorrect, because at this point if the value is incorrect then we've screwed up.

wait. nm. read this as the fd value, not the len value.

EDIT: meaning, no need for the CHECK(). can still collapse the other.

trevnorris · 2015-09-21T18:44:23Z

to recap

Change all fd conversion in native from Int32Value() to Uint32Value().
Change all fd checks in JS to check if valid uint32
- Will probably need to do a fd = +fd at the top of the function for string coercion. This is simply so we can have a solid native CHECK() to make sure we didn't screw up.
Make sure there is a CHECK(val->IsUint32()) just before doing Uint32Value() to all fd's.

Fishrock123 · 2015-10-19T14:37:01Z

ping @thefourtheye

targos · 2016-01-31T14:03:32Z

ping @thefourtheye ;)

thefourtheye · 2016-01-31T14:07:09Z

@targos Ah, I have this open for a loooong time. I'll get to it this week. Thanks for reminding :-) Last week @benjamingr also reminded me of this.

thefourtheye · 2016-02-12T19:14:32Z

@trevnorris Sorry for the delay in getting your review comments addressed. PTAL.

jasnell · 2016-02-13T04:44:00Z

Added semver-major tag based on the discussion thread. Feel free to change that if it turns out not to be major after all.

trevnorris · 2016-02-18T10:54:01Z

lib/fs.js

+function sanitizeFD(inputFD) {
+  const fd = +inputFD;
+  if (!Number.isInteger(fd) || fd < 0 || fd > 0xFFFFFFFF) {
+    throw new Error('file descriptor must be a positive 32-bit integer');


Change this to a TypeError. Also I'd replace "positive" with "unsigned".

thefourtheye · 2016-03-14T16:39:47Z

@trevnorris Changed positive to unsigned now.

thefourtheye · 2016-07-10T20:59:42Z

Included another commit now, which just doesn't coerce the fds.

trevnorris · 2016-07-20T19:42:26Z

Thanks for the change, and test. LGTM.

thefourtheye · 2016-07-21T04:32:59Z

Rebased and improved the isFD function. CI Run: https://ci.nodejs.org/job/node-test-pull-request/3365/

This patch moves the basic validation of arguments to `truncate` family of functions to the JavaScript from the C++ layer.

thefourtheye · 2016-07-21T21:53:35Z

Rebased, after landing #7168. CI Run: https://ci.nodejs.org/job/node-test-pull-request/3378/

thefourtheye · 2016-07-21T22:32:14Z

Landed in c86c1ee.

This patch 1. moves the basic validation of arguments to `truncate` family of functions to the JavaScript layer from the C++ layer. 2. makes sure that the File Descriptors are validated strictly. PR-URL: #2498 Reviewed-By: Trevor Norris <trev.norris@gmail.com>

This reverts commit c86c1ee. original commit message: This patch 1. moves the basic validation of arguments to `truncate` family of functions to the JavaScript layer from the C++ layer. 2. makes sure that the File Descriptors are validated strictly. PR-URL: nodejs#2498 Reviewed-By: Trevor Norris <trev.norris@gmail.com>

This reverts commit c86c1ee. original commit message: This patch 1. moves the basic validation of arguments to `truncate` family of functions to the JavaScript layer from the C++ layer. 2. makes sure that the File Descriptors are validated strictly. PR-URL: nodejs#2498 Reviewed-By: Trevor Norris <trev.norris@gmail.com> PR-URL: nodejs#7950 Reviewed-By: Julien Gilli <jgilli@nodejs.org> Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Minwoo Jung <jmwsoft@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

thefourtheye added the fs Issues and PRs related to the fs subsystem / file system. label Aug 22, 2015

targos reviewed Aug 22, 2015
View reviewed changes

thefourtheye force-pushed the fs-improve-validation branch from b93d681 to 9910ba2 Compare August 22, 2015 22:34

targos reviewed Aug 23, 2015
View reviewed changes

trevnorris reviewed Sep 1, 2015
View reviewed changes

rvagg force-pushed the master branch from 11c25c2 to ba02bd0 Compare September 6, 2015 11:55

trevnorris reviewed Sep 21, 2015
View reviewed changes

jasnell added the stalled Issues and PRs that are stalled. label Nov 16, 2015

Trott force-pushed the master branch from 1e896a6 to 082cc8d Compare December 27, 2015 02:00

thefourtheye force-pushed the fs-improve-validation branch 2 times, most recently from 000eee8 to 8233f9a Compare February 12, 2016 19:11

jasnell added the semver-major PRs that contain breaking changes and should be released in the next major version. label Feb 13, 2016

trevnorris reviewed Feb 18, 2016
View reviewed changes

thefourtheye force-pushed the fs-improve-validation branch 2 times, most recently from 6036668 to 3aab026 Compare March 14, 2016 16:39

thefourtheye force-pushed the fs-improve-validation branch from 3aab026 to f0b3208 Compare March 21, 2016 18:52

thefourtheye force-pushed the fs-improve-validation branch 2 times, most recently from 7a953f9 to f19c403 Compare July 21, 2016 04:30

fs: do basic arg validation of truncate in js

693f14e

This patch moves the basic validation of arguments to `truncate` family of functions to the JavaScript from the C++ layer.

thefourtheye force-pushed the fs-improve-validation branch from f19c403 to 693f14e Compare July 21, 2016 21:50

thefourtheye closed this Jul 21, 2016

thefourtheye deleted the fs-improve-validation branch July 21, 2016 22:32

bnoordhuis mentioned this pull request Jul 23, 2016

Role of CTC in semver-major changes needs clarification #7848

Closed

Fishrock123 removed the stalled Issues and PRs that are stalled. label Jul 26, 2016

cjihrig mentioned this pull request Aug 10, 2016

Revert "fs: validate args of truncate functions in js" #7950

Closed

2 tasks

gibfahn mentioned this pull request Jun 15, 2017

Auditing for 6.11.1 nodejs/Release#230

Closed

3 tasks

B020239 mentioned this pull request Mar 9, 2024

[Snyk] Upgrade typedoc from 0.23.28 to 0.25.8 B020239/node#12

Open

This was referenced Mar 30, 2024

[Snyk] Security upgrade gulp from 3.9.1 to 5.0.0 leonardoadame/node#702

Open

[Snyk] Security upgrade gulp from 3.9.1 to 5.0.0 leonardoadame/node#703

Open

[Snyk] Security upgrade gulp from 3.9.1 to 5.0.0 leonardoadame/node#704

Open

This was referenced Mar 30, 2024

[Snyk] Security upgrade gulp from 3.9.1 to 5.0.0 aliscco/alisco-node#1279

Open

[Snyk] Security upgrade gulp from 3.9.1 to 5.0.0 aliscco/alisco-node#1280

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fs: do basic arg validation of truncate in js #2498

fs: do basic arg validation of truncate in js #2498

thefourtheye commented Aug 22, 2015

targos Aug 22, 2015

thefourtheye Aug 22, 2015

mscdex commented Aug 22, 2015

thefourtheye commented Aug 22, 2015

targos Aug 23, 2015

thefourtheye Aug 23, 2015

thefourtheye commented Aug 27, 2015

trevnorris Sep 1, 2015

trevnorris Sep 1, 2015

thefourtheye Sep 2, 2015

trevnorris Sep 2, 2015

thefourtheye Sep 19, 2015

trevnorris Sep 21, 2015

thefourtheye Sep 21, 2015

thefourtheye commented Sep 21, 2015

trevnorris Sep 21, 2015

trevnorris Sep 21, 2015

trevnorris commented Sep 21, 2015

Fishrock123 commented Oct 19, 2015

targos commented Jan 31, 2016

thefourtheye commented Jan 31, 2016

thefourtheye commented Feb 12, 2016

jasnell commented Feb 13, 2016

trevnorris Feb 18, 2016

thefourtheye Mar 14, 2016

thefourtheye commented Mar 14, 2016

thefourtheye commented Jul 10, 2016

trevnorris commented Jul 20, 2016

thefourtheye commented Jul 21, 2016

thefourtheye commented Jul 21, 2016

thefourtheye commented Jul 21, 2016

		len = 0;
		} else if (typeof len !== 'number' \|\| !isFinite(len)) {

fs: do basic arg validation of truncate in js #2498

fs: do basic arg validation of truncate in js #2498

Conversation

thefourtheye commented Aug 22, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mscdex commented Aug 22, 2015

thefourtheye commented Aug 22, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thefourtheye commented Aug 27, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thefourtheye commented Sep 21, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

trevnorris commented Sep 21, 2015

Fishrock123 commented Oct 19, 2015

targos commented Jan 31, 2016

thefourtheye commented Jan 31, 2016

thefourtheye commented Feb 12, 2016

jasnell commented Feb 13, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thefourtheye commented Mar 14, 2016

thefourtheye commented Jul 10, 2016

trevnorris commented Jul 20, 2016

thefourtheye commented Jul 21, 2016

thefourtheye commented Jul 21, 2016

thefourtheye commented Jul 21, 2016