Skip to content
This repository was archived by the owner on Jan 9, 2023. It is now read-only.

NullStream write after end fix #61

Merged
stephen-palmer merged 2 commits into from
Sep 19, 2018
Merged

NullStream write after end fix #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f698d44
NullStream write after end fix
adipirro Sep 18, 2018
df1b302
Remove null stream and make the stream inline
adipirro Sep 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions lib/server/command_processor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ const kSource = Symbol("source");
const kCache = Symbol("cache");
const kSendFileQueue = Symbol("sendFileQueue");

class NullStream extends Writable {
_write(chunk, encoding, cb) {
setImmediate(cb);
}
}

class CommandProcessor extends Duplex {

/**
Expand Down Expand Up @@ -45,7 +39,6 @@ class CommandProcessor extends Duplex {
this._putWhitelist = this._options.putWhitelist;
this._whitelistEmpty = (!Array.isArray(this._putWhitelist) || !this._putWhitelist.length);

this._nullStream = new NullStream();
this._putStream = null;
this._putSize = 0;
this._putSent = 0;
Expand Down Expand Up @@ -351,7 +344,11 @@ class CommandProcessor extends Duplex {
if (this._isWhitelisted(this._trx.clientAddress)) {
this._putStream = await this._trx.getWriteStream(type, size);
} else {
this._putStream = this._nullStream;
this._putStream = new Writable({
write(chunk, encoding, cb) {
setImmediate(cb);
}
});
helpers.log(consts.LOG_DBG, `PUT rejected from non-whitelisted IP: ${this._trx.clientAddress}`);
}

Expand All @@ -361,4 +358,4 @@ class CommandProcessor extends Duplex {
}
}

module.exports = CommandProcessor;
module.exports = CommandProcessor;