Timo Kösters
7e4dc65747
Merge branch 'master' into 'master'
...
Update Dockerfile and docker-compose
See merge request famedly/conduit!39
2021-05-22 19:26:03 +00:00
Daniel Wiesenberg
634fe04c33
Fix wrong env var name in traefik compose
2021-05-22 20:49:07 +02:00
Timo Kösters
90cd11d850
fix: Forbidden instead of InvalidParam when joining
2021-05-22 18:50:40 +02:00
Daniel Wiesenberg
c6625d83e6
Add CONDUIT_TRUSTED_SERVERS config param
2021-05-22 16:53:48 +02:00
Daniel Wiesenberg
5a7ccbdfab
Add CONDUIT_CONFIG to all relevant docker files
...
And mention that an empty string can be used to configure
Conduit purely with env vars.
2021-05-22 16:53:48 +02:00
Daniel Wiesenberg
beb428d866
Update docker command in README
...
Mention the need for a config.
2021-05-22 16:53:48 +02:00
Daniel Wiesenberg
52a96b3d84
Update Dockerfile and docker-compose
...
- Dockerfile now tracks the gitlab repository and the master branch.
- docker-compose now points to conduit.toml instead of Rocket.toml and
its env vars were also renamed from ROCKET_ to CONDUIT_.
Furthermore vectorim/riot-web was changed to vectorim/element-web
2021-05-22 16:53:48 +02:00
Timo Kösters
42c9ba2e5c
Merge branch 'appservice-docs' into 'master'
...
docs: APPSERVICES setup guide
See merge request famedly/conduit!83
2021-05-22 13:13:54 +00:00
Timo Kösters
47160e9e06
docs: APPSERVICES setup guide
2021-05-22 13:55:28 +02:00
Timo Kösters
488581cc51
Merge branch 'fix-sync' into 'master'
...
fix: too many syncs
See merge request famedly/conduit!82
2021-05-22 09:39:14 +00:00
Timo Kösters
9b77eb7bb7
fix: too many syncs
2021-05-22 11:31:15 +02:00
Timo Kösters
acfd0aef27
Merge branch 'cargo-deb-packaging-update' into 'master'
...
Update cargo-deb packaging for recent changes
See merge request famedly/conduit!61
2021-05-22 09:03:43 +00:00
Timo Kösters
50348de1dd
Merge branch 'improvements' into 'master'
...
improvement: federation get_keys and optimize signingkey storage
See merge request famedly/conduit!81
2021-05-22 08:49:18 +00:00
Timo Kösters
1b42770ab5
improvement: warning for small max_request_size values
2021-05-22 10:34:19 +02:00
Timo Kösters
3e2f742f30
fix: room version warnings and other bugs when joining rooms
2021-05-21 22:22:05 +02:00
Timo Kösters
989d843c40
fix: unauthorized pdus will be responded to with FORBIDDEN
2021-05-21 18:12:02 +02:00
Timo Kösters
09157b2096
improvement: federation get_keys and optimize signingkey storage
...
- get encryption keys over federation
- optimize signing key storage
- rate limit parsing of bad events
- rate limit signature fetching
- dependency bumps
2021-05-21 13:25:24 +02:00
Timo Kösters
ae41bc5067
fix: run state res with old current state again
...
I'm a bit torn on the "auth check based on the current state of the
room". It can mean multiple things:
1. The state of the room before the homeserver looked at the event at
all. But that means if a message event from a user arrives, but we
didn't see their join event before, we soft fail the message (even
though we would find the join event when going through the auth events
of the event and doing state res)
2. The state of the room after doing state-res with the event and our
previous room state. We need to do this state resolution to find the new
room state anyway, so we could just use the new room state for the auth
check. The problem is that if the incoming event is a membership leave
event, the new room state does not allow another leave event. This is
obviously the wrong option.
3. The state of the room after doing state-res with the state **before**
the event and our previous room state. This will mean a lot more
calculations because we have to run state-res again
We used 2. before and now use 1. again
2021-05-17 10:58:44 +02:00
Timo Kösters
8f27e6123b
feat: send read receipts over federation
...
currently they will only be sent if a PDU has to be sent as well
2021-05-17 10:25:27 +02:00
Timo Kösters
24793891e0
feat: implement GET /presence
2021-05-14 11:05:41 +02:00
Timo Kösters
767fe76d3e
Merge branch 'jfowl-master-patch-93743' into 'master'
...
Try to improve CI build times by caching
See merge request famedly/conduit!79
2021-05-13 07:57:11 +00:00
Jonas Fowl
3ea0d2b567
Try to improve CI build times by caching
2021-05-13 07:57:11 +00:00
Timo Kösters
f3e6311680
Merge branch 'clippy_ci' into 'master'
...
Add linting checks to CI
See merge request famedly/conduit!76
2021-05-12 18:44:41 +00:00
Timo Kösters
37b4a1cd0d
Merge branch 'dbg_clippy' into 'master'
...
Add dbg_macro check
See merge request famedly/conduit!75
2021-05-12 18:44:01 +00:00
Timo Kösters
68c5c57486
Merge branch 'improvements' into 'master'
...
improvement: bug fixes and refactors
See merge request famedly/conduit!78
2021-05-12 18:29:26 +00:00
Timo Kösters
f62258ba35
improvement: bug fixes and refactors
...
- power level content override adds to the default event instead of
replacing it
- sending code refactored to make edus possible
- remove presence events when restarting conduit
- remove room_id field from read receipts over /sync
- handle incoming read receipts
- fix array bounds bug in server_server.rs
2021-05-12 20:15:24 +02:00
Timo Kösters
ad5e51dc25
Merge branch 'up-ruma' into 'master'
...
Upgrade Ruma
See merge request famedly/conduit!77
2021-05-08 07:46:26 +00:00
Jonas Platte
af6fea3d4e
Refactor some canonical JSON code
2021-05-08 02:13:01 +02:00
Jonas Platte
a0457000ff
Upgrade Ruma
2021-05-08 01:54:28 +02:00
Jonathan de Jong
80f1844476
fix rustup pls
2021-05-05 17:44:32 +00:00
Jonathan de Jong
9bf99e99a8
fix clippy rustup
2021-05-05 17:26:59 +00:00
Jonathan de Jong
442d0732a4
add rustup
2021-05-05 17:01:48 +00:00
Jonathan de Jong
9d2cc4d8b1
add cargo fmt check
2021-05-05 16:48:44 +00:00
Jonathan de Jong
e48cd9b018
add clippy to CI
2021-05-05 16:41:22 +00:00
Jonathan de Jong
268ad3441c
add dbg_macro check
2021-05-05 16:14:49 +00:00
Timo Kösters
bd16850fd4
Merge branch 'trusted' into 'master'
...
fix: add trusted_servers to config and deploy guide
See merge request famedly/conduit!74
2021-05-05 10:42:55 +00:00
Timo Kösters
3408d74f93
fix: add trusted_servers to config and deploy guide
2021-05-05 12:27:49 +02:00
Timo Kösters
861cc76363
Merge branch 'uiaa' into 'master'
...
improvement: uiaa works like in synapse
See merge request famedly/conduit!73
2021-05-05 10:18:26 +00:00
Timo Kösters
cf94b8e712
improvement: uiaa works like in synapse
2021-05-04 19:05:30 +02:00
Timo Kösters
b42d34858e
Merge branch 'up-ruma' into 'master'
...
Upgrade ruma and clean up request sending code
See merge request famedly/conduit!72
2021-05-02 16:59:31 +00:00
Jonas Platte
e1c4e5c73e
Return only event content in account_data endpoints, not the entire event
2021-04-29 21:28:01 +02:00
Jonas Platte
8bfaf09f37
Clean up reqwest::Response to http::Response conversion
2021-04-29 21:28:00 +02:00
Jonas Platte
c28eba1e5b
Bump ruma
2021-04-29 21:05:29 +02:00
Jonas Platte
08ca573df0
Remove explicit setting of content-type header
...
`try_into_http_request` takes care of this already.
2021-04-29 20:50:59 +02:00
Jonas Platte
61c522dcc0
Fix formatting
2021-04-29 20:50:59 +02:00
Jonas Platte
b76af682a6
Fix clippy warnings
2021-04-29 20:50:59 +02:00
Timo Kösters
27d25914e1
Merge branch 'roomdir' into 'master'
...
improvement: optimize room directory
Closes #36
See merge request famedly/conduit!71
2021-04-28 15:58:54 +00:00
Timo Kösters
3c3062a316
improvement: optimize room directory
2021-04-28 17:56:15 +02:00
Timo Kösters
d35ad69af1
Merge branch 'up-ruma' into 'master'
...
Bump ruma
See merge request famedly/conduit!70
2021-04-28 09:44:04 +00:00
Jonas Platte
2e1d7d12ca
Refactor usage of CanonicalJsonValue
2021-04-26 19:03:51 +02:00
