Update golgi init functions with keystore selector #107

glyph · 2022-05-11T14:45:31Z

glyph commented

2022-05-11 14:45:31 +00:00

This PR introduces the keystore selector which was just added to golgi in PR #39.

The update effects peach-web and peach-lib. I have also updated the dependencies (as represented by the changed lockfile).

CC: @notplants

Update:

This ended up getting a bit complicated. I had to update peach-network because the public API of one of our dependencies changed (wpa-ctrl-rs). Everything is now compiling.

This PR introduces the keystore selector which was just added to golgi in [PR #39](https://git.coopcloud.tech/golgi-ssb/golgi/pulls/39). The update effects `peach-web` and `peach-lib`. I have also updated the dependencies (as represented by the changed lockfile). CC: @notplants ----- Update: This ended up getting a bit complicated. I had to update `peach-network` because the public API of one of our dependencies changed (`wpa-ctrl-rs`). Everything is now compiling.

glyph added the

maintenance

label 2022-05-11 14:45:31 +00:00

glyph added 2 commits 2022-05-11 14:45:31 +00:00

introduce keystore selector for golgi c21e2d090c

update lockfile

continuous-integration/drone/pr Build is failing

Details

827ccbd4dc

glyph requested review from notplants 2022-05-11 14:45:40 +00:00

glyph added 1 commit 2022-05-13 10:35:53 +00:00

merge latest changes from main

continuous-integration/drone/pr Build is failing

Details

98497fa5ae

glyph added 1 commit 2022-05-13 10:45:13 +00:00

fix probes:0.3.0 lockfile error

continuous-integration/drone/pr Build is failing

Details

b0b79fef24

glyph added 4 commits 2022-05-13 11:15:28 +00:00

update wpactrl dependency api usage 3e5e7e0f7c

fix probes dependency version 4cd2692b9a

incorporate keystore change from golgi 039cbcdfc4

merge wpactrl and golgi api updates

continuous-integration/drone/pr Build is passing

Details

dc79833e2b

glyph commented

2022-05-13 11:55:54 +00:00

@notplants

Could you take a peek at this and make sure it all looks good to you? I ended up having to make some small updates to peach-network.

@notplants Could you take a peek at this and make sure it all looks good to you? I ended up having to make some small updates to `peach-network`.

notplants approved these changes 2022-05-16 12:50:49 +00:00

notplants left a comment

nice ~ new golgi code coming in

glyph commented

2022-05-16 13:01:45 +00:00

Regarding your question about hardcoding:

i haven't looked into how kuska-ssb handles the keystore selection, but I wonder if they hard-code the ssb-go folder location

They hardcode the location: https://github.com/Kuska-ssb/ssb/blob/master/src/keystore/patchwork.rs#L13

I think that's nice to have as a convenience but we would still want to allow for a unique path to be supplied. I'd suggest we do that with an additional enum variant:

enum Keystore {
    Patchwork,
    GoSbot,
    Custom(Path)
}

Usage would be something like this:

let path = Path::new("./unique/secret");

let mut sbot_client = Sbot::init(Keystore::Custom(path), None, None).await?;

Then we could still use the read_patchwork_config() function from kuska to parse the file content into an instance of OwnedIdentity.

Regarding your question about hardcoding: > i haven't looked into how kuska-ssb handles the keystore selection, but I wonder if they hard-code the ssb-go folder location They hardcode the location: https://github.com/Kuska-ssb/ssb/blob/master/src/keystore/patchwork.rs#L13 I think that's nice to have as a convenience but we would still want to allow for a unique path to be supplied. I'd suggest we do that with an additional enum variant: ```rust enum Keystore { Patchwork, GoSbot, Custom(Path) } ``` Usage would be something like this: ```rust let path = Path::new("./unique/secret"); let mut sbot_client = Sbot::init(Keystore::Custom(path), None, None).await?; ``` Then we could still use the `read_patchwork_config()` function from kuska to parse the file content into an instance of `OwnedIdentity`.

glyph merged commit bf7f2c8e31 into main

2022-05-16 13:12:01 +00:00

glyph deleted branch keystore_selector

2022-05-16 13:12:01 +00:00

glyph referenced this issue from a commit

2022-05-16 13:12:01 +00:00

Merge pull request 'Update golgi init functions with keystore selector' (#107) from keystore_selector into main

glyph referenced this pull request from golgi-ssb/golgi

2022-05-16 13:13:31 +00:00

Implement custom keystore path selector #40

notplants commented

2022-05-25 10:50:20 +00:00