matt/conduwuit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,412 Commits 21 Branches 11 Tags
63fe9ef5671fdb3ba424454459f752de03be94ea
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
strawberry 63fe9ef567 document nix binary cache in nix/README.md 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry 6fc859e718 update DIFFERENCES.md and document multiple listening ports 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry 598ac3e140 unmark v1 as experimental 
it was reported that even with this, conduit
still cannot join those rooms.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry 0a91a3e6cc remove non-working key 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry 12d2680862 disable incremental builds in CI (just to be safe) 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry a9d232f064 remove a few unused deps (cargo machete) 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry cdc644946d admin cmd to delete MXCs via event_id 
this can be used as a way to deal with the thumbnail
and the media file at the same time without knowing
the thumbnail MXC URL.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry da3297fdcb add !admin as way to call conduit bot 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry 9224e37472 helpful error msg upon failed db version assert 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry 443bb244fc bump ruma fork 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry 50fb202382 admin cmd to delete multiple MXC URLs in bulk 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry 45ad7b40b3 add support for dual HTTP/HTTPS, rm caddy from complement 
complement sends C-S requests over HTTP, and federation
over HTTPS.

complement without caddy *almost* works. unfortunately
i am now dealing with invalid X-Matrix signatures
due to non-percent encoded URIs and it does not
seem trivial to percent-encode URIs that a
reverse proxy would normally do for you.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry 5344cdbbca correct rocksdb flake version override 
this was causing rocksdb to be built with
a version of 8.3.2, but pulling 8.10.0
source code.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry ec2092cb43 add complement CA to conduit.toml dockerfile 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry 07772f2fed document conduit direct TLS support + logging 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberryandCharles Hall 67b307c75b add support for listening on multiple ports 
retains existing config compatibility using either:
`port = 6167`
`port = [80, 443, 8448]`

Co-authored-by: Charles Hall <charles@computer.surgery>
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry 99f7dad939 bump nix (rust crate) and add either 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry 342400fe2d fix tests 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry 43c2ac6c1c update DIFFERENCES.md 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry ca42ec338b replace accidental unwraps with if let's 
this provides not only some future compatibility with MSC4051,
but it just makes sense to not crash/error if we can't get a server_name
from the room ID and should just use the server_name from the sender
user's invite event. there is already code ahead that accounts for
an empty vector so this is safe.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry 81b8f7c380 bump ruma and image-rs 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry 47671606dd bump nix version in gitlab CI 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry 99b8a568d6 add .DS_Store to gitignore (lol) 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry c038da21b4 adjust complement stuff a tad 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry 4d624846ee admin command to delete media via MXC url 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry 27c29e6063 db functions to delete media via MXC 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry cc762c49e2 bump thread_local in cargo.toml 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry 1ecad225be feat: custom text for user displayname suffix upon registration 
replaces the lightning bolt emoji option with support for
your own text or emojis

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry 0972079319 raise default systemd unit start/stop timeout 
default of 90 seconds can be too low if hardware is not very fast
and rocksdb compaction or shutdown takes too long

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry 5a4403fa25 bump cargo.lock due to yanked crate 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry 0593dce8a6 add missing feature to DIFFERENCES.md 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry 03d796e95e support room aliases for room blocking, argument to disable federation 
and makes parsing the room more generic (room ID or room alias)

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry 36bc21193c oops forgot import 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry 3d26210eac more useful database logging (compaction, time taken to load) 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry ce1aae7abc update transitive png dependency 
thanks to cargo audit, 0.17.12 was yanked due
to build breakage.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry 620206be91 update DIFFERENCES.md 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry bdda875416 bump conduwuit version to 0.1.3 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry 9a6a77974b add support for bulk banning room IDs 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry e25d574208 move room moderation stuff to a subcommand 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry c9364dc077 dont evict admins from room, allow admins to join banned rooms 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry ed0c8e86f7 initial implementation of banning room IDs 
takes a full room ID, evicts all our users from that room,
adds room ID to banned room IDs metadata db table, and
forbids any new local users from attempting to join it.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry a92f291bbf feat: query param to return full state event or event content 
query parameter `?format=event|content`

defaults to normal behaviour which is the event's content.

ruma impl: https://github.com/girlbossceo/ruma/commit/788ea6b00fab49b04a17d88caa0c840b7d74aa13

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry b80be6c709 remove unused database function 
i have no idea what this is for

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry a2f7f6fda4 prefix every admin room help cmd with - 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry a0205cd41d implement deprecated user field for login requests 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-20 07:06:57 -05:00
strawberry b1d1f3a643 add my attic binary caches 
conduit and conduwuit are the same

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-15 01:18:30 -05:00
strawberry bef1061a51 that was not a valid option 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-15 01:18:30 -05:00
strawberry adb2059ea2 make ATTIC_TOKEN available in environment 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-15 01:18:30 -05:00
strawberry bb3d5b5d9f add cargo audit as engage task 
just in case trivy is useless

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-15 01:18:30 -05:00
strawberry 359a137d2e add trivy for code and vulnerability scanning 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 20:14:21 -05:00
strawberry 62603f2348 install nix-env engage for gitlab ci 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:31:30 -05:00
strawberry 3a72193c84 move nix config to NIX_CONFIG env variable 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:07:08 -05:00
strawberry 33e7dafc1a fix incorrect comment about db_cache_capacity_mb 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:07:08 -05:00
strawberry 5515d12edd make gitlab CI work for conduwuit 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:07:08 -05:00
strawberry 63bb00d902 error if using known placeholder server_name, log if using debug build 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:07:08 -05:00
strawberry d1f55b59cf fix wrong docker image in compose files 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:07:08 -05:00
strawberry e09b2598ee update attic URL, upload to conduwuit too 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:07:08 -05:00
strawberry 5d7b8cd309 think this is the correct way 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:07:08 -05:00
strawberry 0e7ec9f2dd update rocksdb to 8.10.0 in nix flake 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:07:08 -05:00
strawberry 4bcedf7f4b bump rocksdb (finally) 
queue the CI errors

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:07:08 -05:00
strawberry 5b31cdf1b5 ignore basically all the http dependencies we cant upgrade to 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 09:51:11 -05:00
strawberry 16d384271b CI expects default features of rocksdb? 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 9724fe7d70 go back to outdated rocksdb (the fork breaks CI in a weird way now) 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 4ef6c8a01a does this commit work??? 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 0052d7b669 use rust-rocksdb 8f65a73f0962edc4cc028f4012692043dc657a76 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry dac8b3db49 move these config checks to main.rs 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 0ea8657070 default to Undefined if room avatar URL was not found despite checking if its Some 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry bb1edc3f1a use zaidoon1's fork of rust-rocksdb 
https://github.com/zaidoon1/rust-rocksdb

https://github.com/rust-rocksdb/rust-rocksdb/issues/855#issuecomment-1937412844

shame that this has resulted in yet another fork of software, but oh well...

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 244c1f7190 config option to check root domain with URL previews 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 54ade97f96 add expect message when failing to send oneshot channel shutdown transaction 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 6ee6217f95 update DIFFERENCES.md and debian postinst config 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 48e4b71dd1 remove hardcoded 300kb limit on spider size with config option of 1MB default 
modern websites are sadly massive, 300kb is pretty low. 1MB should be enough.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 2ea895199a dont drop true error with url str parse, fix url contains logic order, clarify config comment 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 7786553cda doc+check if user does not have local presence enabled if using outgoing presence 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry d069379d77 (please) dont drop true error in presence timer creation failures 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 8e6d52e7dd dont follow more than 2 redirects for URL previews for security reasons 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry fb2eba722d fix media tests for URL previews 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 6f26be1c6e eat less /ban endpoint fields, fix ban reason not consistently applied 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 9be73d341c update debian systemd unit to use notify and harden/update it more 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 3ff5bc5298 ask systemd for more time when shutting down if needed, raise axum shutdown timeout to 3 mins 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 0b171a2b9c bump default max_concurrent_requests to 500, update config comment 
also raise 1024 bytes to 4096 bytes in minimum max_request_size check

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry da4b509940 update DIFFERENCES.md 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry b8ab4754a5 slight wording addition 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 7ddf08e8b7 filter out "config" as it's an expected config option 
this seems to exist when using `CONDUIT_CONFIG`
environment variable, this is expected.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 6996d63a02 warn if a catchall config option (unknown config option) exists 
a longer way of saying: warn if a config key is unknown

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry d4d8c6eb21 check if custom room ID is apart of forbidden room alias 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 1f7ac6d112 update valid_until_ts comment 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
strawberry 1157994b49 update docker README with our links 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 21:12:09 -05:00
strawberry 71d5361703 bit of repo cleanup 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 21:12:09 -05:00
strawberry ee90f66450 remove test branch, only publish if not PR 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 19:39:26 -05:00
strawberry 03080c5677 bump ruma 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 19:39:26 -05:00
strawberry 1b780fdbfa i think its docker.io 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 19:39:26 -05:00
strawberry c239ff5e42 make image_name variable work, OCI uses/expects conduit 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 19:39:26 -05:00
strawberry 2dd8d372de username is not secret, use conduwuit and main branch 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 19:39:26 -05:00
strawberry 4be2948afc fix syntax error, add test branch 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 19:39:26 -05:00
strawberry 29d7257a41 attempt to push OCI images to docker hub and ghcr 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 19:39:26 -05:00
strawberry 98b54caca5 remove test branch from CI 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:27:13 -05:00
strawberry ab22dc4bc8 update DIFFERENCES.md 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry 83f7ea54df update gh actions OCI image paths to match gitlab 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry 25d9cc28d6 remove removing rustup and default cargo, remove building aarch64 deb 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00