TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3601 commits 50 branches 7 tags 14 MiB
Commit graph

3601 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jason Volk
2ab3231ea6 add tracing_subscriber::filter::ParseError to amalgam 
Signed-off-by: Jason Volk <jason@zemos.net>
 2024-06-12 18:25:27 +00:00
strawberry
d0069cc100 log out any sessions when the server emergency password is unset 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-12 14:04:47 -04:00
Matthias Ahouansou
556e78214a fix: only allow the server user to set the admin alias 
Should make it safer to move the alias if the admin room broke on a public server.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-12 14:04:47 -04:00
strawberry
8fff7ea706 cleanup+refactor admin room alias and server account accessing to globals 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-12 14:04:47 -04:00
Matthias Ahouansou
f712c0cefb fix: restrict who can remove aliases 
Previously, anyone could remove any local alias, meaning that someone could re-route a popular alias elsewhere
Now, only the creator of the alias, users who can set canonical aliases for the room, server admins and the server user can delete aliases

added some additional changes/fixes to adapt to our codebase

Co-authored-by: strawberry <strawberry@puppygock.gay>
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-12 14:04:47 -04:00
Matthias Ahouansou
26d103d314 fix: only process admin commands if server user is in the room 
Should prevent some edge cases with a misconfigured admin room

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-12 14:04:47 -04:00
Benjamin Lee
0688a96c37 drop redacted events from search results 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-12 14:04:47 -04:00
Benjamin Lee
eb73d8c669 fix: de-index pdus when redacted 
bit of code dedupe as well

Co-authored-by: strawberry <strawberry@puppygock.gay>
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-12 14:04:47 -04:00
Benjamin Lee
20a54aacd6 factor search tokenization out into a function 
This ensures that the tokenization algorithm will remain in sync between
querying, indexing, and deindexing. The existing code had slightly
different behavior for querying, because it did not discard words with
>50 bytes. This was inconsequential, because >50 byte tokens are never
present in the index.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-12 14:04:47 -04:00
Benjamin Lee
81cd677b4e fix dropped events in search 
The previous code would drop some events entirely if any events between
`skip` and `skip + limit` were not visible to the user. This would cause
the set of events skipped by the `skip(skip)` method to extend past
`skip` in the raw result set, because `skip(skip)` was being called
*after* filtering out invisible events.

This bug will become much more severe with a full filtering
implementation, because it will be more likely for events to be filtered
out. Currently, it is only possible to trigger with rooms that have
history visibility set to "invited" or "joined".

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-12 14:04:47 -04:00
Benjamin Lee
73da353e52 fix missing next_batch for search 
The previous code would fail to return next_batch if any of the events
in the window were not visible to the user. It would also return an
unnecessary next_batch when no more results are available if the total
number of results is exactly `skip + limit`.

This bug will become much more severe with a full filtering
implementation, because we will be more likely to trigger it by
filtering out events in a search call. Currently, it is only possible to
trigger with rooms that have history visibility set to "invited" or
"joined".

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-12 14:04:47 -04:00
strawberry
d5677b6ae7 bump cargo.lock due to yanked httparse 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-11 20:18:28 -04:00
strawberry
01a77f8a71 add replaces_state and prev_sender in unsigned for membership changes 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-11 13:03:32 -04:00
strawberry
ea03a50e21 remove pfps/avatars and display names upon deactivation 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-11 01:19:18 -04:00
strawberry
25d44cad31 slightly dedupe pfp/displayname updates, update blurhash in PDUs too 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-11 01:19:18 -04:00
strawberry
91519959ed mark account as deactivated before leaving rooms 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-11 01:19:18 -04:00
strawberry
2e31bcc213 use our fork of axum-server instead 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-11 01:19:18 -04:00
strawberry
305dfc3b42 adminroom: cmds to view room topic and room members 
this will be extended more

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 23:38:03 -04:00
strawberry
65fbb80145 adminroom: leave all rooms by default on manual deactivations 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 21:14:18 -04:00
strawberry
f1d90e5df6 log client/remote IP address on various routes tracing calls 
this uses InsecureClientIp as this is purely for informational
and logging purposes

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 21:04:51 -04:00
strawberry
74b29ce067 adminroom: improved room list outputs, add counts 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
0e7c3cb338 adminroom: simplify codeblock checks 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
14a3471fcb adminroom: fix function typo 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
c834e86e67 adminroom: user cmds to put/get/delete room account data 
primarily useful for inserting `m.server_notice` user account data
onto the admin room

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
b4f0a8a8b5 adminroom: clean up and optimise user commands 
`deactivate-all` was terrible and incredibly inefficient

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
9bb90213e1 adminroom: add user ID parsing utils 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
fcdf1463ef refactor get_room_topic into 1 single function 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
88d038ffec refactor getting room's canonical alias into 1 function 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
4b4c0952a2 refactor guest_can_join into 1 single function 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
016270b33b adminroom: add server_in_room state cache accessor 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
d2063013b4 adminroom: add various state_cache db accessors 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
03ba9bde29 admin cmd to force download and use a server's room state 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
1287a86c05 client-api: export validate_and_add_event_id 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 19:45:04 -04:00
strawberry
8210e8c42e slightly adjust sliding sync code for ruma bump 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 17:20:59 -04:00
strawberry
adf0bfd894 bump ruma 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 16:57:44 -04:00
strawberry
6b843ec4dd switch to patch/fork of axum-server to fix shutdown hangs 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 16:55:40 -04:00
strawberry
ac02078395 bump cargo.lock, add tracing feature to axum-extra 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 16:55:40 -04:00
renovate[bot]
b9d38fd3ba chore(deps): update rust crate http-body-util to v0.1.2 2024-06-10 16:55:40 -04:00
renovate[bot]
1b2c8236fb chore(deps): update rust crate clap to v4.5.7 2024-06-10 16:55:40 -04:00
renovate[bot]
d7b8af627c chore(deps): update rust crate console-subscriber to 0.3 2024-06-10 16:55:40 -04:00
renovate[bot]
130aae8758 chore(deps): update rust crate url to v2.5.1 2024-06-10 16:55:40 -04:00
renovate[bot]
4741a76896 chore(deps): update rust crate regex to v1.10.5 2024-06-10 16:55:40 -04:00
strawberry
5bfb62e979 Revert "update complement results" 
This reverts commit 9a3c52aa75.
 2024-06-10 15:38:20 -04:00
strawberry
cb03654dc1 fix broken federated room invites/joins 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-10 14:53:26 -04:00
Jason Volk
f0557e3303 split migrations function 
Signed-off-by: Jason Volk <jason@zemos.net>
 2024-06-09 20:56:41 +00:00
Jason Volk
f52acd9cdf Fix idiomatic let if 
Signed-off-by: Jason Volk <jason@zemos.net>
 2024-06-09 20:06:50 +00:00
Jason Volk
eae41fc411 Fix use-self 
Signed-off-by: Jason Volk <jason@zemos.net>
 2024-06-09 20:06:50 +00:00
Jason Volk
c3c91e9d80 Fix suboptimal flops 
Signed-off-by: Jason Volk <jason@zemos.net>
 2024-06-09 20:06:50 +00:00
Jason Volk
a8de5d1e60 Fix futures not Send 
Signed-off-by: Jason Volk <jason@zemos.net>
 2024-06-09 20:06:50 +00:00
Jason Volk
7688d67870 Fix needless pass by ref mut 
Signed-off-by: Jason Volk <jason@zemos.net>
 2024-06-09 20:06:50 +00:00