matt/conduwuit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,358 Commits 21 Branches 11 Tags
b1d1f3a64301ce5c5ad31af13c6f780a503dc2b5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
strawberry 4cebb282ab (prob doesnt work) build aarch64 deb 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry fedbe0dc66 build deb, update deb metadata and files 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry 1581a3ca84 force copy 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry d11b03feab dont compress OCI images, copy result to tar.gz 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry 950d69eb66 build OCI images for x86_64 and aarch64 in CI 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry 468009fce5 fix wrong artifact path in gitlab ci 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry 1f3b91accd remove redundant copy and just use path 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry fb1fa4364d downgrade rust-rocksdb back to latest stable 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry bc421ec96b add -L to nix build command 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry 33847b8b4b fix syntax error (both uses and run) 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry 77e8a6e5ae port some of artifacts building to gh actions (attempt 1) 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry aa3fd6a47e switch cargo.toml pkg name back to conduit 
we already make it clear this is a fork with
our version and such

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-27 16:47:33 -05:00
strawberry 24605e151d make allow_federation default to true 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-27 16:47:33 -05:00
strawberry 81a4f9e539 use main instead of latest for docker tag 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-27 16:47:33 -05:00
strawberry fd19d132eb make nix-build-and-cache executable 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-26 20:39:01 -05:00
strawberry 8793abf41f does this work 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-26 19:47:54 -05:00
strawberry 331b63ca40 upstream nix changes, make rocksdb git work 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-26 19:47:54 -05:00
strawberry 35ebc459fa add explicit_outlives_requirements rustc lint 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-26 19:47:54 -05:00
strawberry 5a8a3c742d s/15000/10000 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-26 19:47:54 -05:00
strawberryandTimo Kösters 4ac568769b improvement: registration token now only works when registration is enabled 
Co-authored-by: Timo Kösters <timo@koesters.xyz>
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry ab0b52ef1e update DIFFERENCES.md 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 8b6bd8e89e add cargo clippy 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 2c51cdc23b update nix flake for gitlab CI building docker images 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 0e8267656f fix room ID messages, remove comments 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 08a183e8c7 assume well-known is None if text length exceeds 10000 chars 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 1536f08d81 use both is_ip_literal and IPAddress is_valid checks 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 9858b33b37 just remove double quotes if found instead 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry e0419d9c5d custom room ID checks, dont use format! macro due to quotes being added 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 7eff572e77 check if room ID already exists instead of erroring on auth check 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 8754f0e2a5 additional character check on room alias 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry e272f0f34f update DIFFERENCES.md 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 89d9cdeb3a IP range denylist logging, and fix logic error 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 382347353e add custom room ID support using room_id field 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 2980af6490 move room creation config check higher up 
dont bother wasting resources if we know we
arent even allowed to make the room to begin with

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry ead9a58dce dont crash failing to deserialise room creation content 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 3453dcc344 add error checking to room aliases 
length, colon, and spaces. also dont crash.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry b51d148899 remove random space 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 6c1358d0c8 send home_server on login response again 
a 6+ year old deprecated field that isnt even spelled
right, and no clients use it must still be sent
according to spec

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 9d1ca3e84a update deps 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 114369bcf6 delete Dockerfile 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry fa0c083555 don't send requests to specified list of IP CIDRs 
this can most definitely be improved but this is a decent attempt.
the only annoying this is i couldn't just use a Vec<IPAddress> which
would have significantly simplified all of this, but serde can't
deserialise it on the config side i guess.

i may find a better way to do this in the future, but this should cover
most areas anyways.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 71d247232d oops forgot that endpoint too 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 6c75087863 eat less of client parameters for media requests 
still cantt respect allow_redirect yet

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry ab6cb4ad2d switch back to expect for sender_user 
as far as i can tell, it will return a normal
error in the auth token handling code so this is fine.
we also shouldnt assume all errors from this are
access_token related.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry 02bc818633 match explicit URI to see if we should authenticate the user 
first attempt at forcing an endpoint to be authenticated

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00