char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
671 commits 1 branch 0 tags 2.6 MiB
Commit graph

456 commits

Author SHA1 Message Date
Timo Kösters
44425a903a
fix: multiple federation/pusher fixes 2021-03-16 18:00:46 +01:00
Timo Kösters
21f785d530
Merge branch 'correct-sendtxn' into pushers 2021-03-15 09:56:04 +01:00
Timo Kösters
6da40225bb
improvement: make state res actually work 2021-03-13 16:30:12 +01:00
Timo Kösters
643109309b Merge branch 'incoming-pdu' into 'master' 
fix: don't accept incoming pdus if we know about them already

Closes #70

See merge request famedly/conduit!33
 2021-03-04 14:38:07 +00:00
Rudi Floren
4027cbd01d Fix various clippy errors 2021-03-04 15:27:25 +01:00
Rudi Floren
6309506a48 Allow suspicious_else_formatting 
This is probably unfixable because it is caused by macros
 2021-03-04 15:26:34 +01:00
Devin Ragotzy
0d55964d24 Run nightly cargo fmt 2021-03-04 08:45:23 -05:00
Devin Ragotzy
d0df8b495c Merge remote-tracking branch 'upstream/master' into correct-sendtxn 2021-03-04 08:39:16 -05:00
Devin Ragotzy
e239014fa3 Query for the correct server 2021-03-04 08:02:41 -05:00
Timo Kösters
1ce00f90fe
fix: don't accept incoming pdus if we know about them already 2021-03-04 13:37:16 +01:00
Timo Kösters
bd6507eafb Merge branch 'valkum-master-patch-25423' into 'master' 
Make clippy happy (needless-return, etc.)

See merge request famedly/conduit!23
 2021-03-04 12:35:12 +00:00
Rudi Floren
231c6032f4 Make clippy happy (needless-return, etc.) 2021-03-04 12:35:12 +00:00
Timo Kösters
3e274d7d2c Merge branch 'valkum/conduit-update_rocket' into 'master' 
update dependencies

See merge request famedly/conduit!32
 2021-03-04 12:32:22 +00:00
Timo Kösters
105f893cf3
chore: bump other dependencies to make it work 2021-03-04 12:29:08 +01:00
Timo Kösters
437cb5783a
fix: apply the same appservice sending rules to events coming from federation 
currently this code is duplicated from database/rooms.rs, when we
refactor server_server.rs we should deduplicate it
 2021-03-04 11:34:38 +01:00
Rudi Floren
f4039902d8 Bump Rocket to current HEAD 2021-03-03 22:42:10 +01:00
Timo Kösters
f2ec2be821
fix: don't always query aliases of appservices 
only do so if the alias matches the regex in the registration file
 2021-03-03 21:53:32 +01:00
Timo Kösters
1a198e7336 Merge branch 'jaeger' into 'master' 
feat: opentelemetry/jaeger support

See merge request famedly/conduit!28
 2021-03-02 14:14:26 +00:00
Timo Kösters
4155a47db1
feat: opentelemetry/jaeger support 2021-03-02 15:08:54 +01:00
Timo Kösters
f7713fdf2e
fix: sending code got stuck sometimes 2021-03-02 14:58:46 +01:00
Timo Kösters
278751eb23
improvement: use transaction ids for federation requests 2021-03-02 14:36:48 +01:00
Timo Kösters
dd68031b69
improvement: implement /receipt 2021-03-02 14:33:35 +01:00
Devin Ragotzy
79c9de98cd Add trusted_servers, filter servers to query keys by trusted_servers 2021-03-01 09:17:53 -05:00
Devin Ragotzy
c9f4ff5cf8 Ask multiple servers for keys when not known or sending server failed 2021-03-01 08:23:28 -05:00
Devin Ragotzy
f3253f2033 Move comments about Rooms trees to doc comments 2021-02-28 18:53:17 -05:00
Devin Ragotzy
0dd8a15c49 Fix leaves not being replaced by correct eventId in membership 
Update ruma
 2021-02-27 16:09:22 -05:00
Devin Ragotzy
0cc6448dbe Temp disable rust_2018_idioms for CI 2021-02-23 17:21:01 -05:00
Devin Ragotzy
8f283510aa Fix unused import clippy warning 2021-02-23 17:21:01 -05:00
Devin Ragotzy
48601142f8 Use auth_cache to avoid db, save state for every event when joining 2021-02-23 17:21:01 -05:00
Devin Ragotzy
74d530ae0e Address review issues, fix forward extremity calc 
Keep track of all prev_events since if we know that an event is a
prev_event it is referenced and does not qualify as a forward extremity.
 2021-02-23 17:21:01 -05:00
Devin Ragotzy
591769d5f3 Fiter PDU's before main incoming PDU loop 2021-02-23 17:21:01 -05:00
Devin Ragotzy
64374b4679 Use eventId when saving outliers 2021-02-23 17:21:01 -05:00
Devin Ragotzy
e09be2f7ee Add incoming event to the current room state then resolve 
All state snapshots that are used in the resolve call are state after
snapshots, they have the event inserted.
 2021-02-23 17:21:01 -05:00
Devin Ragotzy
6661de50ab Fix and integrate outlier tree, build forks after adding event to DB 2021-02-23 17:21:01 -05:00
Devin Ragotzy
6fd3e1d1dd Append state event that pass resolution to DB, update to tokio 1.1 2021-02-23 17:21:01 -05:00
Devin Ragotzy
e0453e2348 Cleanup dbg prints and error messages 2021-02-23 17:21:01 -05:00
Devin Ragotzy
68f60933e6 Resolved state is set as the current room state on incoming events 2021-02-23 17:21:01 -05:00
Devin Ragotzy
05a4c0b325 Finish forward extremity gathering, use resolved state as new snapshot 2021-02-23 17:21:01 -05:00
Timo Kösters
602edfd849 feature: push rule settings 2021-02-23 17:21:01 -05:00
Devin Ragotzy
88c60605b4 Add ability to update room leaves with multiple eventIds 
Tokio seems a bit broken with Rocket...
 2021-02-23 17:21:01 -05:00
Devin Ragotzy
66af1ff695 Update ruma and rocket to latest git rev and tokio to 1.0 
Ruma updated the event signing validation code and there was a dep
resolving failure with serde rocket and tokio so I updated rocket latest and
tokio 1.0 to fix.
 2021-02-23 17:20:52 -05:00
Timo Kösters
835cf80acd
fix: pushers 2021-02-11 13:17:21 +01:00
Devin Ragotzy
7309b2fba9 WIP gather and update forward extremities 2021-02-09 15:25:30 -05:00
Devin Ragotzy
94da569119 Fixing the incoming events algorithm (review with time) 2021-02-09 15:25:22 -05:00
Devin Ragotzy
db0aee3318 Use the auth_events for step 6, WIP forward_extremity_ids fn 2021-02-09 15:25:10 -05:00
Devin Ragotzy
4b2eb5ab82 Fix ALL clippy warnings 2021-02-09 15:25:00 -05:00
Devin Ragotzy
4cf530c55b Abstract event validation/fetching, add outlier and signing key DB trees 
Fixed the miss named commented out keys in conduit-example.toml.
 2021-02-09 15:24:09 -05:00
Devin Ragotzy
52392628e9 Convert uses of Box<ServerName> to a ref 2021-02-09 15:22:22 -05:00
Devin Ragotzy
d108a735a4 State resolution outline for /send 2021-02-09 15:22:12 -05:00
Devin Ragotzy
d0b8d0f5fd Fix signature/hash checks, fetch recursive auth events 2021-02-09 15:22:02 -05:00
Devin Ragotzy
168ae8dca0 Fill event_map with all events that will be needed for resolution 2021-02-09 15:21:51 -05:00
Devin Ragotzy
8de0d9f9ce Remove StateStore trait from state-res collect events needed 2021-02-09 15:21:41 -05:00
Devin Ragotzy
cdeb1236a2 Fix clippy warnings remove unused imports 2021-02-09 15:21:14 -05:00
Devin Ragotzy
63af3d3da0 Step 5 in /send just fetches state from incoming server 2021-02-09 15:20:07 -05:00
Devin Ragotzy
4b9976aa74 Update state-res, use the new Event trait 
This also bumps ruma to latest and removes js_int infavor of the ruma
re-export
 2021-02-09 15:19:47 -05:00
Devin Ragotzy
4a92a29b56 State resolution outline for /send 2021-02-09 15:18:47 -05:00
Timo Kösters
d49911c5e0
Add 'm.login.token' authentication 2021-02-07 17:38:45 +01:00
Timo Kösters
3588dcd6d0 Merge branch 'deviceid-login' into 'master' 
Handle optional device_id field during login

See merge request famedly/conduit!16
 2021-02-07 12:28:05 +00:00
Timo Kösters
ea1e4625d1
fix: default config options 2021-02-07 13:20:00 +01:00
Timo Kösters
6924dfc8ea
improvement: better appservice compatibility and optimizations 2021-02-06 15:28:30 +01:00
Timo Kösters
fd3fb3a7ed
Merge remote-tracking branch 'famedly/master' into appservices 2021-02-03 12:54:37 +01:00
Devin Ragotzy
e4dc7ea8ac Prevent admin room from recursively spamming itself and user -> user 2021-01-30 11:52:48 -05:00
Devin Ragotzy
73124629b7 Add general rules matching for pusher, calc unread msgs 2021-01-29 21:48:35 -05:00
Devin Ragotzy
2d69e81699 WIP: send out push notification, impl pusher routes 
It seems in order to test this I may also have to impl the email 3pid
route? I need to call the set_pusher route somehow.
 2021-01-29 21:48:09 -05:00
Devin Ragotzy
a0ecd76e21 Run cargo fmt using nightly 2021-01-29 21:48:09 -05:00
Devin Ragotzy
56b816a2be Fix and integrate outlier tree, build forks after adding event to DB 2021-01-29 21:45:33 -05:00
Devin Ragotzy
cd0c5c0566 Append state event that pass resolution to DB, update to tokio 1.1 2021-01-29 11:20:33 -05:00
Devin Ragotzy
b8b40ce38b Cleanup dbg prints and error messages 2021-01-28 15:50:45 -05:00
Devin Ragotzy
894b6ef037 Resolved state is set as the current room state on incoming events 2021-01-28 15:33:41 -05:00
Timo Kösters
265fab843a
feature: push rule settings 2021-01-28 20:47:19 +01:00
Devin Ragotzy
35c1904b37 Finish forward extremity gathering, use resolved state as new snapshot 2021-01-24 20:18:40 -05:00
Timo Kösters
a119d858f3
feature: push rule settings 2021-01-24 16:07:49 +01:00
Devin Ragotzy
a897608025 Roll back tokio and rocket update since ruma's request is at 0.2 tokio 2021-01-18 19:59:08 -05:00
Devin Ragotzy
3a6f264450 Add ability to update room leaves with multiple eventIds 
Tokio seems a bit broken with Rocket...
 2021-01-18 19:41:38 -05:00
Devin Ragotzy
00436a32b0 Update ruma and rocket to latest git rev and tokio to 1.0 
Ruma updated the event signing validation code and there was a dep
resolving failure with serde rocket and tokio so I updated rocket latest and
tokio 1.0 to fix.
 2021-01-18 19:36:44 -05:00
Devin Ragotzy
c65bde41e0 WIP gather and update forward extremities 2021-01-18 19:08:59 -05:00
Devon Hudson
762255fa8d
Simplify device creation logic during login 2021-01-17 08:39:47 -07:00
Devon Hudson
890187e004
improvement: Handle optional device_id field during login 
remove debug logging
 2021-01-16 22:19:48 -07:00
Devon Hudson
ebb38cd330
improvement: respect logout_devices param on password change 
Move logout devices comment next to relevant loop

remove unnecessary log
 2021-01-16 15:14:50 -07:00
Devin Ragotzy
b1ae2bbeb2 Fixing the incoming events algorithm (review with time) 2021-01-16 16:37:20 -05:00
Devin Ragotzy
96dc6be14b Use the auth_events for step 6, WIP forward_extremity_ids fn 2021-01-15 15:46:47 -05:00
Devin Ragotzy
5a8041969d Fix ALL clippy warnings 2021-01-15 11:05:57 -05:00
Devin Ragotzy
851eb555b6 Abstract event validation/fetching, add outlier and signing key DB trees 
Fixed the miss named commented out keys in conduit-example.toml.
 2021-01-14 21:32:22 -05:00
Devin Ragotzy
2ac3ffbb24 Convert uses of Box<ServerName> to a ref 2021-01-14 15:11:55 -05:00
Devin Ragotzy
7c4e116caa State resolution outline for /send 2021-01-14 15:07:40 -05:00
Devin Ragotzy
27c4e9d9d5
Fix signature/hash checks, fetch recursive auth events 2021-01-14 14:36:24 +01:00
Devin Ragotzy
88f3ee489b
Fill event_map with all events that will be needed for resolution 2021-01-14 14:31:47 +01:00
Devin Ragotzy
8a035880f0
Remove StateStore trait from state-res collect events needed 2021-01-14 14:30:24 +01:00
Devin Ragotzy
7c4d74bf9b
Fix clippy warnings remove unused imports 2021-01-14 14:30:24 +01:00
Devin Ragotzy
0ee239c9d7
Step 5 in /send just fetches state from incoming server 2021-01-14 14:30:23 +01:00
Devin Ragotzy
9e83d2b2d5
Update state-res, use the new Event trait 
This also bumps ruma to latest and removes js_int infavor of the ruma
re-export
 2021-01-14 14:30:19 +01:00
Devin Ragotzy
690c066064
State resolution outline for /send 2021-01-14 14:28:32 +01:00
Timo Kösters
ad7b3f184b
improvement: send 200 response for turn server info 
We didn't implement it, but this will stop clients from retrying the
endpoint every minute
 2021-01-11 17:26:47 +01:00
Timo Kösters
d45d033bf1
fix: send presence updates when going offline 
remaining bug: conduit sends presence updates every 5 minutes even if
the user is already offline
 2021-01-10 17:12:34 +01:00
Timo Kösters
b4818716b8
improvement: better deploy guide 2021-01-01 22:21:05 +01:00
Timo Kösters
85364a9c27
improvement: change federation_enabled to federation_disabled 
This enables federation by default
 2021-01-01 10:52:43 +01:00
Timo Kösters
edfd3c1f34
improvement: better config, better logs 2020-12-31 21:07:55 +01:00
Timo Kösters
df16b2ba98
fix: rare state races 2020-12-31 14:52:08 +01:00
Timo Kösters
2cf6fd57b7
improvement: don't send pdus to appservices if it isn't interested 
TODO: we need to send pdus if a user of the appservice is in the room
but not the appservice user itself
 2020-12-23 19:41:54 +01:00
Timo Kösters
fb9bd34696
improvement: better warnings when server is unreachable 2020-12-23 15:53:41 +01:00