backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 07:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

return an error when attempting to delete a nonexistent local alias

Browse source 
The spec doesn't spell out explicitly that the server should check this,
but it does list M_NOT_FOUND "room alias ... not found" as an example
error response.
This commit is contained in:
Olivia Lee 2025-05-18 13:30:42 -07:00
parent a34bca3986
commit 5f9e85cb49
No known key found for this signature in database
GPG key ID: 54D568A15B9CD1F9
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
book/changelog.md
View file

@ -153,6 +153,8 @@ This will be the first release of Grapevine since it was forked from Conduit
14. Use trust-dns for all DNS queries, instead of only for SRV records and SRV 14. Use trust-dns for all DNS queries, instead of only for SRV records and SRV
record targets in server discovery. record targets in server discovery.
([!156](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/156)) ([!156](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/156))
15. Return an error on when attempting to delete a nonexistent local alias.
([!186](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/186))
### Fixed ### Fixed

7
src/api/client_server/alias.rs
View file

@ -75,6 +75,13 @@ pub(crate) async fn delete_alias_route(
)); ));
} }
if services().rooms.alias.resolve_local_alias(&body.room_alias)?.is_none() {
return Err(Error::BadRequest(
ErrorKind::NotFound,
"Alias is not assigned.",
));
}
if let Some(info) = &body.appservice_info { if let Some(info) = &body.appservice_info {
if !info.aliases.is_match(body.room_alias.as_str()) { if !info.aliases.is_match(body.room_alias.as_str()) {
return Err(Error::BadRequest( return Err(Error::BadRequest(