Skip to content

Commit

Permalink
try v12 again
Browse files Browse the repository at this point in the history
  • Loading branch information
awick committed Jul 1, 2020
1 parent 0e04a05 commit 1c25c6f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion easybutton-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ PCAP=1.9.1
CURL=7.68.0
LUA=5.3.5
DAQ=2.0.7
NODE=10.21.0
NODE=12.18.2

TDIR="/data/moloch"
DOPFRING=0
Expand Down
2 changes: 1 addition & 1 deletion viewer/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ exports.loadFields = function (data) {
// Globals
/// ///////////////////////////////////////////////////////////////////////////////
internals.s2sSignedAuth = exports.getFull('default', 's2sSignedAuth', true);
internals.aes256Encryption = exports.getFull('default', 'aes256Encryption', false);
internals.aes256Encryption = exports.getFull('default', 'aes256Encryption', true);

// If passwordSecret isn't set, viewer will treat accounts as anonymous
internals.passwordSecret = exports.getFull('default', 'passwordSecret', 'password');
Expand Down
6 changes: 5 additions & 1 deletion viewer/decode.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var Stream = require('stream');
var Readable = Stream.Readable;
var Transform = Stream.Transform;
var Writable = Stream.Writable;
var HTTPParser = process.binding('http_parser').HTTPParser;
var HTTPParser = process.binding('http_parser_llhttp').HTTPParser;
var zlib = require('zlib');
var through = require('through2');
var peek = require('peek-stream');
Expand Down Expand Up @@ -553,8 +553,12 @@ ItemHTTPStream.prototype._process = function (item, callback) {
if (this.parsers === undefined) {
if (item.data.slice(0, 4).toString() === 'HTTP') {
this.parsers = [new HTTPParser(HTTPParser.RESPONSE), new HTTPParser(HTTPParser.REQUEST)];
this.parsers[0].initialize(HTTPParser.RESPONSE, {});
this.parsers[1].initialize(HTTPParser.REQUEST, {});
} else {
this.parsers = [new HTTPParser(HTTPParser.REQUEST), new HTTPParser(HTTPParser.RESPONSE)];
this.parsers[0].initialize(HTTPParser.REQUEST, {});
this.parsers[1].initialize(HTTPParser.RESPONSE, {});
}
this.parsers[0].httpstream = this.parsers[1].httpstream = this;
this.parsers[0][HTTPParser.kOnBody] = this.parsers[1][HTTPParser.kOnBody] = ItemHTTPStream.onBody;
Expand Down

0 comments on commit 1c25c6f

Please sign in to comment.