Timo Kösters
25b1cd2683
Merge branch 'stateres' into 'master'
...
fix: state resolution bugs
See merge request famedly/conduit!89
2021-05-27 09:10:53 +00:00
Timo Kösters
daa1fc90a7
fix: state resolution bugs
2021-05-27 10:48:17 +02:00
Timo Kösters
eeb0b59b76
Merge branch 'redaction_quotes' into 'master'
...
Fix redacted_because field being sent as a string
Closes #87
See merge request famedly/conduit!88
2021-05-26 15:58:00 +00:00
Timo Kösters
d1c0eaf628
Merge branch 'master' into 'master'
...
Fix docker-compose trusted_servers env var
See merge request famedly/conduit!87
2021-05-26 07:03:51 +00:00
Timo Kösters
1aec80c57c
Merge branch 'logs' into 'master'
...
fix: logs for ruma crate
See merge request famedly/conduit!86
2021-05-24 16:08:56 +00:00
Timo Kösters
aacf6289db
improvement: increase default max concurrent requests
2021-05-24 18:00:39 +02:00
Timo Kösters
57ecd81534
fix: logs for ruma crate
2021-05-24 13:22:30 +02:00
Timo Kösters
ceaeab6816
Merge branch 'federation-errors' into 'master'
...
feat: forward federation errors to the client
See merge request famedly/conduit!85
2021-05-23 18:27:05 +00:00
Timo Kösters
e5c7119516
feat: forward federation errors to the client
2021-05-23 16:46:46 +02:00
Timo Kösters
1939e62814
fmt
2021-05-23 11:11:20 +02:00
Timo Kösters
1ab209736a
Merge branch 'forbidden' into 'master'
...
fix: Forbidden instead of InvalidParam when joining
See merge request famedly/conduit!84
2021-05-22 19:56:46 +00:00
Timo Kösters
fd69ac621c
fix: run ci with docker
2021-05-22 21:41:08 +02:00
Timo Kösters
c1b2b468b8
fix: bad except in ruma wrapper
2021-05-22 21:33:31 +02:00
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
Timo Kösters
90cd11d850
fix: Forbidden instead of InvalidParam when joining
2021-05-22 18:50:40 +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
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
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
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
Timo Kösters
f9f37cfcf8
Merge branch 'invites' into 'master'
...
feat: send invites over federation
Closes #53
See merge request famedly/conduit!69
2021-04-26 16:53:53 +00:00
Timo Kösters
58463bba93
feat: send invites over federation
2021-04-25 14:10:21 +02:00
Timo Kösters
abe176e3d0
Merge branch 'sending' into 'master'
...
fix: send transaction retry code
See merge request famedly/conduit!68
2021-04-24 21:17:18 +00:00
Timo Kösters
3dfc245633
fix: send transaction retry code
2021-04-24 18:26:41 +02:00
Timo Kösters
dd0b2597b7
Merge branch 'signatures' into 'master'
...
feat: verify signatures for incoming requests
Closes #77
See merge request famedly/conduit!65
2021-04-24 12:55:41 +00:00
Timo Kösters
2fc1ec2ad5
fix: logging
2021-04-24 13:34:35 +02:00
Timo Kösters
226045ea4b
improvement: warning on misconfigured reverse proxy
2021-04-24 12:29:02 +02:00
Timo Kösters
23f81bfaf7
chore: update dependencies
2021-04-24 12:18:19 +02:00
Timo Kösters
bb234ca002
fix: only show one typing event per user
2021-04-24 12:17:45 +02:00
Timo Kösters
6e84d317b2
improvement: update ruma
2021-04-24 12:17:44 +02:00
Timo Kösters
1f84013b2a
feat: verify signatures for incoming requests
2021-04-24 12:17:44 +02:00
Timo Kösters
f89e3668fd
Merge branch 'deploy-proxy' into 'master'
...
Document proper proxy options in DEPLOY.md
See merge request famedly/conduit!67
2021-04-24 08:57:11 +00:00
Timo Kösters
8c72909bb8
Merge branch 'tls-name' into 'master'
...
Validate TLS certificates according to Matrix spec
See merge request famedly/conduit!60
2021-04-23 05:22:07 +00:00
Timo Kösters
14c7ecf722
Merge branch 'improvements' into 'master'
...
Implement /devices
Closes #62
See merge request famedly/conduit!64
2021-04-21 09:03:18 +00:00
Timo Kösters
2f440e644d
fix: clippy
2021-04-21 10:59:07 +02:00
Timo Kösters
71ed1b295a
feat: /devices route
2021-04-21 10:51:56 +02:00
Timo Kösters
e815486030
fix: don't allow inviting other users (not implemented yet)
2021-04-21 10:00:23 +02:00
Timo Kösters
1937cf554f
Merge branch 'add-ci' into 'master'
...
Add basic CI
See merge request famedly/conduit!41
2021-04-20 12:23:28 +00:00
Timo Kösters
9adcc20335
Merge branch 'update-readme' into 'master'
...
docs: update readme
See merge request famedly/conduit!63
2021-04-20 11:21:18 +00:00
Timo Kösters
4c4e1f9027
docs: update readme
2021-04-20 13:07:00 +02:00
Timo Kösters
ad19264c38
Merge branch 'fix-fetch' into 'master'
...
fix: bug when fetching events over federation
See merge request famedly/conduit!62
2021-04-19 10:00:47 +00:00
Timo Kösters
0b9182455c
fix: use working email
2021-04-19 11:57:17 +02:00
Timo Kösters
d4e0ba245b
fix: bug when fetching events over federation
2021-04-19 11:55:27 +02:00
Timo Kösters
0b89ffe566
Merge branch 'make-join' into 'master'
...
feat: make_join, send_join and /directory
See merge request famedly/conduit!59
2021-04-16 21:15:27 +00:00
Timo Kösters
eedac4fd96
feat: make_join, send_join and /directory
2021-04-16 18:18:29 +02:00
Timo Kösters
6d109b9902
Merge branch 'mdformatting' into 'master'
...
docs: Fix markdown formatting in DEPLOY.md
See merge request famedly/conduit!58
2021-04-16 09:24:52 +00:00
Timo Kösters
18398e1f17
Merge branch 'bump-stateres' into 'master'
...
Bump stateres
See merge request famedly/conduit!57
2021-04-14 15:47:00 +00:00
Timo Kösters
04b08d4505
chore: bump stateres
2021-04-14 17:46:17 +02:00
Timo Kösters
f6c4da829e
Merge branch 'better-joining' into 'master'
...
improvement: use invite state as hints to what servers to ask for joining
See merge request famedly/conduit!56
2021-04-14 13:06:14 +00:00
Timo Kösters
bc98425dfe
improvement: use invite state as hints to what servers to ask for joining
2021-04-14 14:46:40 +02:00
Timo Kösters
d6b59cd20c
Merge branch 'develop' into 'master'
...
State resolution overhaul
See merge request famedly/conduit!53
2021-04-14 11:36:53 +00:00
Timo Kösters
001d8dc257
fix: don't do expensive operation on local /send
2021-04-14 12:55:14 +02:00
Timo Kösters
c1953efa6b
chore: code cleanup
2021-04-14 10:43:31 +02:00
Timo Kösters
abddfc2d2a
Merge remote-tracking branch 'famedly/master' into develop
2021-04-14 10:26:28 +02:00
Timo Kösters
5951294638
feat: join cursed rooms
...
this removes several restrictions and tries to continue verifying a pdu
event if some auth events fail (it drops/ignores bad pdus)
2021-04-14 09:39:06 +02:00
Timo Kösters
8b40e0a85f
improvement: fetch signing keys in parallel when joining a room
2021-04-13 22:54:01 +02:00
Timo Kösters
5049d0e01b
improvement: check signatures on join
2021-04-13 18:17:51 +02:00
Timo Kösters
b4f79b77ba
feat: reject invites over federation
2021-04-13 17:41:14 +02:00
Timo Kösters
662a0cf1df
improvement: better and more efficient message count calculation
2021-04-12 12:40:16 +02:00
Timo Kösters
1dc85895a7
fix: show warning for invalid user ids
2021-04-12 10:12:52 +02:00
Timo Kösters
a961732f5f
fix: overflow
2021-04-11 21:35:17 +02:00
Timo Kösters
a8231eef25
fix: alias parsing
2021-04-11 21:29:37 +02:00
Timo Kösters
8773e5013d
feat: incoming invites over federation
2021-04-11 21:04:31 +02:00
Timo Kösters
b427395648
Merge branch 'add-vscode-settings' into 'master'
...
Add settings.json for vscode rust-analyzer
See merge request famedly/conduit!45
2021-04-11 10:56:38 +00:00
Timo Kösters
b4bbbd26bf
Merge branch 'MTRNord/propose-better-systemd-user' into 'master'
...
fix: Do not run conduit as root instead use a separate user
See merge request famedly/conduit!49
2021-04-11 10:52:52 +00:00
Timo Kösters
b0ea692706
fix: malformed pushrule error when event does not trigger any actions
2021-04-11 10:50:30 +02:00
Timo Kösters
588de12d79
fix: lost forward extremity
2021-04-11 10:12:29 +02:00
Timo Kösters
044e65afcc
fix: move back to sled stable
2021-04-11 10:12:05 +02:00
Timo Kösters
84f4ce73e5
fix: membership deserializing
2021-04-09 21:45:22 +02:00
Timo Kösters
51aa6448bc
fix: use sled main to avoid deadlock
2021-04-07 17:58:33 +02:00
Timo Kösters
f3f95a73d0
improvement: /event route
2021-04-07 15:57:23 +02:00
Timo Kösters
d0cdbe2e2b
Merge branch 'up-ruma' into 'develop'
...
Upgrade ruma
See merge request famedly/conduit!48
2021-04-07 13:55:31 +00:00
Timo Kösters
c9b1f0ca83
Merge branch 'k0gen-master-patch-33282' into 'master'
...
No need to log out and back in fix
See merge request famedly/conduit!47
2021-04-03 13:04:55 +00:00
Timo Kösters
db7044a950
sytest test
2021-03-26 13:41:05 +01:00
Timo Kösters
8c6a49bec3
Merge branch 'update_CI_for_develop' into 'develop'
...
Update Complement CI container
See merge request famedly/conduit!46
2021-03-26 12:31:34 +00:00
Timo Kösters
cd4dc13731
fix: use correct room versions
2021-03-26 13:30:17 +01:00
Timo Kösters
c213769d9f
improvement: refactor state res and fix a few bugs in the process
2021-03-25 23:55:40 +01:00
Timo Kösters
16eed1d8c2
chore: get rid of warnings
2021-03-24 12:44:10 +01:00