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

295 commits

Author SHA1 Message Date
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
timokoesters
325e373684
refactor: small changes 2020-06-03 22:30:51 +02:00
timokoesters
19c9e4b916
fix: room version 6 2020-06-03 22:30:50 +02:00
gnieto
0883c44659
Implement devices API (#20) 
small improvements

Cargo fmt

Simplify insert and update methods

Review feedback

Remove has_device method calls

Load all devices with a single db call

Remove device as in logout

Put all metadata on the same tree

Create userdevice key fucntion

Implement devices API

Implement all the devices endpoints. There's a couple of pending tasks:

- Integrate the "logout" logic once it lands to master (this should
  remove the given device from the database).
- Track and store last seen timestamp and IP.

Co-authored-by: timokoesters <timo@koesters.xyz>
Co-authored-by: Guillem Nieto <gnieto.talo@gmail.com>
 2020-06-03 14:09:50 +02:00
gnieto
ed9b544ace Implement devices API (#20) 
small improvements

Cargo fmt

Simplify insert and update methods

Review feedback

Remove has_device method calls

Load all devices with a single db call

Remove device as in logout

Put all metadata on the same tree

Create userdevice key fucntion

Implement devices API

Implement all the devices endpoints. There's a couple of pending tasks:

- Integrate the "logout" logic once it lands to master (this should
  remove the given device from the database).
- Track and store last seen timestamp and IP.

Co-authored-by: timokoesters <timo@koesters.xyz>
Co-authored-by: Guillem Nieto <gnieto.talo@gmail.com>
 2020-06-03 13:41:30 +02:00
Jean-Baptiste Petit
1222289c75 get_state_events_for_key_route return the content of the requested event instead of the all event. 2020-06-03 09:30:34 +02:00
timokoesters
5a47c75427
fix: make redactions permanent 2020-06-01 20:58:49 +02:00
timokoesters
b519bc6962
fix: only show notifications for messages 2020-06-01 20:16:18 +02:00
timokoesters
4e507ef706
feat: room visibility and aliases 2020-05-31 09:46:11 +02:00
timokoesters
9c26e22ad7
improvement: load aliases from database 2020-05-31 08:01:11 +02:00
timokoesters
18bf67748c
feat: redaction 2020-05-31 08:01:10 +02:00
timokoesters
ca77c79222
fix: /register lowercases user ids 
fixes #24
 2020-05-27 07:09:23 +02:00
Guillem Nieto
4b3b562347 Get device_id from body instead of auth data 
Device_id was retrieved from the auth data instead of login's body and
this was causing that a new device was created on every login.

This is (I guess) provoking that some sytests are failing (for example,
"POST /login returns the same device_id as that in the request").
 2020-05-26 21:06:54 +02:00
timokoesters
58683585cc
improvement: show more info in public rooms list 2020-05-25 20:16:36 +02:00
timokoesters
b6c0e9bfb2
feat: access control 2020-05-25 16:40:00 +02:00
timokoesters
c8ba9dce01
feat: proper room creation 2020-05-25 16:39:58 +02:00
josias
b106d1393b Add logout route and database methods (#21) 
Condense keys

Move remove methods to remove_device

Code cleanup

Add method for removing todevice events

Remove unnecessary existence checks

Add logout route and database methods

Co-authored-by: Josias <justjosias@tutanota.com>
 2020-05-24 22:10:09 +02:00
timokoesters
1014388a9c
fix: one time keys are never removed 2020-05-23 19:17:55 +02:00
timokoesters
d95e8b4880
fix: problem with to-device for all devices 2020-05-21 13:52:54 +02:00
timokoesters
43478a5870
fix: send correct membership events when joining / creating rooms 2020-05-20 09:24:44 +02:00
timokoesters
8df2a1a072
improvement: add room topic to public room dir 2020-05-20 00:12:07 +02:00
timokoesters
e0fccffde0
fix: changing avatar url now sends room events 2020-05-19 23:52:02 +02:00
timokoesters
ada260bf42
fix: use png for thumbnails 2020-05-19 23:51:37 +02:00
timokoesters
eb4af85765
fix: riot sometimes freaks out when refreshing 2020-05-19 22:56:28 +02:00
timokoesters
d544d28b6e
feat: image thumbnails 2020-05-19 19:59:52 +02:00
timokoesters
61f4f2c716
improvement: implement GET publicRooms 2020-05-19 16:28:03 +02:00
timokoesters
821c608c6a
feat: media 2020-05-18 22:50:42 +02:00
timokoesters
42ae433b25
fix: send devicekeyupdate users in /sync 2020-05-18 12:46:06 +02:00
timokoesters
f0aed35ecf
improvement: user dir search also searches in displaynames 2020-05-18 10:29:45 +02:00
timokoesters
56dd6cb16f
improvement: get state 2020-05-18 09:22:58 +02:00
timokoesters
6215218c3c
fix: account data json 2020-05-17 22:05:43 +02:00
timokoesters
7fc71b3968
feat: end to end encryption 2020-05-17 19:56:40 +02:00
timokoesters
4fb79ebb4c
chore: update dependencies 2020-05-14 13:56:29 +02:00
timokoesters
d08f91d1c3
fix: only allow valid usernames in /register 2020-05-13 12:25:15 +02:00
Rudi Floren
00a9424719
feat: sytests 2020-05-11 14:44:23 +02:00
timokoesters
8e041f90dd
refactor: make cargo clippy happier 2020-05-11 12:34:48 +02:00
timokoesters
1dbde0e1c1
improvement: add option to get device id from token 2020-05-10 18:30:12 +02:00
timokoesters
ee0d6940bd
feat: presence updates 2020-05-09 21:47:09 +02:00
timokoesters
551308e9a8
Update dependencies and send displayname updates again 2020-05-08 21:13:52 +02:00
timokoesters
8f67c01efd
refactor: split database into multiple files, more error handling, cleaner code 2020-05-03 21:44:48 +02:00
timokoesters
4b191a9311
improvement: set default push rules on register 2020-05-02 09:24:09 +02:00
timo
3cd0f89729 Add /_matrix/client/r0/register/available endpoint 2020-05-01 23:25:32 +02:00
Marcel
4bc7712ee4 [ClientServer] Add /_matrix/client/r0/register/available endpoint 
Took 1 hour 25 minutes
 2020-05-01 23:17:25 +02:00
timokoesters
4ca1ada73e
update ruma 2020-05-01 21:45:55 +02:00
timokoesters
b02c568941
feat: notifications, simple permission systems 2020-05-01 20:28:13 +02:00
timokoesters
169dbe6c37
fix: send full state after joining a room 2020-04-29 12:19:09 +02:00
timokoesters
c769283953
Update readme 2020-04-29 10:27:41 +02:00
timokoesters
fd1aea7e36
Update dependencies 2020-04-29 10:27:41 +02:00
timokoesters
1cdf30f38c
Add hostname to Rocket.toml config 2020-04-29 10:27:40 +02:00
timokoesters
23cb550d00
forget rooms, load history 2020-04-29 10:27:40 +02:00
timokoesters
4cc0a07092
feat: user renaming 2020-04-29 10:27:40 +02:00
timokoesters
720cc0cffc
feat: federated room directory 2020-04-29 10:27:39 +02:00
timokoesters
120b6f4b95
Bump dependencies and fixes 2020-04-29 10:27:39 +02:00
timokoesters
873d191569
fix: http body as content when signing 2020-04-29 10:27:39 +02:00
timokoesters
1af6dd984a
More work on federation 2020-04-29 10:27:38 +02:00
timokoesters
b0d9ccdb2d
Signing, basis for federation 2020-04-29 10:27:38 +02:00
timokoesters
9b79798e56
start work on signing 2020-04-29 10:27:37 +02:00
timokoesters
80ddf80f17
work 2020-04-29 10:27:31 +02:00
TheCycoONE
6d858c39ca Fix typo in password message 2020-04-15 21:17:33 +02:00
gnieto
fa9e127a1e Store hashed passwords (#7) 
Use if let instead of unwrap

Default to invalid password if could not calculate

Move hash password methdo and return Result

Rename get_password method

Default to empty password when no pwd is received

Store hashed passwords

Store passwords hashed with Argon2 and verify password with that stored
hash.

Co-authored-by: Guillem Nieto <gnieto.talo@gmail.com>
 2020-04-14 22:25:44 +02:00
timokoesters
abcce95dd8
feat: invites, better public room dir, user search 2020-04-14 13:59:25 +02:00
timokoesters
3debb6203c
feat: handle typing events 2020-04-12 21:12:50 +02:00
timokoesters
3b9cadeec2
feat: read receipts 2020-04-11 23:57:56 +02:00
timokoesters
ab8c2f1e5e
Rename pduid_pdus to pduid_pdu 2020-04-11 09:35:06 +02:00
timokoesters
fd829bfa0d
move client_server code into own file 2020-04-11 09:30:11 +02:00
timokoesters
040296c711
Add test support and impl dummy /read_markers 2020-04-10 13:36:57 +02:00
timo
3f2bf208a9
Merge pull request 'Add displayname and avatar_url endpoints' (#5) from MTRNord/matrixserver:accountdata into master 2020-04-09 21:26:57 +02:00
Marcel
57264f72e9 Fix avatar_url error message if not starting with mxc:// 
Took 8 minutes
 2020-04-09 21:19:27 +02:00
Marcel
8bcbc983c3 Change and add Comments to the profile endpoints 
Add missing docs

Took 9 minutes
 2020-04-09 21:11:21 +02:00
Marcel
49fe5e3271 Rename userid_avatar_url to userid_avatarurl and fix debug print 
Run cargo fmt

Took 5 minutes
 2020-04-09 21:01:39 +02:00
Marcel
b1284fd509 Replace profile_* with userid_* 
Add a missing dot in the errormessage
Require mxc:// to be present at the start of an avatar_url
Update mxc check TODO
Show displayname or avatar_url if either is available when getting the profile Endpoint
Return the correct data in case of a empty displayname or an empty avatar_url

Took 50 minutes

Took 34 seconds
 2020-04-09 20:53:27 +02:00
timokoesters
cd55220a75
fix: room directory duplicates 2020-04-09 19:39:06 +02:00
Marcel
062c5521f0 Add displayname and avatar_url endpoints 
Add PUT and GET /_matrix/client/r0/profile/{userId}/displayname Endpoint
Add PUT and GET /_matrix/client/r0/profile/{userId}/avatar_url Endpoint
Add GET /_matrix/client/r0/profile/{userId} Endpoint

Took 2 hours 16 minutes
 2020-04-09 18:49:27 +02:00
timokoesters
11e75e7081
make room directory work 2020-04-09 14:39:50 +02:00
timokoesters
5ac45eac59
public rooms dir 2020-04-09 12:22:39 +02:00
timokoesters
9214a62dde
better room creation 2020-04-09 11:00:58 +02:00
Jonas Platte
38ab7c843e
Update error type of /register route 2020-04-08 23:25:19 +02:00
Jonas Platte
c60402bf0d
Update ruma-client-api 2020-04-08 23:13:30 +02:00
timokoesters
8557278b90
better riot.im support 2020-04-08 22:07:31 +02:00
timokoesters
fdeee7fdb5
More dummy endpoints 2020-04-08 22:04:30 +02:00
timokoesters
215a31c513
Add a few dummy endpoints to make riot progress further 2020-04-08 22:04:29 +02:00
timokoesters
ddcd423e6f
feat: random tokens, sessions, guest usernames and device ids 2020-04-08 22:04:29 +02:00
timokoesters
64223b8812
register login flow 2020-04-08 22:04:29 +02:00
timokoesters
e55a63629c
feat: state event support 2020-04-06 14:33:02 +02:00
timokoesters
10bb96fcf7
feat: room joining, room based /sync responses 2020-04-06 13:52:46 +02:00
timokoesters
4d4cff7120
Allow all kinds of messages in /send 2020-04-05 23:06:43 +02:00
timokoesters
884dc2867d
Move to rocket's async branch 2020-04-05 19:54:08 +02:00
timokoesters
8b8381bcc0
New PduEvent struct 2020-04-04 11:53:37 +02:00
timokoesters
f9cfede2a8
fix: deserialize sync event body 2020-04-03 21:17:27 +02:00
timokoesters
fa3226898c
feat: save pdus 
PDUs are saved in a pduid -> pdus map. roomid -> pduleaves keeps track
of the leaves of the event graph and eventid -> pduid maps event ids to
pdus.
 2020-04-03 17:58:38 +02:00
timokoesters
22cca206ba
Todo: ruma signatures 
This commit will get force pushed away later
 2020-03-30 15:38:25 +02:00
timokoesters
dba6c46667
Use sled::Tree::prefix_search for deviceids 2020-03-30 13:46:18 +02:00
timokoesters
b508b4d1e7
Start work on message events 2020-03-30 00:10:44 +02:00
timokoesters
533260edd8
Add auth 2020-03-29 21:05:20 +02:00
Jonas Platte
1183105f15
Make Endpoint bound work for ruma_wrapper::Ruma 2020-03-29 14:29:12 +02:00
timokoesters
73e04e71d7
Start work on event creation 2020-03-29 13:49:13 +02:00
timokoesters
744e0adfcf
Try to impl auth in ruma_wrapper 2020-03-28 23:08:59 +01:00
timokoesters
34a53ce20a
Better database structure 2020-03-28 18:50:02 +01:00
timokoesters
6d27f15516
More logging 2020-03-28 15:16:18 +01:00
timokoesters
1679da7784 RUST_LOG=info by default 2020-03-27 21:00:40 +01:00
timokoesters
c2c18b4651 feat: database 2020-02-20 10:12:13 +01:00
timokoesters
cd777af41c feat: simple endpoint handlers 2020-02-18 22:07:57 +01:00
timokoesters
6264628c11 Initial commit 2020-02-15 22:42:21 +01:00