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

Keep using keyring storage from older versions #108

Merged
merged 11 commits into from
Nov 17, 2023
Merged

Keep using keyring storage from older versions #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f5f0581
Add test for migrating from old keyring (failing)
Powersource Oct 31, 2023
fe7e0d5
Set box2.path in test to use old keystore
Powersource Oct 31, 2023
b2067f2
Add failing assert that tribes throws on finding old unused keystore
Powersource Nov 1, 2023
1670fde
Skip throw-on-finding-old-keystore test for now
Powersource Nov 1, 2023
8bd577c
Match gets with old and new bot
Powersource Nov 1, 2023
aac8cfe
Fix lint
Powersource Nov 1, 2023
9764982
Update box2
Powersource Nov 7, 2023
ab28827
Merge branch 'master' of github.com:ssbc/ssb-tribes into use-old-keyring
Powersource Nov 7, 2023
bf6a4f9
Kill crashed bot in test by running in separate process
Powersource Nov 7, 2023
ad16847
Add timeout in test
Powersource Nov 7, 2023
835a6df
Try bumping timeout
Powersource Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const fs = require('fs')
const set = require('lodash.set')
const { isFeed, isCloakedMsg: isGroup } = require('ssb-ref')
const bfe = require('ssb-bfe')
Expand All @@ -8,6 +9,7 @@ const listen = require('./listen')
const { GetGroupTangle, tanglePrune, groupId: buildGroupId, poBoxKeys } = require('./lib')

const Method = require('./method')
const { join } = require('path')

module.exports = {
name: 'tribes',
Expand Down Expand Up @@ -50,6 +52,11 @@ module.exports = {
function init (ssb, config) {
if (!(config.box2 && config.box2.legacyMode)) throw Error('ssb-tribes error: config.box2.legacyMode needs to be `true`')

// where old versions of ssb-tribes used to store the keyring. now we use ssb-box2 (which uses keyring internally) which defaults to a different location. if we detect that there's something at the old path we need to prompt the user to config ssb-box2 differently
const oldKeyringPathExists = fs.existsSync(join(config.path, 'tribes/keystore'))
const box2PathPointsToOldLocation = (config.box2 && config.box2.path) === 'tribes/keystore'
if (oldKeyringPathExists && !box2PathPointsToOldLocation) throw Error('ssb-tribes found an old keystore at SSB_PATH/tribes/keystore but ssb-box2 is not configured to use it. Please set config.box2.path = "tribes/keystore"')

const state = {
keys: ssb.keys,
feedId: bfe.encode(ssb.id),
Expand Down
Loading