make .loki public chats "work"

passing number zero to environmental variables UNSETS the variable, pass "0" instead.
this commit makes it "work" but is probably not the right fix, that comes later. (tm)
pull/966/head
Jeff Becker 5 years ago
parent 56643660a6
commit 8d684f7b1b
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

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

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

Loading…
Cancel
Save