From 3b140d9b5144e4dd0c139e2c4047ec0df8b68a94 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Wed, 20 Mar 2019 13:43:24 -0700 Subject: [PATCH 1/7] Update react-contextmenu to avoid event handler issues un unload --- js/views/conversation_view.js | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index d89627d7d..de447df5f 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -221,7 +221,7 @@ }, onArchive: () => { - this.unload(); + this.unload('archive'); this.model.setArchived(true); }, onMoveToInbox: () => { diff --git a/package.json b/package.json index 6baf93ece..60ea6be91 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "protobufjs": "6.8.6", "proxy-agent": "3.0.3", "react": "16.8.3", - "react-contextmenu": "2.9.2", + "react-contextmenu": "2.11.0", "react-dom": "16.8.3", "react-redux": "6.0.1", "react-virtualized": "9.21.0", diff --git a/yarn.lock b/yarn.lock index d60bb9bd2..77777d5e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7413,10 +7413,10 @@ react-codemirror2@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-4.2.1.tgz#4ad3c5c60ebbcb34880f961721b51527324ec021" -react-contextmenu@2.9.2: - version "2.9.2" - resolved "https://registry.yarnpkg.com/react-contextmenu/-/react-contextmenu-2.9.2.tgz#7076075f09e4cad023a1252da347d9e6782d003a" - integrity sha512-DdcO6iLBIJuDVsRpJLG/9N6ine0OVZhuQvnSPCEihfcyJFz+SHU9pQo+w9LWi2PdUxFbFV52BwAuutQkAYJxaA== +react-contextmenu@2.11.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/react-contextmenu/-/react-contextmenu-2.11.0.tgz#ec57614e6d687ceaec5c0ba97d56a302c9551d17" + integrity sha512-vT9QV9p/9h1BSIvmajRVG3KsgjuBnISpEQp0F1QYsUPFMe3VOKV2l7IiD8yrNUyXYZKrWMqI0YKsaBwGSRVgJg== dependencies: classnames "^2.2.5" object-assign "^4.1.0" From c1b680eeb417a5ff621aac4d9dc01583ff41c1a4 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Mon, 18 Mar 2019 14:07:10 -0700 Subject: [PATCH 2/7] Skip URLs that include the @ symbol when generating links Thanks to mcsim for the bug report. --- ts/components/conversation/Linkify.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ts/components/conversation/Linkify.tsx b/ts/components/conversation/Linkify.tsx index a845f7f42..200a156bc 100644 --- a/ts/components/conversation/Linkify.tsx +++ b/ts/components/conversation/Linkify.tsx @@ -14,6 +14,7 @@ interface Props { } const SUPPORTED_PROTOCOLS = /^(http|https):/i; +const HAS_AT = /@/; export class Linkify extends React.Component { public static defaultProps: Partial = { @@ -50,7 +51,11 @@ export class Linkify extends React.Component { } const { url, text: originalText } = match; - if (SUPPORTED_PROTOCOLS.test(url) && !isLinkSneaky(url)) { + if ( + SUPPORTED_PROTOCOLS.test(url) && + !isLinkSneaky(url) && + !HAS_AT.test(url) + ) { results.push( {originalText} From 81696b4b152fde83eb57deca80e6f9668443b7f0 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Fri, 22 Mar 2019 11:06:33 -0700 Subject: [PATCH 3/7] Update sqlcipher dependency to get win vc++ redistributable --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 60ea6be91..6f8eb76bc 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "styleguide": "styleguidist server" }, "dependencies": { - "@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#36149a4b03ccf11ec18b9205e1bfd9056015cf07", + "@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#2e28733b61640556b0272a3bfc78b0357daf71e6", "@sindresorhus/is": "0.8.0", "@types/react-virtualized": "9.18.12", "backbone": "1.3.3", diff --git a/yarn.lock b/yarn.lock index 77777d5e0..bc2cf47b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,9 +14,9 @@ dependencies: regenerator-runtime "^0.12.0" -"@journeyapps/sqlcipher@https://github.com/scottnonnenberg-signal/node-sqlcipher.git#36149a4b03ccf11ec18b9205e1bfd9056015cf07": +"@journeyapps/sqlcipher@https://github.com/scottnonnenberg-signal/node-sqlcipher.git#14704fc921140494c4af13f8887a4e74767c8192": version "3.2.1" - resolved "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#36149a4b03ccf11ec18b9205e1bfd9056015cf07" + resolved "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#14704fc921140494c4af13f8887a4e74767c8192" dependencies: nan "^2.10.0" node-pre-gyp "^0.10.0" From d251282da17e57b45e5b42cda0a9b2da97a7ccd8 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Fri, 22 Mar 2019 12:24:07 -0700 Subject: [PATCH 4/7] Upgrade electron-builder and electron-updater --- package.json | 4 +- ts/util/lint/exceptions.json | 816 +++++++++++++++++++++++++++++++++-- ts/util/lint/rules.json | 6 + yarn.lock | 234 +++++----- 4 files changed, 931 insertions(+), 129 deletions(-) diff --git a/package.json b/package.json index 6f8eb76bc..912f28dd5 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "config": "1.28.1", "electron-editor-context-menu": "1.1.1", "electron-is-dev": "0.3.0", - "electron-updater": "3.0.3", + "electron-updater": "3.2.0", "emoji-datasource": "4.0.0", "emoji-datasource-apple": "4.0.0", "emoji-js": "3.4.0", @@ -122,7 +122,7 @@ "bower": "1.8.2", "chai": "4.1.2", "electron": "4.0.8", - "electron-builder": "20.31.3", + "electron-builder": "20.33.1", "electron-icon-maker": "0.0.3", "eslint": "4.14.0", "eslint-config-airbnb-base": "12.1.0", diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json index 7dfd7bac6..6b00fb2a4 100644 --- a/ts/util/lint/exceptions.json +++ b/ts/util/lint/exceptions.json @@ -1742,6 +1742,738 @@ "reasonCategory": "falseMatch", "updated": "2018-09-19T21:59:32.770Z" }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.core.js", + "line": "function nodebackForPromise(promise, multiArgs) {", + "lineNumber": 2099, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.core.js", + "line": " } else if (!multiArgs) {", + "lineNumber": 2106, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.core.js", + "line": " var multiArgs = arguments.length > 1 ? !!Object(arguments[1]).multiArgs", + "lineNumber": 2296, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.core.js", + "line": " var result = tryCatch(fn)(nodebackForPromise(ret, multiArgs));", + "lineNumber": 2298, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.core.js", + "line": " util.toFastProperties(Promise); ", + "lineNumber": 2856, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "Promise is a known global" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.core.js", + "line": "function toFastProperties(obj) {", + "lineNumber": 3592, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "Declaring a dangerous function" + }, + { + "rule": "eval", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.core.js", + "line": " eval(obj);", + "lineNumber": 3599, + "reasonCategory": "ruleNeeded", + "updated": "2019-03-22T19:00:07.131Z", + "reasonDetail": "his is run on whatever is provided to toFastProperties()" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.core.js", + "line": " toFastProperties: toFastProperties,", + "lineNumber": 3752, + "reasonCategory": "falseMatch|testCode|exampleCode|otherUtilityCode|regexMatchedSafeCode|notExercisedByOurApp|ruleNeeded|usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "Exposing a dangerous function" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.core.js", + "line": "if (ret.isNode) ret.toFastProperties(process);", + "lineNumber": 3775, + "reasonCategory": "falseMatch|testCode|exampleCode|otherUtilityCode|regexMatchedSafeCode|notExercisedByOurApp|ruleNeeded|usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "process is a known global" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.core.min.js", + "lineNumber": 31, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.core.min.js", + "lineNumber": 31, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " var spawn = new PromiseSpawn$(undefined, undefined, yieldHandler,", + "lineNumber": 2228, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " this.constructor$(promises);", + "lineNumber": 2441, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " this._init$(undefined, -2);", + "lineNumber": 2456, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": "function nodebackForPromise(promise, multiArgs) {", + "lineNumber": 2687, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " } else if (!multiArgs) {", + "lineNumber": 2694, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " var multiArgs = arguments.length > 1 ? !!Object(arguments[1]).multiArgs", + "lineNumber": 2944, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " var result = tryCatch(fn)(nodebackForPromise(ret, multiArgs));", + "lineNumber": 2946, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " util.toFastProperties(Promise); ", + "lineNumber": 3519, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": "function(callback, receiver, originalName, fn, _, multiArgs) {", + "lineNumber": 3846, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " var nodeback = nodebackForPromise(promise, \" + multiArgs + \"); \\n\\", + "lineNumber": 3897, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": "function makeNodePromisifiedClosure(callback, receiver, _, fn, __, multiArgs) {", + "lineNumber": 3938, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " var fn = nodebackForPromise(promise, multiArgs);", + "lineNumber": 3951, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": "function promisifyAll(obj, suffix, filter, promisifier, multiArgs) {", + "lineNumber": 3968, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " makeNodePromisified(key, THIS, key, fn, suffix, multiArgs);", + "lineNumber": 3979, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " fn, suffix, multiArgs);", + "lineNumber": 3983, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " util.toFastProperties(obj);", + "lineNumber": 3989, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "promisifyAll calls toFastProperties() but is limited to function or object" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": "function promisify(callback, receiver, multiArgs) {", + "lineNumber": 3993, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " callback, null, multiArgs);", + "lineNumber": 3995, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " var multiArgs = !!options.multiArgs;", + "lineNumber": 4007, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " var ret = promisify(fn, receiver, multiArgs);", + "lineNumber": 4008, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " var multiArgs = !!options.multiArgs;", + "lineNumber": 4018, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " multiArgs);", + "lineNumber": 4036, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " promisifyAll(value, suffix, filter, promisifier, multiArgs);", + "lineNumber": 4037, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " return promisifyAll(target, suffix, filter, promisifier, multiArgs);", + "lineNumber": 4041, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " this.constructor$(entries);", + "lineNumber": 4102, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " this._init$(undefined, isMap ? -6 : -3);", + "lineNumber": 4104, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " this.constructor$(promises);", + "lineNumber": 4305, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " this._init$(undefined, -5);", + "lineNumber": 4322, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " this._resultCancelled$();", + "lineNumber": 4360, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " this.constructor$(values);", + "lineNumber": 4537, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " this.constructor$(values);", + "lineNumber": 4586, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " this._init$(undefined, -5);", + "lineNumber": 4601, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " this.constructor$(fn, promise, context);", + "lineNumber": 5104, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": "function toFastProperties(obj) {", + "lineNumber": 5434, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "Declaring a dangerous function" + }, + { + "rule": "eval", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " eval(obj);", + "lineNumber": 5441, + "reasonCategory": "ruleNeeded", + "updated": "2019-03-22T19:00:07.131Z", + "reasonDetail": "This is run on whatever is provided to toFastProperties()" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": " toFastProperties: toFastProperties,", + "lineNumber": 5594, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "Exposing a dangerous function" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.js", + "line": "if (ret.isNode) ret.toFastProperties(process);", + "lineNumber": 5617, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "process is a known global" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.min.js", + "lineNumber": 30, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.min.js", + "lineNumber": 30, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.min.js", + "lineNumber": 30, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/browser/bluebird.min.js", + "lineNumber": 31, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/assert.js", + "line": " this.constructor$(a);", + "lineNumber": 5, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/generators.js", + "line": " var spawn = new PromiseSpawn$(undefined, undefined, yieldHandler,", + "lineNumber": 197, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/map.js", + "line": " this.constructor$(promises);", + "lineNumber": 15, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/map.js", + "line": " this._init$(undefined, -2);", + "lineNumber": 30, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/nodeback.js", + "line": "function nodebackForPromise(promise, multiArgs) {", + "lineNumber": 34, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/nodeback.js", + "line": " } else if (!multiArgs) {", + "lineNumber": 41, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promise.js", + "line": " var multiArgs = arguments.length > 1 ? !!Object(arguments[1]).multiArgs", + "lineNumber": 178, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promise.js", + "line": " var result = tryCatch(fn)(nodebackForPromise(ret, multiArgs));", + "lineNumber": 180, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promise.js", + "line": " util.toFastProperties(Promise); ", + "lineNumber": 753, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "Promise is a known global" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": "function(callback, receiver, originalName, fn, _, multiArgs) {", + "lineNumber": 116, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": " var nodeback = nodebackForPromise(promise, \" + multiArgs + \"); \\n\\", + "lineNumber": 167, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": "function makeNodePromisifiedClosure(callback, receiver, _, fn, __, multiArgs) {", + "lineNumber": 208, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": " var fn = nodebackForPromise(promise, multiArgs);", + "lineNumber": 221, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": "function promisifyAll(obj, suffix, filter, promisifier, multiArgs) {", + "lineNumber": 238, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": " makeNodePromisified(key, THIS, key, fn, suffix, multiArgs);", + "lineNumber": 249, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": " fn, suffix, multiArgs);", + "lineNumber": 253, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": " util.toFastProperties(obj);", + "lineNumber": 259, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "promisifyAll calls toFastProperties() but is limited to function or object" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": "function promisify(callback, receiver, multiArgs) {", + "lineNumber": 263, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": " callback, null, multiArgs);", + "lineNumber": 265, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": " var multiArgs = !!options.multiArgs;", + "lineNumber": 277, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": " var ret = promisify(fn, receiver, multiArgs);", + "lineNumber": 278, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": " var multiArgs = !!options.multiArgs;", + "lineNumber": 288, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": " multiArgs);", + "lineNumber": 306, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": " promisifyAll(value, suffix, filter, promisifier, multiArgs);", + "lineNumber": 307, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "thenify-multiArgs", + "path": "node_modules/cacache/node_modules/bluebird/js/release/promisify.js", + "line": " return promisifyAll(target, suffix, filter, promisifier, multiArgs);", + "lineNumber": 311, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/props.js", + "line": " this.constructor$(entries);", + "lineNumber": 56, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/props.js", + "line": " this._init$(undefined, isMap ? -6 : -3);", + "lineNumber": 58, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/reduce.js", + "line": " this.constructor$(promises);", + "lineNumber": 13, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/reduce.js", + "line": " this._init$(undefined, -5);", + "lineNumber": 30, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/reduce.js", + "line": " this._resultCancelled$();", + "lineNumber": 68, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/settle.js", + "line": " this.constructor$(values);", + "lineNumber": 8, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/some.js", + "line": " this.constructor$(values);", + "lineNumber": 12, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/some.js", + "line": " this._init$(undefined, -5);", + "lineNumber": 27, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/cacache/node_modules/bluebird/js/release/using.js", + "line": " this.constructor$(fn, promise, context);", + "lineNumber": 92, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/release/util.js", + "line": "function toFastProperties(obj) {", + "lineNumber": 194, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "Declaring a dangerous function" + }, + { + "rule": "eval", + "path": "node_modules/cacache/node_modules/bluebird/js/release/util.js", + "line": " eval(obj);", + "lineNumber": 201, + "reasonCategory": "ruleNeeded", + "updated": "2019-03-22T19:00:07.131Z", + "reasonDetail": "This is run on whatever is provided to toFastProperties()" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/release/util.js", + "line": " toFastProperties: toFastProperties,", + "lineNumber": 354, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "Declaring a dangerous function" + }, + { + "rule": "bluebird-toFastProperties", + "path": "node_modules/cacache/node_modules/bluebird/js/release/util.js", + "line": "if (ret.isNode) ret.toFastProperties(process);", + "lineNumber": 377, + "reasonCategory": "usageTrusted", + "updated": "2019-03-22T19:15:12.445Z", + "reasonDetail": "process is a known global" + }, { "rule": "jQuery-wrap(", "path": "node_modules/caching-transform/index.js", @@ -2073,6 +2805,38 @@ "updated": "2018-09-18T19:19:27.699Z", "reasonDetail": "What's being eval'd is a static string, with one variable: args. Args is of the form arg1, arg2, generated programmatically." }, + { + "rule": "jQuery-$(", + "path": "node_modules/dmg-builder/node_modules/app-builder-lib/out/ProtonFramework.js", + "line": "DIR=$(dirname \"$0\")", + "lineNumber": 209, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/dmg-builder/node_modules/app-builder-lib/out/ProtonFramework.js", + "line": "DIR=$(dirname \"$0\")", + "lineNumber": 223, + "reasonCategory": "falseMatch", + "updated": "2019-03-22T19:00:07.131Z" + }, + { + "rule": "jQuery-$(", + "path": "node_modules/dmg-builder/node_modules/app-builder-lib/out/targets/MsiTarget.js", + "line": " result += `\\n${fileSpace} Date: Fri, 22 Mar 2019 12:28:02 -0700 Subject: [PATCH 5/7] Update Electron to 4.1.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 912f28dd5..976ded299 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,7 @@ "asar": "0.14.0", "bower": "1.8.2", "chai": "4.1.2", - "electron": "4.0.8", + "electron": "4.1.1", "electron-builder": "20.33.1", "electron-icon-maker": "0.0.3", "eslint": "4.14.0", diff --git a/yarn.lock b/yarn.lock index 8555e3eb6..8a7df1e1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2692,10 +2692,10 @@ electron-updater@3.2.0: semver "^5.6.0" source-map-support "^0.5.9" -electron@4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/electron/-/electron-4.0.8.tgz#b7998b16543d2094f081757a0c5afdb8875ea510" - integrity sha512-FOBJIHkuv8wc15N+ZyqwDzPavYVu5CHMBEf14jHDWv7QW2vkEIpJjVK+PIT31kfZfvjsIP0j2wvA/FBsiqB7pw== +electron@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-4.1.1.tgz#dc9343ba829cabbf01364761e72796f766704184" + integrity sha512-ABIEXTw55eiCW30a6F8fWLHL0QeH+yK3JgZpvTZZWLnkO5/SmG38avMxRhKOUQstRpYb+EEpE8IAM2DVOaTvtw== dependencies: "@types/node" "^10.12.18" electron-download "^4.1.0" From d96b189a075e39c3cfe04f9ab92a876d05eabf9e Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Fri, 22 Mar 2019 12:38:05 -0700 Subject: [PATCH 6/7] v1.23.1-beta.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 976ded299..36a6ae481 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Signal", "description": "Private messaging from your desktop", "repository": "https://github.com/signalapp/Signal-Desktop.git", - "version": "1.23.0-beta.4", + "version": "1.23.1-beta.1", "license": "GPL-3.0", "author": { "name": "Open Whisper Systems", From 16bd8c1744cf2ca52f7f53117cecdbe9c3b1c747 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Fri, 22 Mar 2019 14:22:35 -0700 Subject: [PATCH 7/7] v1.23.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 36a6ae481..50ff41d29 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Signal", "description": "Private messaging from your desktop", "repository": "https://github.com/signalapp/Signal-Desktop.git", - "version": "1.23.1-beta.1", + "version": "1.23.1", "license": "GPL-3.0", "author": { "name": "Open Whisper Systems",