Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

portal: Add rekeying support for oo7::portal::Keyring #77

Merged
merged 4 commits into from
Apr 30, 2024
Merged

portal: Add rekeying support for oo7::portal::Keyring #77

merged 4 commits into from
Apr 30, 2024

Conversation

warusadura
Copy link
Collaborator

@warusadura warusadura commented Mar 24, 2024 •
edited
Loading

This change adds change_secret() to oo7::portal::Keyring API.
change_secret() change/update the secret associated with a keyring.
Note: we need this change for the sever side implementation.

Fixes: #47

@warusadura warusadura force-pushed the rekeying-support branch 2 times, most recently from 8e667bd to 34a5448 Compare March 26, 2024 12:48
A6GibKm
A6GibKm reviewed Mar 26, 2024
View reviewed changes
client/src/portal/mod.rs Outdated Show resolved Hide resolved
bilelmoussaoui
bilelmoussaoui reviewed Mar 29, 2024
View reviewed changes
client/src/key.rs Outdated Show resolved Hide resolved
ueno
ueno reviewed Mar 29, 2024
View reviewed changes
client/src/portal/mod.rs Outdated Show resolved Hide resolved
@warusadura warusadura marked this pull request as ready for review March 31, 2024 15:48
@warusadura warusadura marked this pull request as draft April 15, 2024 09:14
@warusadura warusadura marked this pull request as ready for review April 15, 2024 09:16
@warusadura warusadura marked this pull request as draft April 15, 2024 10:48
@haecker-felix
Copy link
Contributor

Since this also changes the derive_key() function, a note that it is currently blocking despite being async (which was fine in 0.2). Might be related to 86c2a8f.

@haecker-felix haecker-felix mentioned this pull request Apr 16, 2024
Closed
@warusadura warusadura force-pushed the rekeying-support branch 4 times, most recently from 964002c to 04e1afe Compare April 23, 2024 10:39
@warusadura warusadura marked this pull request as ready for review April 23, 2024 10:40
@warusadura warusadura marked this pull request as draft April 23, 2024 10:41
@warusadura warusadura marked this pull request as ready for review April 23, 2024 10:48
bilelmoussaoui
bilelmoussaoui reviewed Apr 24, 2024
View reviewed changes
client/src/portal/mod.rs Outdated Show resolved Hide resolved
client/src/portal/mod.rs Outdated Show resolved Hide resolved
client/src/portal/mod.rs Outdated Show resolved Hide resolved
client/src/portal/mod.rs Outdated Show resolved Hide resolved
client/src/portal/mod.rs Outdated Show resolved Hide resolved
client/src/portal/mod.rs Outdated Show resolved Hide resolved
warusadura added a commit that referenced this pull request Apr 27, 2024
@warusadura
portal: Add reset_salt() and set_modified_time()
77185a0 
Although it is not necessary to update the `salt` value before a
password/secret change through `oo7::portal::Keyring.change_secret()`.
It would be a good practice to do so.

Also, updates the `Keyring.modified_time` in `change_secret()`

See: #77 (comment)

Signed-off-by: Dhanuka Warusadura <dhanuka@gnome.org>
bilelmoussaoui
bilelmoussaoui reviewed Apr 27, 2024
View reviewed changes
client/src/portal/api/mod.rs Outdated Show resolved Hide resolved
client/src/portal/mod.rs Outdated Show resolved Hide resolved
@warusadura
portal: Add rekeying support for oo7::portal::Keyring
e9a7e35 
This change adds `change_secret()` to `oo7::portal::Keyring` API.
`change_secret()` change/update the secret associated with a keyring.
Note: we need this change for the sever side implementation.

Fixes: #47

Signed-off-by: Dhanuka Warusadura <dhanuka@gnome.org>
@warusadura
portal: fix derive_key() blocking issue
81944ce 
This change re-adds the removed `unblock` and `spawn_blocking` parts from
86c2a8f

Fixes: #80

Signed-off-by: Dhanuka Warusadura <dhanuka@gnome.org>
warusadura added a commit that referenced this pull request Apr 29, 2024
@warusadura
portal: Add reset()
96d8f92 
Although it is not necessary to update the `salt` value before a
password/secret change through `oo7::portal::Keyring.change_secret()`.
It would be a good practice to do so.

Also, updates/resets the remaining Keyring content.
`modified_time` field is not update here.

Cleaned up a few whitespaces.

See: #77 (comment)

Signed-off-by: Dhanuka Warusadura <dhanuka@gnome.org>
warusadura added a commit that referenced this pull request Apr 29, 2024
@warusadura
portal: Add reset()
5e0fea3 
Although it is not necessary to update the `salt` value before a
password/secret change through `oo7::portal::Keyring.change_secret()`.
It would be a good practice to do so.

Also, updates/resets the remaining Keyring content.
`modified_time` field is not update here.

Cleaned up a few whitespaces.

See: #77 (comment)

Signed-off-by: Dhanuka Warusadura <dhanuka@gnome.org>
@warusadura
portal: Add reset()
4a97e2f 
Although it is not necessary to update the `salt` value before a
password/secret change through `oo7::portal::Keyring.change_secret()`.
It would be a good practice to do so.

Also, updates/resets the remaining Keyring content.
`modified_time` field is not update here.

See: #77 (comment)

Signed-off-by: Dhanuka Warusadura <dhanuka@gnome.org>
@warusadura
trivial fix: removed whitespaces
3ff6def 
Also added a comment to indicate setting the new key

Signed-off-by: Dhanuka Warusadura <dhanuka@gnome.org>
bilelmoussaoui
bilelmoussaoui approved these changes Apr 29, 2024
View reviewed changes
Copy link
Owner

@bilelmoussaoui bilelmoussaoui left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, but would appreciate a review / an ack from @ueno

ueno
ueno approved these changes Apr 29, 2024
View reviewed changes
Copy link
Collaborator

@ueno ueno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for all the work here!

@bilelmoussaoui bilelmoussaoui merged commit 4f1f5bc into main Apr 30, 2024
5 checks passed
bilelmoussaoui pushed a commit that referenced this pull request Apr 30, 2024
@warusadura @bilelmoussaoui
portal: Add reset()
4adb7ac 
Although it is not necessary to update the `salt` value before a
password/secret change through `oo7::portal::Keyring.change_secret()`.
It would be a good practice to do so.

Also, updates/resets the remaining Keyring content.
`modified_time` field is not update here.

See: #77 (comment)

Signed-off-by: Dhanuka Warusadura <dhanuka@gnome.org>
@bilelmoussaoui bilelmoussaoui deleted the rekeying-support branch April 30, 2024 07:25
bilelmoussaoui pushed a commit that referenced this pull request May 3, 2024
@warusadura @bilelmoussaoui
portal: Add reset()
59edfdf 
Although it is not necessary to update the `salt` value before a
password/secret change through `oo7::portal::Keyring.change_secret()`.
It would be a good practice to do so.

Also, updates/resets the remaining Keyring content.
`modified_time` field is not update here.

See: #77 (comment)

Signed-off-by: Dhanuka Warusadura <dhanuka@gnome.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@A6GibKm A6GibKm A6GibKm left review comments

@bilelmoussaoui bilelmoussaoui bilelmoussaoui approved these changes

@ueno ueno ueno approved these changes

Assignees
No one assigned
Labels
client server
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rekeying support for oo7::portal::Keyring
5 participants
@warusadura @haecker-felix @ueno @bilelmoussaoui @A6GibKm