From 569485f42a0b9951224880b83a8b20eb8a87b014 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Mon, 3 Feb 2020 19:29:30 -0800 Subject: [PATCH] put back seemingly now required process.env.NODE_TLS_REJECT_UNAUTHORIZED --- js/modules/loki_rpc.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/js/modules/loki_rpc.js b/js/modules/loki_rpc.js index 7433fc4be..d725f04ed 100644 --- a/js/modules/loki_rpc.js +++ b/js/modules/loki_rpc.js @@ -1,5 +1,5 @@ /* global log, libloki, textsecure, getStoragePubKey, lokiSnodeAPI, StringView, - libsignal, window, TextDecoder, TextEncoder, dcodeIO */ + libsignal, window, TextDecoder, TextEncoder, dcodeIO, process */ const nodeFetch = require('node-fetch'); const https = require('https'); @@ -66,7 +66,11 @@ const sendToProxy = async (options = {}, targetNode) => { }, }; + // we only proxy to snodes... + process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0; const response = await nodeFetch(url, firstHopOptions); + process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1; + const ciphertext = await response.text(); const ciphertextBuffer = dcodeIO.ByteBuffer.wrap( @@ -130,7 +134,12 @@ const lokiFetch = async (url, options = {}, targetNode = null) => { return result.json(); } + if (url.match(/https:\/\//)) { + process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0; + } const response = await nodeFetch(url, fetchOptions); + // restore TLS checking + process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1; let result; // Wrong swarm