Merge pull request #966 from majestrate/loki-tld-hack-2020-03-10

make session "work" with .loki tld

js/modules/loki_app_dot_net_api.js

@@ -390,7 +390,13 @@ class LokiAppDotNetServerAPI {
         json: () => response,
       };
     }
-    return nodeFetch(urlObj, fetchOptions, options);
+    const urlStr = urlObj.toString();
+    if (urlStr.match(/\.loki\//)) {
+      process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+    }
+    const result = await nodeFetch(urlObj, fetchOptions, options);
+    process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1;
+    return result;
   }
 
   async _sendToProxy(endpoint, pFetchOptions, options = {}) {
@@ -565,7 +571,7 @@ class LokiAppDotNetServerAPI {
       fetchOptions.headers = headers;
 
       // domain ends in .loki
-      if (endpoint.match(/\.loki\//)) {
+      if (url.toString().match(/\.loki\//)) {
         fetchOptions.agent = snodeHttpsAgent;
       }
     } catch (e) {
@@ -599,9 +605,9 @@ class LokiAppDotNetServerAPI {
         ));
       } else {
         // disable check for .loki
-        process.env.NODE_TLS_REJECT_UNAUTHORIZED = endpoint.match(/\.loki\//)
-          ? 0
-          : 1;
+        if (url.toString().match(/\.loki/)) {
+          process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+        }
         result = await nodeFetch(url, fetchOptions);
         // always make sure this check is enabled
         process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1;

js/modules/loki_public_chat_api.js

@@ -29,11 +29,11 @@ class LokiPublicChatFactoryAPI extends EventEmitter {
     try {
       // allow .loki (may only need an agent but not sure
       //              until we have a .loki to test with)
-      process.env.NODE_TLS_REJECT_UNAUTHORIZED = serverUrl.match(/\.loki\//)
-        ? 0
-        : 1;
+      if (serverUrl.match(/\.loki$/)) {
+        process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+      }
       await nodeFetch(serverUrl);
-      process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1;
+      process.env.NODE_TLS_REJECT_UNAUTHORIZED = '1';
       // const txt = await res.text();
     } catch (e) {
       process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1;