d4c76f4654
chore: update ruma
2021-03-18 19:38:08 +01:00
f775c76d8a
chore: get rid of warnings
2021-03-18 18:33:43 +01:00
7b3fe88345
Send proper Host header in federation requests
2021-03-18 17:59:16 +01:00
5cb15551f3
improvement: use db compression
2021-03-18 13:13:08 +01:00
a0fa0ee7a0
fix: join appservice room with alias
2021-03-18 12:03:44 +01:00
a77fcd106e
feat: implement /state_ids and fix federation stuff
2021-03-18 00:11:13 +01:00
100307c936
improvement: optimize state storage
2021-03-17 22:31:28 +01:00
44425a903a
fix: multiple federation/pusher fixes
2021-03-16 18:00:46 +01:00
21f785d530
Merge branch 'correct-sendtxn' into pushers
2021-03-15 09:56:04 +01:00
6da40225bb
improvement: make state res actually work
2021-03-13 16:30:12 +01:00
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
4027cbd01d
Fix various clippy errors
2021-03-04 15:27:25 +01:00
6309506a48
Allow suspicious_else_formatting
...
This is probably unfixable because it is caused by macros
2021-03-04 15:26:34 +01:00
0d55964d24
Run nightly cargo fmt
2021-03-04 08:45:23 -05:00
d0df8b495c
Merge remote-tracking branch 'upstream/master' into correct-sendtxn
2021-03-04 08:39:16 -05:00
e239014fa3
Query for the correct server
2021-03-04 08:02:41 -05:00
1ce00f90fe
fix: don't accept incoming pdus if we know about them already
2021-03-04 13:37:16 +01:00
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
231c6032f4
Make clippy happy (needless-return, etc.)
2021-03-04 12:35:12 +00:00
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
105f893cf3
chore: bump other dependencies to make it work
2021-03-04 12:29:08 +01:00
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
f4039902d8
Bump Rocket to current HEAD
2021-03-03 22:42:10 +01:00
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
1a198e7336
Merge branch 'jaeger' into 'master'
...
feat: opentelemetry/jaeger support
See merge request famedly/conduit!28
2021-03-02 14:14:26 +00:00
4155a47db1
feat: opentelemetry/jaeger support
2021-03-02 15:08:54 +01:00
f7713fdf2e
fix: sending code got stuck sometimes
2021-03-02 14:58:46 +01:00
278751eb23
improvement: use transaction ids for federation requests
2021-03-02 14:36:48 +01:00
dd68031b69
improvement: implement /receipt
2021-03-02 14:33:35 +01:00
79c9de98cd
Add trusted_servers, filter servers to query keys by trusted_servers
2021-03-01 09:17:53 -05:00
c9f4ff5cf8
Ask multiple servers for keys when not known or sending server failed
2021-03-01 08:23:28 -05:00
f3253f2033
Move comments about Rooms trees to doc comments
2021-02-28 18:53:17 -05:00
0dd8a15c49
Fix leaves not being replaced by correct eventId in membership
...
Update ruma
2021-02-27 16:09:22 -05:00
0cc6448dbe
Temp disable rust_2018_idioms for CI
2021-02-23 17:21:01 -05:00
8f283510aa
Fix unused import clippy warning
2021-02-23 17:21:01 -05:00
48601142f8
Use auth_cache to avoid db, save state for every event when joining
2021-02-23 17:21:01 -05:00
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
591769d5f3
Fiter PDU's before main incoming PDU loop
2021-02-23 17:21:01 -05:00
64374b4679
Use eventId when saving outliers
2021-02-23 17:21:01 -05:00
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
6661de50ab
Fix and integrate outlier tree, build forks after adding event to DB
2021-02-23 17:21:01 -05:00
6fd3e1d1dd
Append state event that pass resolution to DB, update to tokio 1.1
2021-02-23 17:21:01 -05:00
e0453e2348
Cleanup dbg prints and error messages
2021-02-23 17:21:01 -05:00
68f60933e6
Resolved state is set as the current room state on incoming events
2021-02-23 17:21:01 -05:00
05a4c0b325
Finish forward extremity gathering, use resolved state as new snapshot
2021-02-23 17:21:01 -05:00
602edfd849
feature: push rule settings
2021-02-23 17:21:01 -05:00
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
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
835cf80acd
fix: pushers
2021-02-11 13:17:21 +01:00
7309b2fba9
WIP gather and update forward extremities
2021-02-09 15:25:30 -05:00
94da569119
Fixing the incoming events algorithm (review with time)
2021-02-09 15:25:22 -05:00
db0aee3318
Use the auth_events for step 6, WIP forward_extremity_ids fn
2021-02-09 15:25:10 -05:00
4b2eb5ab82
Fix ALL clippy warnings
2021-02-09 15:25:00 -05:00
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
52392628e9
Convert uses of Box<ServerName> to a ref
2021-02-09 15:22:22 -05:00
d108a735a4
State resolution outline for /send
2021-02-09 15:22:12 -05:00
d0b8d0f5fd
Fix signature/hash checks, fetch recursive auth events
2021-02-09 15:22:02 -05:00
168ae8dca0
Fill event_map with all events that will be needed for resolution
2021-02-09 15:21:51 -05:00
8de0d9f9ce
Remove StateStore trait from state-res collect events needed
2021-02-09 15:21:41 -05:00
cdeb1236a2
Fix clippy warnings remove unused imports
2021-02-09 15:21:14 -05:00
63af3d3da0
Step 5 in /send just fetches state from incoming server
2021-02-09 15:20:07 -05:00
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
4a92a29b56
State resolution outline for /send
2021-02-09 15:18:47 -05:00
d49911c5e0
Add 'm.login.token' authentication
2021-02-07 17:38:45 +01:00
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
ea1e4625d1
fix: default config options
2021-02-07 13:20:00 +01:00
6924dfc8ea
improvement: better appservice compatibility and optimizations
2021-02-06 15:28:30 +01:00
fd3fb3a7ed
Merge remote-tracking branch 'famedly/master' into appservices
2021-02-03 12:54:37 +01:00
e4dc7ea8ac
Prevent admin room from recursively spamming itself and user -> user
2021-01-30 11:52:48 -05:00
73124629b7
Add general rules matching for pusher, calc unread msgs
2021-01-29 21:48:35 -05:00
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
a0ecd76e21
Run cargo fmt using nightly
2021-01-29 21:48:09 -05:00
56b816a2be
Fix and integrate outlier tree, build forks after adding event to DB
2021-01-29 21:45:33 -05:00
cd0c5c0566
Append state event that pass resolution to DB, update to tokio 1.1
2021-01-29 11:20:33 -05:00
b8b40ce38b
Cleanup dbg prints and error messages
2021-01-28 15:50:45 -05:00
894b6ef037
Resolved state is set as the current room state on incoming events
2021-01-28 15:33:41 -05:00
265fab843a
feature: push rule settings
2021-01-28 20:47:19 +01:00
35c1904b37
Finish forward extremity gathering, use resolved state as new snapshot
2021-01-24 20:18:40 -05:00
a119d858f3
feature: push rule settings
2021-01-24 16:07:49 +01:00
a897608025
Roll back tokio and rocket update since ruma's request is at 0.2 tokio
2021-01-18 19:59:08 -05:00
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
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
c65bde41e0
WIP gather and update forward extremities
2021-01-18 19:08:59 -05:00
762255fa8d
Simplify device creation logic during login
2021-01-17 08:39:47 -07:00
890187e004
improvement: Handle optional device_id field during login
...
remove debug logging
2021-01-16 22:19:48 -07:00
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
b1ae2bbeb2
Fixing the incoming events algorithm (review with time)
2021-01-16 16:37:20 -05:00
96dc6be14b
Use the auth_events for step 6, WIP forward_extremity_ids fn
2021-01-15 15:46:47 -05:00
5a8041969d
Fix ALL clippy warnings
2021-01-15 11:05:57 -05:00
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
2ac3ffbb24
Convert uses of Box<ServerName> to a ref
2021-01-14 15:11:55 -05:00
7c4e116caa
State resolution outline for /send
2021-01-14 15:07:40 -05:00
27c4e9d9d5
Fix signature/hash checks, fetch recursive auth events
2021-01-14 14:36:24 +01:00
88f3ee489b
Fill event_map with all events that will be needed for resolution
2021-01-14 14:31:47 +01:00
8a035880f0
Remove StateStore trait from state-res collect events needed
2021-01-14 14:30:24 +01:00
7c4d74bf9b
Fix clippy warnings remove unused imports
2021-01-14 14:30:24 +01:00
0ee239c9d7
Step 5 in /send just fetches state from incoming server
2021-01-14 14:30:23 +01:00
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
690c066064
State resolution outline for /send
2021-01-14 14:28:32 +01:00
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
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
b4818716b8
improvement: better deploy guide
2021-01-01 22:21:05 +01:00
85364a9c27
improvement: change federation_enabled to federation_disabled
...
This enables federation by default
2021-01-01 10:52:43 +01:00
edfd3c1f34
improvement: better config, better logs
2020-12-31 21:07:55 +01:00
df16b2ba98
fix: rare state races
2020-12-31 14:52:08 +01:00
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
fb9bd34696
improvement: better warnings when server is unreachable
2020-12-23 15:53:41 +01:00
8dcc1dfe56
improvement: always use port from SRV lookups
...
Also query SRV records when well-known is not found, fixes #29
2020-12-22 20:34:07 +01:00
f12fbca3c5
fix: send state in /sync, element displays wrong membership changes
2020-12-22 20:22:17 +01:00
6606e41dde
feat: improved state store
2020-12-20 13:34:11 +01:00
6e5b35ea92
feat: implement appservices
...
this also reverts some stateres changes
2020-12-08 12:59:20 +01:00
d62f17a91a
improvement: cache actual destination
2020-12-06 11:05:51 +01:00
45086b54b3
improvement: upgrade dependencies, fix timeline reload bug
2020-12-05 21:04:34 +01:00
164b1633d8
Update ruma to latest, renamed server keys and removed PduStub
2020-12-05 17:44:54 +01:00
b869aab5d0
Cleanup removing debug printing and logging, append non state events
2020-12-05 17:37:13 +01:00
c173ce43a5
convert_to_outgoing_federation_event takes CanonicalJsonObj
2020-12-05 17:37:12 +01:00
27e686f9ff
Convert uses of serde_json::Value to CanonicalJsonObject
2020-12-05 17:37:12 +01:00
b6d721374f
Have Media db return optional content_type, conversion fixes
2020-12-05 17:37:11 +01:00
bb24f6ad90
Address some review issues fmt, errors, comments
2020-12-05 17:37:11 +01:00
86bb93f8cf
Remove outdated TODOs, use StateEvent::from_id_value consistently
2020-12-05 17:37:10 +01:00
234b226468
Fix review issues, Remove EventHash's in prev/auth_events in StateEvent
...
The latest state-res crate uses ruma's PduRoomV3 PDU's which don't have
tuples of (EventId, EventHashs) like previous versions did (this was
left from rebasing onto master). The Media DB
now takes an optional content_type like the updated ruma structs.
2020-12-05 17:37:10 +01:00
acd144e934
Fix get_closest_parent and cleanup federation/send/:txn
2020-12-05 17:37:10 +01:00
b13049a6fa
Fix federated join miss hashing the join event created
2020-12-05 17:37:09 +01:00
eca0bbb35a
Fix federated join miss hashing the join event created
2020-12-05 17:37:09 +01:00
dcd1163806
All outgoing pdus in Sending must be PduStubs
2020-12-05 17:37:08 +01:00
c9a6ce54cb
Add basic handling of EDUs for /send/txn
2020-12-05 17:37:08 +01:00
0d69ebdc6c
Reformat imports and fix clippy warnings
2020-12-05 17:37:07 +01:00
db8a0c5d69
Add closest_parent method to Rooms Db insert in order /send pdus
2020-12-05 17:37:07 +01:00
96dd3b2880
Update ruma to latest, fix unstable origin feature in ruma
2020-12-05 17:37:07 +01:00
6e36081573
improvement: more logging
2020-12-05 17:35:00 +01:00
9439f2c183
feat: send logs into admin room
...
Log entries will automatically be deduplicated, so a message won't be
sent if the same line has already been sent in the last 30 mins
2020-12-05 17:34:58 +01:00
e691e880e0
fix: logging thread crash when admin room does not exist
2020-12-02 16:08:59 +01:00
9f8cffcd22
Admin room improvements
2020-11-09 12:21:57 +01:00
16b22bb432
fix: don't allow more than 50 PDUs in a transaction
2020-11-03 21:53:57 +01:00
0762196963
fix: don't send new events from left rooms
2020-10-27 20:26:28 +01:00
2f5df4aac9
improvement: more reliable federation sending
2020-10-27 20:26:27 +01:00
df82314440
improvement: welcome message
2020-10-23 14:38:12 +02:00
6b3934e31d
feat: configurable cache capacity
2020-10-23 14:38:12 +02:00
6dbe195695
improvement: flush after every request that manipulates the db
2020-10-23 14:38:07 +02:00
6bb8284fc0
improvement: correct thumbnailing algorithm
2020-10-19 17:21:28 +02:00
f0a21b6165
fix: use device_id when registering
...
TIL body.device_id != (*body).device_id, which is pretty bad, so I
renamed body.device_id to body.sender_device
2020-10-18 21:51:28 +02:00
243126d393
Allow reading state if history_visibility is world readable
...
See https://matrix.org/docs/spec/client_server/r0.6.1#id87
2020-10-18 16:44:18 +02:00
12b0efac8b
fix: random timeline reloads
2020-10-18 09:03:40 +02:00
9109cb492f
fix: double join over federation
2020-10-17 11:24:57 +02:00
dfcfab5b7e
Merge branch 'master' into deps
2020-10-16 14:06:14 +02:00
9d1387954f
Update dependencies, remove dbgs
2020-10-16 14:04:29 +02:00
b6ed018d16
Merge branch 'master' into reduce-mxc-length
2020-10-14 11:48:25 +02:00
304c53c4f5
style: make clippy happier
2020-10-07 12:29:19 +02:00
6afc4c9b3e
feat: federation disabled by default
...
It can be enable in the Rocket.toml config or using ROCKET_FEDERATION_ENABLED=true
2020-10-07 11:51:56 +02:00
c15ae3c126
fix: invalid typing bytes because of 0xff in numbers
2020-10-07 11:51:56 +02:00
Timo Kösters
Gabriel Souza Franco
Rudi Floren
Devin Ragotzy
Rudi Floren
Devin Ragotzy
Devon Hudson
Leonhard Kuboschek