2344 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Charles Hall	75a8d89cfa	Merge branch 'refactor-main' into 'next' ... return ExitCode instead of using panic or exit See merge request famedly/conduit!639	2024-06-11 07:48:22 +00:00
Matthias Ahouansou	a36ccff06a	Merge branch 'security-readme' into 'next' ... docs: add security disclosure instructions See merge request famedly/conduit!691	2024-06-06 21:21:07 +00:00
Matthias Ahouansou	39b4932725	docs: add security disclosure instructions	2024-06-06 21:48:45 +01:00
Matthias Ahouansou	c45e52f45a	Merge branch 'media-csp' into 'next' ... fix(media): use csp instead of modifying content-type See merge request famedly/conduit!689	2024-06-04 05:31:35 +00:00
Matthias Ahouansou	1dbb3433e0	fix(media): use csp instead of modifying content-type	2024-06-03 21:40:25 +01:00
Matthias Ahouansou	efecb78888	Merge branch 'local-event-non-restricted-room-vers' into 'next' ... fix(membership): fallback to locally signed event if the join wasn't a restricted one on send_join response See merge request famedly/conduit!680	2024-06-03 13:28:41 +00:00
Matthias Ahouansou	f25a0b49eb	Merge branch 'recurse-relationships' into 'next' ... feat: recurse relationships See merge request famedly/conduit!613	2024-06-03 13:19:16 +00:00
Matthias Ahouansou	b46000fadc	feat: recurse relationships	2024-06-03 13:42:52 +01:00
Matthias Ahouansou	7b19618136	Merge branch 'server-user-globals' into 'next' ... refactor: add server_user to globals See merge request famedly/conduit!686	2024-05-31 21:27:26 +00:00
Matthias Ahouansou	19154a9f70	refactor: add server_user to globals	2024-05-31 21:56:11 +01:00
Matthias Ahouansou	ec8dfc283c	fix(membership): fallback to locally signed event if the join wasn't a restricted one on send_join response	2024-05-31 16:37:06 +01:00
Matthias Ahouansou	be1b8b68a7	Merge branch 'remove-alias-command' into 'next' ... feat(admin): remove alias command See merge request famedly/conduit!685	2024-05-29 17:05:45 +00:00
Matthias Ahouansou	6c2eb4c786	feat(admin): remove alias command	2024-05-29 17:49:51 +01:00
Matthias Ahouansou	3df791e030	Merge branch 'ruma-server-util' into 'next' ... refactor: let ruma-server-util handle X-Matrix parsing See merge request famedly/conduit!684	2024-05-29 13:16:08 +00:00
Matthias Ahouansou	9374b74e77	refactor: let ruma-server-util handle X-Matrix parsing	2024-05-29 12:27:37 +01:00
Matthias Ahouansou	c732c7c97f	Merge branch 'toggle_allow_register' into 'next' ... add command to set the allow registration status See merge request famedly/conduit!477	2024-05-29 09:08:59 +00:00
Matthias Ahouansou	33c9da75ec	Merge branch 'clarify-3pids-are-unsupported' into 'next' ... fix: clarify that 3pids are currently unsupported See merge request famedly/conduit!683	2024-05-29 08:52:59 +00:00
Matthias Ahouansou	59d7674b2a	fix: clarify that 3pids are currently unsupported	2024-05-29 09:36:35 +01:00
tony	6bcc2f80b8	add command to set the allow registration status ... Co-Authored-By: Matthias Ahouansou <matthias@ahouansou.cz>	2024-05-29 09:25:08 +01:00
Matthias Ahouansou	817f382c5f	Merge branch 'openid-api' into 'next' ... feat: support OpenID endpoints Closes #453 See merge request famedly/conduit!681	2024-05-28 15:11:03 +00:00
mikoto	a888c7cb16	OpenID routes ... Co-Authored-By: Matthias Ahouansou <matthias@ahouansou.cz>	2024-05-28 15:39:19 +01:00
Timo Kösters	47aadcea1d	Merge branch 'membership-reason-fixes' into 'next' ... fix(membership): always set reason & allow new events if reason changed Closes #452 See merge request famedly/conduit!669	2024-05-26 07:22:29 +00:00
Matthias Ahouansou	9b8ec21e6e	Merge branch 'admin-faq' into 'next' ... docs(faq): add instructions on how to make a user admin See merge request famedly/conduit!677	2024-05-14 20:37:21 +00:00
Matthias Ahouansou	e51f60e437	docs(faq): add instructions on how to make a user admin	2024-05-14 21:20:16 +01:00
Matthias Ahouansou	11990e7524	Merge branch 'admin-hash-sign' into 'next' ... feat(admin): add hash-and-sign-event command See merge request famedly/conduit!670	2024-05-09 16:19:40 +00:00
Matthias Ahouansou	3ad7675bbf	Merge branch 'format-toml' into 'next' ... style: format all toml with taplo See merge request famedly/conduit!673	2024-05-06 20:16:13 +00:00
Matthias Ahouansou	e2d91e26d6	style: format all toml with taplo	2024-05-06 20:57:56 +01:00
Matthias Ahouansou	20d9f3fd5d	Merge branch 'media' into 'next' ... fix: make media response match spec See merge request famedly/conduit!672	2024-05-06 18:37:13 +00:00
Timo Kösters	965b6df83d	fix: make media response match spec	2024-05-06 20:05:51 +02:00
Charles Hall	ecc1bde825	return a concrete error type from try_main ... Also adds a utility for printing out an error message in addition to all of its sources, i.e. errors that came before it that led to the current error. This helps us to provide better error messages to users by including more information: both our own error message and all of the underlying error messages, if any, instead of only one or the other.	2024-05-05 17:44:52 +01:00
Charles Hall	5b35b73b56	reword error message about CONDUIT_CONFIG ... The new message more accurately reflects the purpose and behaviors of the environment variable.	2024-05-05 17:42:25 +01:00
Charles Hall	2131c36eac	return ExitCode instead of using panic or exit ... `panic!()` (and things that invoke it, such as `expect` and `unwrap`) produces terrible looking error messages and `std::process::exit()` doesn't run destructors. Instead, we'll make a `try_main` that can return a `Result` with a structured error type, but for now I'm going to be lazy and just use `Box<dyn Error>`. Then, `main` will call it and return the appropriate `ExitCode` value based on `try_main`'s `Result`. This gives us the opportunity to produce good error messages and doesn't violently terminate the program.	2024-05-05 17:42:25 +01:00
Matthias Ahouansou	8876d54d78	feat(admin): add hash-and-sign-event command	2024-05-05 17:35:02 +01:00
Matthias Ahouansou	d8badaf64b	fix(membership): always set reason & allow new events if reason changed	2024-05-05 15:28:18 +01:00
Matthias Ahouansou	08485ea5e4	Merge branch 'bump-rust-nix' into 'next' ... chore: bump rust & nix See merge request famedly/conduit!668	2024-05-05 12:48:36 +00:00
Matthias Ahouansou	eec9b9ed87	chore: bump nix	2024-05-05 13:28:00 +01:00
Matthias Ahouansou	256dae983b	chore: bump rust ... and fix new lints that come with it	2024-05-05 13:27:56 +01:00
Matthias Ahouansou	79c4bb17ca	Merge branch 'build-and-cache-everything' into 'next' ... Draft: build and cache all packages and CI dependencies See merge request famedly/conduit!667	2024-05-05 11:00:12 +00:00
Matthias Ahouansou	57a24f234d	Revert "ci: temporarily disable CONDUIT_VERSION_EXTRA" ... This reverts commit 2a2b9554c8.	2024-05-05 11:43:06 +01:00
Charles Hall	a4c973e57e	build and cache all packages and CI dependencies ... This fixes the problem where some artifacts were not being cached when they should have been. The secret sauce is the `nix-store` command.	2024-05-05 10:35:31 +01:00
Matthias Ahouansou	f9953c31fc	Revert "ci: use sh instead of bash" ... This reverts commit 70b07dfabf.	2024-05-05 09:43:32 +01:00
Matthias Ahouansou	6b669d2f4d	Merge branch 'only-cache-attic-when-nix' into 'next' ... ci: only cache attic when nix is available See merge request famedly/conduit!666	2024-05-05 08:19:15 +00:00
Matthias Ahouansou	90c9794221	Merge branch 'sh-not-bash' into 'next' ... ci: use sh instead of bash See merge request famedly/conduit!665	2024-05-05 08:12:20 +00:00
Matthias Ahouansou	358164f49d	ci: only cache attic when nix is available	2024-05-05 09:01:40 +01:00
Matthias Ahouansou	70b07dfabf	ci: use sh instead of bash	2024-05-05 08:53:53 +01:00
Matthias Ahouansou	d97f5aa3b8	Merge branch 'ci/fastzip' into 'next' ... ci: faster cache and artifact handling See merge request famedly/conduit!664	2024-05-05 05:54:18 +00:00
Matthias Ahouansou	bed9072a69	Merge branch 'always-cache-attic' into 'next' ... ci: prevent unnecessary rebuilds See merge request famedly/conduit!662	2024-05-05 05:54:16 +00:00
Matthias Ahouansou	2a2b9554c8	ci: temporarily disable CONDUIT_VERSION_EXTRA	2024-05-04 21:50:37 +01:00
Matthias Ahouansou	3d9d975a9f	ci: avoid rebuilding bindgen and friends	2024-05-04 15:17:02 +01:00
Charles Hall	96cc1f6abd	only set CONDUIT_VERSION_EXTRA for final build ... This prevents us from needing to recompile the dependencies when that environment variable changes, which generally changes on every commit, which is far more frequently than the dependencies are actually changed.	2024-05-04 13:09:16 +01:00