From 89c5d71b503d3fe591c04491770b4ae8ed937965 Mon Sep 17 00:00:00 2001 From: lub Date: Fri, 3 Jan 2020 13:27:44 +0100 Subject: [PATCH] add ALLOW_ALL_USERS env variable (and better logging) --- index.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index 43333a0..85a8773 100644 --- a/index.js +++ b/index.js @@ -6,8 +6,10 @@ let bridge; let tmiListener; // permissions -const admins = process.env.ADMINS.split(','); -const users = process.env.USERS.split(',').concat(admins); +const admins = (process.env.ADMINS || '').split(','); +console.log('admins:', admins); +const users = (process.env.USERS || '').split(',').concat(admins); +console.log('users:', users); @@ -16,7 +18,11 @@ async function checkAdminPermissions(sender) { return admins.includes(sender); } async function checkUserPermissions(sender) { - return users.includes(sender); + if(process.env.ALLOW_ALL_USERS === 'true' || users.includes(sender)) { + return true; + } else { + return false; + } } async function bridgeRoom(sender, matrixRoom, remoteRoom) { await bridge.getRoomStore().linkRooms(matrixRoom, remoteRoom); @@ -115,9 +121,14 @@ new mx.Cli({ callback(reg); }, run: async (port, config) => { + const homeserver = process.env.HOMESERVER || 'http://localhost:8008'; + console.log('homeserver:', homeserver); + const domain = process.env.DOMAIN || 'localhost'; + console.log('domain:', domain); + bridge = new mx.Bridge({ - homeserverUrl: process.env.HOMESEVER || 'http://localhost:8008', - domain: process.env.DOMAIN || 'localhost', + homeserverUrl: homeserver, + domain: domain, registration: 'matritch-registration.yaml', controller: { onUserQuery: queriedUser => {