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
Leonhard Kuboschek
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
Timo Kösters
f12fbca3c5
fix: send state in /sync, element displays wrong membership changes
2020-12-22 20:22:17 +01:00
Timo Kösters
6606e41dde
feat: improved state store
2020-12-20 13:34:11 +01:00
Timo Kösters
6e5b35ea92
feat: implement appservices
...
this also reverts some stateres changes
2020-12-08 12:59:20 +01:00
Timo Kösters
d62f17a91a
improvement: cache actual destination
2020-12-06 11:05:51 +01:00
Timo Kösters
45086b54b3
improvement: upgrade dependencies, fix timeline reload bug
2020-12-05 21:04:34 +01:00
Devin Ragotzy
164b1633d8
Update ruma to latest, renamed server keys and removed PduStub
2020-12-05 17:44:54 +01:00
Devin Ragotzy
b869aab5d0
Cleanup removing debug printing and logging, append non state events
2020-12-05 17:37:13 +01:00
Devin Ragotzy
c173ce43a5
convert_to_outgoing_federation_event takes CanonicalJsonObj
2020-12-05 17:37:12 +01:00
Devin Ragotzy
27e686f9ff
Convert uses of serde_json::Value to CanonicalJsonObject
2020-12-05 17:37:12 +01:00
Devin Ragotzy
b6d721374f
Have Media db return optional content_type, conversion fixes
2020-12-05 17:37:11 +01:00
Devin Ragotzy
bb24f6ad90
Address some review issues fmt, errors, comments
2020-12-05 17:37:11 +01:00
Devin Ragotzy
86bb93f8cf
Remove outdated TODOs, use StateEvent::from_id_value consistently
2020-12-05 17:37:10 +01:00
Devin Ragotzy
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
Devin Ragotzy
acd144e934
Fix get_closest_parent and cleanup federation/send/:txn
2020-12-05 17:37:10 +01:00
Devin Ragotzy
b13049a6fa
Fix federated join miss hashing the join event created
2020-12-05 17:37:09 +01:00
Devin Ragotzy
eca0bbb35a
Fix federated join miss hashing the join event created
2020-12-05 17:37:09 +01:00
Devin Ragotzy
dcd1163806
All outgoing pdus in Sending must be PduStubs
2020-12-05 17:37:08 +01:00
Devin Ragotzy
c9a6ce54cb
Add basic handling of EDUs for /send/txn
2020-12-05 17:37:08 +01:00
Devin Ragotzy
0d69ebdc6c
Reformat imports and fix clippy warnings
2020-12-05 17:37:07 +01:00
Devin Ragotzy
db8a0c5d69
Add closest_parent method to Rooms Db insert in order /send pdus
2020-12-05 17:37:07 +01:00
Devin Ragotzy
96dd3b2880
Update ruma to latest, fix unstable origin feature in ruma
2020-12-05 17:37:07 +01:00
Timo Kösters
6e36081573
improvement: more logging
2020-12-05 17:35:00 +01:00
Timo Kösters
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
Timo Kösters
e691e880e0
fix: logging thread crash when admin room does not exist
2020-12-02 16:08:59 +01:00
Timo Kösters
9f8cffcd22
Admin room improvements
2020-11-09 12:21:57 +01:00
Timo Kösters
16b22bb432
fix: don't allow more than 50 PDUs in a transaction
2020-11-03 21:53:57 +01:00
Timo Kösters
0762196963
fix: don't send new events from left rooms
2020-10-27 20:26:28 +01:00
Timo Kösters
2f5df4aac9
improvement: more reliable federation sending
2020-10-27 20:26:27 +01:00
Timo Kösters
df82314440
improvement: welcome message
2020-10-23 14:38:12 +02:00
Timo Kösters
6b3934e31d
feat: configurable cache capacity
2020-10-23 14:38:12 +02:00
Timo Kösters
6dbe195695
improvement: flush after every request that manipulates the db
2020-10-23 14:38:07 +02:00
Timo Kösters
6bb8284fc0
improvement: correct thumbnailing algorithm
2020-10-19 17:21:28 +02:00
Timo Kösters
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
Timo Kösters
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
Timo Kösters
12b0efac8b
fix: random timeline reloads
2020-10-18 09:03:40 +02:00
Timo Kösters
9109cb492f
fix: double join over federation
2020-10-17 11:24:57 +02:00
Timo Kösters
dfcfab5b7e
Merge branch 'master' into deps
2020-10-16 14:06:14 +02:00
Timo Kösters
9d1387954f
Update dependencies, remove dbgs
2020-10-16 14:04:29 +02:00
Timo Kösters
b6ed018d16
Merge branch 'master' into reduce-mxc-length
2020-10-14 11:48:25 +02:00
Timo Kösters
304c53c4f5
style: make clippy happier
2020-10-07 12:29:19 +02:00
Timo Kösters
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
Timo Kösters
c15ae3c126
fix: invalid typing bytes because of 0xff in numbers
2020-10-07 11:51:56 +02:00
Timo Kösters
bcd1fe1856
feat: admin room
2020-10-07 11:51:49 +02:00
Timo Kösters
0d6159c2da
improvement: get_missing_events route and cleanup
2020-10-01 20:49:15 +02:00
Timo Kösters
ab332363ce
fix: don't send new requests to servers if we are already waiting
2020-10-01 20:49:14 +02:00
miruka
26e200e290
Reduce media ID length from 256 to 32
...
Most common filesystems limit paths to 255 bytes.
This change brings down the media ID length to be similar to
Synapse servers (25), and makes it possible for clients to
download media with the ID included in the filename.
2020-09-25 14:18:36 -04:00
Timo Kösters
e08dfd982b
improvement: look at SRV record when sending requests
2020-09-23 12:04:02 +02:00
Timo Kösters
267c721616
fix: encryption and sync spam
2020-09-18 10:29:44 +02:00
Timo Kösters
8bcfff2766
fix: no notification counts for fast /syncs
2020-09-18 10:29:43 +02:00
Timo Kösters
ea3aaa6b5c
improvement: more efficient /sync with gaps
2020-09-18 10:29:43 +02:00
Timo Kösters
506c2a3146
fix: can't find count from event in db
2020-09-17 10:24:18 +02:00
Timo Kösters
4db6d7e430
fix: remove avatar url checks
...
They are not in the spec and maubot relies on that
2020-09-16 18:10:55 +02:00
Timo Kösters
a567cd81d5
improvement: better logs on deserialization errors
2020-09-16 15:08:51 +02:00
Timo Kösters
f4078a29eb
fix: synapse complains about missing origin
2020-09-16 11:42:33 +02:00
Timo Kösters
dd749b8aee
fix: server keys and destination resolution when server name contains port
2020-09-16 11:01:04 +02:00
Timo Kösters
005e00e9b1
fix: remove well-known
2020-09-15 17:16:55 +02:00
Timo Kösters
1bf614b0f5
fix: remove transaction_id from pdus over federation
2020-09-15 17:02:20 +02:00
Timo Kösters
b7ab57897b
fix: sending slowness
2020-09-15 16:14:59 +02:00
Timo Kösters
0b263208e3
fix: don't panic on bad server names
2020-09-15 08:55:02 +02:00
Timo Kösters
71500b14b9
fix: send to all servers and fix media store
2020-09-15 08:17:15 +02:00
Timo Kösters
f7816b11de
feat: send messages over federation
2020-09-15 08:17:06 +02:00
Timo Kösters
9f05ef926a
fix: filter public room dir
2020-09-14 16:23:15 +02:00
Timo
d1099e9224
Update dependencies
2020-09-14 14:36:49 +02:00
Timo Kösters
aa5e9e607e
feat: download media and thumbnails over federation
2020-09-14 14:20:38 +02:00
Timo Kösters
4e44fedbcd
fix: room list over federation
2020-09-14 11:43:42 +02:00
Timo Kösters
c5313b3e8f
improvement: try out multiple servers when joining remote rooms
2020-09-14 11:00:31 +02:00
Timo Kösters
1f292c09f2
improvement: better federation joins
2020-09-14 09:29:46 +02:00
Timo Kösters
af53485d70
fix: avoid pdus without event ids
2020-09-12 23:38:52 +02:00
Timo Kösters
1f28434988
feat: hacky transactions
2020-09-12 22:42:05 +02:00
Timo Kösters
e6b1f54857
Merge remote-tracking branch 'origin/master' into federation
2020-09-12 22:23:54 +02:00
Timo Kösters
12a8c9badd
fix: join rooms over federation
2020-09-12 21:30:07 +02:00
Timo Kösters
1e8fbd8d50
Update ruma version
2020-09-08 17:32:03 +02:00
Timo Kösters
698e44a732
Fix /upgrade account data problems
2020-09-01 13:08:49 +02:00
Timo Kösters
515465f900
fix: make element not show "unknown user" warning
...
The 404 error for /profile in the spec says "There is no profile
information for this user or this user does not exist.", but Element
assumes every 404 is a user that does not exist.
2020-08-31 13:23:39 +02:00
Faelar
df55e8ed0b
Add room upgrade.
2020-08-31 12:01:41 +02:00
Devin Ragotzy
2a63d0955a
Sort and authenticate the events from /send_join response
2020-08-30 16:08:47 -04:00
Devin Ragotzy
3b40f3d60e
Update state-res crate
2020-08-27 20:11:53 -04:00
Devin Ragotzy
f46c2d1eec
Fix review issues, move state-res to spec-comp branch
2020-08-27 20:11:53 -04:00
Timo Kösters
3f4cb753ee
improvement: add remaining key backup endpoints
2020-08-27 14:52:20 +02:00
Timo
4954df3cc3
feat: handle txn ids
2020-08-25 21:33:44 +02:00
Devin Ragotzy
d9a29e3e5c
Fix state for empty key route
...
Replace None with Some("") for state_key
2020-08-25 15:30:25 -04:00
Timo
33215d6099
fix: send notification count updates when private read receipts change
2020-08-24 10:46:20 +02:00
Devin Ragotzy
27ffe77823
Use helper instead of route for get_public_rooms_filtered
2020-08-23 16:45:01 -04:00
Devin Ragotzy
1848f08292
Use full sorting algorithm on incoming PDU's in membership
2020-08-23 16:43:48 -04:00
Timo
3c26166fb5
improvement: device list works better
...
The only situation that isn't working yet is sending `left` events for
users when the sender leaves the room
2020-08-23 16:43:48 -04:00
Timo
972babbc79
fix: set limited to true when skipping messages in /sync
2020-08-23 16:43:21 -04:00
Devin Ragotzy
672bf4f473
Cargo lock update and a few doc additions
2020-08-23 16:43:21 -04:00
Devin Ragotzy
fe795d38ea
Replace route calling routes with helpers
...
This fixes the panic from ruma "index out of bounds"
2020-08-23 16:43:21 -04:00
Devin Ragotzy
5ccdd3694b
Add helper function for get_alias route
2020-08-23 16:43:21 -04:00
Devin Ragotzy
ea20032404
Helper for join_room_by_id route so routes aren't calling routes
2020-08-23 16:43:21 -04:00
Devin Ragotzy
64fb0374b6
Use Vec<u8> instead of string for digest bytes and add roomid_statehash
2020-08-23 16:43:21 -04:00
Devin Ragotzy
d73c6aa8ad
Add roomid_statehash tree, clean up review issues
2020-08-23 16:43:21 -04:00
Devin Ragotzy
846a0098c1
Split append_pdu -> append_pdu and build_and_append
...
Move all state event appending to append_state_pdu.
2020-08-23 16:43:21 -04:00
Devin Ragotzy
cb68bf9e0c
Use ring crate to generate StatHashes when saving stateid/statehash
2020-08-23 16:43:21 -04:00
Devin Ragotzy
c4f5a0a631
Keep track of State at event for state resolution
...
feat: first steps towards joining rooms over federation
Add state-res as a dependency of conduit
Add reverse_topological_power_sort before append_pdu
Implement statehashstatid_pduid tree for keeping track of state
Clean up implementation of state_hash as key for tracking state
2020-08-23 16:43:21 -04:00
Timo
38663228f5
fix: put reason of redaction in the redacted event
2020-08-23 16:47:27 +02:00
Timo
7ba9263cc6
improvement: show most recent PDUs first when searching
2020-08-23 16:14:11 +02:00
Timo
366554630a
fix: account registration
2020-08-23 16:14:11 +02:00
Timo
804d097a18
fix: wake up /sync for typing events
2020-08-23 16:14:10 +02:00
Timo
c092f06068
docs: /sync
2020-08-23 16:14:10 +02:00
Timo
df936e8e7e
improvement: guests are more spec-conform
2020-08-23 16:14:10 +02:00
Timo
64789537f5
fix: device list when leaving rooms
2020-08-23 16:14:09 +02:00
Timo
4323cf5fec
improvement: device list works better
...
The only situation that isn't working yet is sending `left` events for
users when the sender leaves the room
2020-08-23 16:14:09 +02:00
Timo
f23fb32e95
fix: set limited to true when skipping messages in /sync
2020-08-23 16:14:09 +02:00
timokoesters
e457e19088
feat: search pdus
2020-08-23 16:14:08 +02:00
Timo
27d35f5ab4
docs: fix /register method
2020-08-23 16:14:08 +02:00
Timo
3ff17f69ad
fmt
2020-08-23 16:14:07 +02:00
Timo
4be68eba76
feat: allow querying conduit's room list over federation
2020-08-23 16:14:07 +02:00
Timo
940f533d61
refactor: avoid some allocations when redacting
2020-08-23 16:14:06 +02:00
Timo
04eee089e0
feat: first steps towards joining rooms over federation
2020-08-23 16:14:06 +02:00
timokoesters
f40f1d9f75
docs: endpoint documentation
2020-08-23 16:14:06 +02:00
Jonas Platte
75ea0b3163
Update ruma
2020-08-12 23:42:17 +02:00
Devin Ragotzy
da1c53aaef
Make State struct constructable by lib user
2020-08-03 20:56:14 -04:00
Guillem Nieto
b575593647
Do not ignore db errors
2020-08-02 09:38:20 +02:00
Guillem Nieto
47abe6686e
Send invites only if invited during the sync request
...
Fixes: https://git.koesters.xyz/timo/conduit/issues/175
2020-08-02 09:24:47 +02:00
timokoesters
98f37302a6
feat: handle /publicRooms pagination
2020-07-30 22:51:02 +02:00
timokoesters
0616acbde6
feat: handle inhibit_login in /register
2020-07-30 20:52:37 +02:00
timokoesters
c1c62b7eb4
refactor: put endpoints into modules
2020-07-30 18:34:03 +02:00
Devin Ragotzy
7a70d8488f
Rebase with master and update append_pdu call
2020-07-30 09:22:51 -04:00
Devin Ragotzy
c8d7d80eb2
Fix start/end token swap left from dropped commits
2020-07-30 09:22:51 -04:00
Devin Ragotzy
99220565d4
Fix invite leave auth error by moving update_membership
2020-07-30 09:22:51 -04:00
Devin Ragotzy
25c0e75f29
Cargo fmt
2020-07-30 09:22:51 -04:00
Devin Ragotzy
8aac332b3a
Move ignore invite logic into update_member
2020-07-30 09:22:51 -04:00
Devin Ragotzy
f2fab27d81
Implement filtering invites if sender is ignored by receiver
2020-07-30 09:22:51 -04:00
timokoesters
52b1df6fd2
improvement: handle limit and set limited in /user_directory/search
2020-07-30 15:17:34 +02:00
timokoesters
ce460ea159
fix: send device list updates when user is in no rooms
2020-07-30 14:09:05 +02:00
timokoesters
b67372b11b
refactor: make all mods in database pub
...
Now they can easily export their own structs
2020-07-29 21:48:31 +02:00
Devin Ragotzy
d948f896c0
Turn append_pdu args into struct PduBuilder
2020-07-29 21:47:09 +02:00
Devin Ragotzy
1c6f211933
Create media::FileMeta to represent a file and meta data
2020-07-29 21:33:48 +02:00
Devin Ragotzy
2da48b941d
Convert all map_err -> expect when deserializing to Raw
2020-07-29 21:33:47 +02:00
Devin Ragotzy
62df9ca580
Fix all clippy warnings, shorten line len in client_server
2020-07-29 21:32:35 +02:00
timokoesters
e0d0fb4703
fix: only send device_one_time_keys_count when there are updates
2020-07-29 20:44:06 +02:00
timokoesters
66bc25fcd3
feat: implement /keys/changes
2020-07-29 18:05:16 +02:00
timokoesters
0693387769
improvement: more efficient /sync and only send device updates when sharing a room
2020-07-29 17:03:04 +02:00
timokoesters
d891bbb5dc
improve: presence
2020-07-29 13:05:38 +02:00
timokoesters
05f9d927b8
fix: account data
2020-07-29 13:05:37 +02:00
timokoesters
21eb8d4fe3
fix: problems with pdu serialization
2020-07-29 12:59:40 +02:00
timokoesters
dd3dab39ae
feat: whoami route
2020-07-29 12:59:40 +02:00
timokoesters
489cbc0a93
refactor: use <_> instead of <_parameter_name>
2020-07-29 12:59:36 +02:00
gnieto
cc411c530b
Fix custom account data serialization ( #165 )
...
Stylistic change
Fix custom data serialization
Build a custom event before storing global account data
Co-authored-by: Guillem Nieto <gnieto.talo@gmail.com>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/165
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-07-29 07:48:34 +02:00
Devin Ragotzy
e6a1b0b66f
Add cfg_attr gate to server_server endpoints
2020-07-27 18:54:43 +02:00
Devin Ragotzy
42e0102a2a
Conditionally emit rocket::http_verb attr macros if lib/bin
2020-07-27 18:54:43 +02:00
CapsizeGlimmer
4d4969862a
Implement /rooms/<room_id>/joined_members
2020-07-27 18:21:06 +02:00
CapsizeGlimmer
8fcf8e20b8
fix MR 153 requests; cargo fmt
2020-07-27 17:50:21 +02:00
CapsizeGlimmer
fa2da9e048
Implement max_request_size config option
2020-07-27 17:49:11 +02:00
timokoesters
808a7deae3
cargo fmt
2020-07-26 22:45:10 +02:00
timokoesters
dc5fb7e33a
feat: encryption_disabled config option
...
Can be used with ROCKET_ENCRYPTION_DISABLED=true
2020-07-26 22:41:29 +02:00
gnieto
5a8705bd25
Add room tags ( #140 )
...
Merge branch 'master' into task/add-tags
Add room tagging support
Co-authored-by: Timo Kösters <timo@koesters.xyz>
Co-authored-by: Guillem Nieto <gnieto.talo@gmail.com>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/140
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-07-26 22:33:20 +02:00
timokoesters
b7df8fe83c
fix: stop /messages at `to`
...
Fixes #150
2020-07-26 22:21:05 +02:00
Jonas Platte
09561ccea3
Upgrade ruma
2020-07-26 16:52:43 +02:00
timokoesters
16576d19cd
improvement: only remove to-device events when sure the client received them
...
To make this work, I had to remove the recommended limit of 100
to-device events per /sync
(https://matrix.org/docs/spec/client_server/latest#id72 )
2020-07-26 13:59:19 +02:00
Devin Ragotzy
87fd432527
Refactor account_data to be more similar to other endpoints
2020-07-25 15:48:12 -04:00
Devin Ragotzy
60381ddcf4
Update to latest ruma/master rev
2020-07-25 14:25:24 -04:00
Devin Ragotzy
61458536ab
Merge branch 'master' of https://git.koesters.xyz/timo/conduit into ruma-mono
2020-07-25 13:46:28 -04:00
aura
630196f0a3
Implement get_joined_rooms ( #155 )
...
whitelist /joined_rooms in sytest
Signed-off-by: Aurabindo Pillai <mail@aurabindo.in>
style: fmt
feat: implement /joined_rooms (#78 )
Signed-off-by: Aurabindo Pillai <mail@aurabindo.in>
Co-authored-by: Aurabindo Pillai <mail@aurabindo.in>
Co-authored-by: timokoesters <timo@koesters.xyz>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/155
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-07-25 18:35:22 +02:00
timokoesters
d8e1248df6
improvement: switch to stable rust
2020-07-22 22:42:01 +02:00
Devin R
84d47da392
Simplify deserialization and deconstruction for Responses
2020-07-21 16:26:01 -04:00
Devin R
33bc666859
Use sync ephemeral events in sync Resposne (remove room_id)
...
Bump ruma to latest master which also fixes some server name as String
to now being of type Box<ServerName>.
2020-07-21 14:04:39 -04:00
Devin R
9a993fa7c1
Convert Pdu to a validated ruma type when calling to_*_event
2020-07-18 08:22:30 -04:00
Devin R
75959cdc10
Resolve stying review issues
2020-07-18 08:21:25 -04:00
Devin R
029c60be78
Replace to_string into_boxed_str with into
2020-07-17 19:52:04 -04:00
Devin R
d02685a4fd
Update to latest ruma/ruma commit
...
This will most likely be the API that is released to crates.io so it
should be fairly stable...
2020-07-17 16:04:05 -04:00
Devin R
63e23154f3
Rebase with key backups and cross signing
...
Moved back to a fork of ruma with timo's key-backup and cross-signing
branch. Ephemeral events in sync responses are EphemeralRoomEventStub
(they also have no room_id like all of sync responses events)
2020-07-17 16:04:05 -04:00
Devin R
84dcb885a7
Return correct Errors and replace panic, fix misc review issues
...
Remove EventJson todo comments, clean up Cargo.toml commented ruma deps.
2020-07-17 16:03:36 -04:00
Devin R
24b6702047
Add to_*_event_stub methods to pdu, filter for correct event kind
...
When creating some responses (sync) an AnyRoomEventStub is needed for this
PduEvent will deserialize the JSON as a Stub event and a non stub event
when needed. Ephemeral and account events are checked to be the correct
type and filtered out if not. This requires an extra `deserialize` call
which could/should be removed.
TODO: Possibly get rid of EventJson in some places.
2020-07-17 16:03:33 -04:00
Devin R
7c38e53839
Move to depend on ruma monorepo and ruma-events0.22
2020-07-17 16:03:02 -04:00
Timo Kösters
b9de21949d
Update to rocket master ( #147 )
...
Merge branch 'master' into rocket
Update to rocket master
Co-authored-by: timokoesters <timo@koesters.xyz>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/147
2020-07-14 18:23:26 +02:00
the0
469071e105
feat: implement /event ( #144 )
...
Merge branch 'master' into event-route
Event: Implement /event
Co-authored-by: the0 <theo@localhost>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/144
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-07-11 14:08:37 +02:00
CapsizeGlimmer
76aa44ead3
Add logout/all route to main
2020-07-05 15:35:03 -04:00
CapsizeGlimmer
7c2144c6d7
Implement /logout/all
2020-07-05 15:35:03 -04:00
the0
b81939841b
feat: account deactivation ( #137 )
...
Deactivation: swap unwrap_or(false) to .ok()?
feat: implement deactivate account route
Implement error code on login to deactivated account
Deactivation: Changes requested
Add missing .clone()
Deactivation: Requested changes
Remove unneeded .filter()
Deactivation: badly named signature leads to confusion
Co-authored-by: the0 <theo@localhost>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/137
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-07-05 07:48:19 +02:00
the0
67a1f21f5d
feat: implement password changing ( #138 )
...
Password: Fixes
Password: Implement logging out all devices except current
Password: Implement password changing
Co-authored-by: the0 <theo@localhost>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/138
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-07-02 20:38:25 +02:00
timokoesters
54ad1fbed9
fix: CI
2020-06-26 16:26:29 +02:00
timokoesters
24c544f650
fix: DMs show up as rooms
2020-06-26 15:16:15 +02:00
Guillem Nieto
8f06d0258a
Remove `is_direct` flag from Join event
...
When I was investigating the DM issue, I found that join event contained
the `is_direct` flag. According to the spec, this flag should only be
set on "invite" events, but not on join.
Other homeservers do not have this flag on join.
2020-06-26 15:16:15 +02:00
timokoesters
a49a572d76
feat: cross-signing
2020-06-26 15:16:15 +02:00
timokoesters
7031240af3
improvement: /members route
2020-06-16 23:25:15 +02:00
timokoesters
02fe030b2a
improvement: better default push rules
2020-06-16 23:25:14 +02:00
timokoesters
db685e0cf7
fix: update rocket version
2020-06-16 13:53:15 +02:00
timokoesters
13d474f6ee
fix: update ruma version
2020-06-16 12:19:58 +02:00
PublicByte
fa7612f069
refactor: remove unused imports
2020-06-11 21:06:43 +02:00
timokoesters
56d4742201
improvement: log bad database errors automatically
2020-06-11 14:58:44 +02:00
timokoesters
2368a90584
refactor: better error handling
2020-06-11 13:14:35 +02:00
timokoesters
f2a5d46628
fix
2020-06-08 15:17:58 +02:00
timokoesters
176bd114a0
fix: use correct device in GET /devices
2020-06-08 14:23:42 +02:00
timokoesters
bfe5b89ba4
style: cargo fmt
2020-06-08 11:45:22 +02:00
timokoesters
588049678b
refactor: replace DeviceId with str or String
2020-06-08 11:40:19 +02:00
timokoesters
b4d65ab67d
improvement: optimize /sync response
2020-06-08 11:39:32 +02:00
timokoesters
0067f49d52
feat: close registration with ROCKET_REGISTRATION_DISABLED=true
2020-06-08 11:39:32 +02:00
timokoesters
c85d363d71
feat: user interactive authentication
2020-06-08 11:39:30 +02:00
Timo Kösters
88d091fca1
Merge pull request 'Allow client to load history on newly joined rooms' ( #111 ) from gnieto/conduit:fix/issue-39-history-load into master
...
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-06-07 11:21:53 +02:00
Guillem Nieto
cc383ac932
Cargo fmt
2020-06-06 19:48:01 +02:00
Guillem Nieto
9269f009db
Allow client to load history on newly joined rooms
...
On /sync, check if a room is a new join between `since` parameter and
now. If it's a newly joined room, set the limited flag to true, which will force
the client to load room messages via the `/messages` endpoint.
On `master`, I could not reproduce the messages not showing to others
when joining after being invited.
Fixes #39
2020-06-06 19:29:03 +02:00
timokoesters
8eedc12567
fix: edus will not be removed after timeout
2020-06-06 15:23:37 +02:00
Jonas Platte
7526fd8602
Switch to the ruma meta-crate
2020-06-05 18:42:45 +02:00
timokoesters
d404f902bf
fix: send presence too often
2020-06-04 22:36:48 +02:00
timokoesters
32da76b9a2
feat: heroes, don't send notifications every time
2020-06-04 19:05:11 +02:00
timokoesters
b7f7a39973
feat: kick,ban,unban user route
2020-06-04 16:51:36 +02:00
timokoesters
a8df1acdfd
feat: load replies, forward pagination
2020-06-04 13:58:55 +02:00
timokoesters
168f2281fd
improvement: bundle typing events and only send on changes
...
Fixes #67 and #49
2020-06-04 11:17:36 +02:00
timokoesters
8328eeb5ac
Make sytest not fail
2020-06-04 09:53:26 +02:00
timokoesters
1c85b0fd05
remove tests in favor of sytests
2020-06-04 09:48:33 +02:00
timokoesters
b192fddf2f
fix: show device display names
2020-06-04 09:48:32 +02:00