fix weird issue with acl c2s check
Signed-off-by: June Clementine Strawberry <june@3.dog>
This commit is contained in:
parent
0f81c1e1cc
commit
1b71b99c51
1 changed files with 6 additions and 0 deletions
|
@ -229,6 +229,9 @@ async fn allowed_to_send_state_event(
|
||||||
|
|
||||||
if acl_content.deny.contains(&String::from("*"))
|
if acl_content.deny.contains(&String::from("*"))
|
||||||
&& !acl_content.is_allowed(services.globals.server_name())
|
&& !acl_content.is_allowed(services.globals.server_name())
|
||||||
|
&& !acl_content
|
||||||
|
.allow
|
||||||
|
.contains(&services.globals.server_name().to_string())
|
||||||
{
|
{
|
||||||
return Err!(Request(BadJson(debug_warn!(
|
return Err!(Request(BadJson(debug_warn!(
|
||||||
?room_id,
|
?room_id,
|
||||||
|
@ -240,6 +243,9 @@ async fn allowed_to_send_state_event(
|
||||||
|
|
||||||
if !acl_content.allow.contains(&String::from("*"))
|
if !acl_content.allow.contains(&String::from("*"))
|
||||||
&& !acl_content.is_allowed(services.globals.server_name())
|
&& !acl_content.is_allowed(services.globals.server_name())
|
||||||
|
&& !acl_content
|
||||||
|
.allow
|
||||||
|
.contains(&services.globals.server_name().to_string())
|
||||||
{
|
{
|
||||||
return Err!(Request(BadJson(debug_warn!(
|
return Err!(Request(BadJson(debug_warn!(
|
||||||
?room_id,
|
?room_id,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue