TEST - don't merge

README.md

@@ -1,4 +1,4 @@
-# <p align="center">Jitsi Meet</p>
+    # <p align="center">Jitsi Meet</p>
 
 Jitsi Meet is a set of Open Source projects which empower users to use and deploy
 video conferencing platforms with state-of-the-art video quality and features.

resources/prosody-plugins/mod_muc_jigasi_invite.lua

@@ -2,7 +2,7 @@
 -- jwt is used to validate access
 -- Copyright (C) 2023-present 8x8, Inc.
 
-local jid_split = require "util.jid".split;
+local jid = require "util.jid";
 local hashes = require "util.hashes";
 local random = require "util.random";
 local st = require("util.stanza");
@@ -18,7 +18,6 @@ local muc_domain = module:get_option_string("muc_internal_domain_base", 'interna
 
 local jigasi_brewery_room_jid = module:get_option_string("muc_jigasi_brewery_jid", 'jigasibrewery@' .. muc_domain);
 
-local jigasi_bare_jid = module:get_option_string("muc_jigasi_jid", "jigasi@auth." .. muc_domain_base);
 local focus_jid = module:get_option_string("muc_jicofo_brewery_jid", jigasi_brewery_room_jid .. "/focus");
 
 local main_muc_service;
@@ -43,9 +42,9 @@ local function invite_jigasi(conference, phone_no)
 
     --select least stressed Jigasi
     local least_stressed_value = math.huge;
-    local least_stressed_jigasi_jid;
+    local least_stressed_jigasi_occupant;
     for occupant_jid, occupant in jigasi_brewery_room:each_occupant() do
-        local _, _, resource = jid_split(occupant_jid);
+        local _, _, resource = jid.split(occupant_jid);
         if resource ~= 'focus' then
             local occ = occupant:get_presence();
             local stats_child = occ:get_child("stats", "http://jitsi.org/protocol/colibri")
@@ -63,7 +62,7 @@ local function invite_jigasi(conference, phone_no)
                         local stress_level = tonumber(stats_tag.attr.value);
                         module:log("debug", "Stressed level %s %s ", stress_level, occupant_jid)
                         if stress_level < least_stressed_value then
-                            least_stressed_jigasi_jid = occupant_jid
+                            least_stressed_jigasi_occupant = occupant;
                             least_stressed_value = stress_level
                         end
                     end
@@ -71,18 +70,15 @@ local function invite_jigasi(conference, phone_no)
             end
         end
     end
-    module:log("debug", "Least stressed jigasi selected jid %s value %s", least_stressed_jigasi_jid, least_stressed_value)
-    if not least_stressed_jigasi_jid then
+    module:log("debug", "Least stressed jigasi selected jid %s value %s", least_stressed_jigasi_occupant.jid, least_stressed_value)
+    if not least_stressed_jigasi_occupant then
         module:log("error", "Cannot invite jigasi from room %s", jigasi_brewery_room.jid)
         return 404, 'Jigasi not found'
     end
 
     -- invite Jigasi to join the conference
-    local _, _, jigasi_res = jid_split(least_stressed_jigasi_jid)
-    local jigasi_full_jid = jigasi_bare_jid .. "/" .. jigasi_res;
     local stanza_id = hashes.sha256(random.bytes(8), true);
-
-    local invite_jigasi_stanza = st.iq({ xmlns = "jabber:client", type = "set", to = jigasi_full_jid, from = focus_jid, id = stanza_id })
+    local invite_jigasi_stanza = st.iq({ xmlns = "jabber:client", type = "set", to = least_stressed_jigasi_occupant.jid, from = focus_jid, id = stanza_id })
                                    :tag("dial", { xmlns = "urn:xmpp:rayo:1", from = "fromnumber", to = phone_no })
                                    :tag("header", { xmlns = "urn:xmpp:rayo:1", name = "JvbRoomName", value = conference })
 

resources/prosody-plugins/mod_polls_component.lua

@@ -141,6 +141,11 @@ end
             local main_room = get_room_by_name_and_subdomain(session.jitsi_web_query_room, session.jitsi_web_query_prefix);
             local occupant_jid = stanza.attr.from;
 
+            if not main_room then
+                module:log('warn', 'No main room found for %s %s', session.jitsi_web_query_room, session.jitsi_web_query_prefix);
+                return;
+            end
+
             occupant = main_room:get_occupant_by_real_jid(occupant_jid);
 
             if main_room._data.breakout_rooms_active and not occupant then
@@ -148,10 +153,13 @@ end
                 -- not in main room, let's check breakout rooms
                 for breakout_room_jid, subject in pairs(main_room._data.breakout_rooms or {}) do
                     local breakout_room = get_room_from_jid(breakout_room_jid);
-                    occupant = breakout_room:get_occupant_by_real_jid(occupant_jid);
-                    if occupant then
-                        room = breakout_room;
-                        break;
+
+                    if breakout_room then
+                        occupant = breakout_room:get_occupant_by_real_jid(occupant_jid);
+                        if occupant then
+                            room = breakout_room;
+                            break;
+                        end
                     end
                 end
             else

resources/prosody-plugins/token/util.lib.lua

@@ -279,7 +279,9 @@ function Util:process_and_verify_token(session)
         -- We're fetching an public key from an ASAP server
         local dotFirst = session.auth_token:find("%.");
         if not dotFirst then return false, "not-allowed", "Invalid token" end
-        local header, err = json_safe.decode(basexx.from_url64(session.auth_token:sub(1,dotFirst-1)));
+        local headerPartEncoded = basexx.from_url64(session.auth_token:sub(1,dotFirst-1));
+        if not headerPartEncoded then return false, "not-allowed", "Invalid token" end
+        local header, err = json_safe.decode(headerPartEncoded);
         if err then
             return false, "not-allowed", "bad token format";
         end