diff options
| author | Matthew Wild <mwild1@gmail.com> | 2018-07-07 16:54:44 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2018-07-07 16:54:44 +0100 |
| commit | 159c96a3242c34d6dc0cae4a054f90786ee9ec9e (patch) | |
| tree | 5dc067ee3d79ce2327fb2df619b91c41d83def8c /plugins/muc | |
| parent | 40c4305e2f23a6c32c51d711c6b8aca6fdfb33eb (diff) | |
| download | prosody-159c96a3242c34d6dc0cae4a054f90786ee9ec9e.tar.gz prosody-159c96a3242c34d6dc0cae4a054f90786ee9ec9e.zip | |
MUC: Clarify logic of invitations in members-only rooms
Diffstat (limited to 'plugins/muc')
| -rw-r--r-- | plugins/muc/members_only.lib.lua | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/muc/members_only.lib.lua b/plugins/muc/members_only.lib.lua index 0cd68d08..c9980280 100644 --- a/plugins/muc/members_only.lib.lua +++ b/plugins/muc/members_only.lib.lua @@ -127,8 +127,9 @@ module:hook("muc-pre-invite", function(event) local room = event.room; if get_members_only(room) then local stanza = event.stanza; - local affiliation = room:get_affiliation(stanza.attr.from); - if not room._data.allow_member_invites and valid_affiliations[affiliation or "none"] < valid_affiliations.admin then + local inviter_affiliation = room:get_affiliation(stanza.attr.from) or "none"; + local required_affiliation = room._data.allow_member_invites and "member" or "admin"; + if valid_affiliations[inviter_affiliation] < valid_affiliations[required_affiliation] then event.origin.send(st.error_reply(stanza, "auth", "forbidden")); return true; end @@ -142,7 +143,8 @@ module:hook("muc-invite", function(event) local stanza = event.stanza; local invitee = stanza.attr.to; local affiliation = room:get_affiliation(invitee); - if valid_affiliations[affiliation or "none"] <= valid_affiliations.none and room._data.allow_member_invites then + local invited_unaffiliated = valid_affiliations[affiliation or "none"] <= valid_affiliations.none; + if invited_unaffiliated then local from = stanza:get_child("x", "http://jabber.org/protocol/muc#user") :get_child("invite").attr.from; module:log("debug", "%s invited %s into members only room %s, granting membership", |