ekzyis/stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1546 from stackernews/fix-1543

Browse Source 
fix vault key changes not seen by all instances of useVault
This commit is contained in:
Keyan 2024-11-05 19:45:16 -06:00 committed by GitHub
commit 4ad93cd4ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
components/vault/use-vault-configurator.js
View File

@ -1,8 +1,8 @@
import { useMutation, useQuery } from '@apollo/client' import { useMutation, useQuery, makeVar, useReactiveVar } from '@apollo/client'
import { useMe } from '../me' import { useMe } from '../me'
import { useToast } from '../toast' import { useToast } from '../toast'
import useIndexedDB, { getDbName } from '../use-indexeddb' import useIndexedDB, { getDbName } from '../use-indexeddb'
import { useCallback, useEffect, useMemo, useState } from 'react' import { useCallback, useEffect, useMemo } from 'react'
import { E_VAULT_KEY_EXISTS } from '@/lib/error' import { E_VAULT_KEY_EXISTS } from '@/lib/error'
import { CLEAR_VAULT, GET_VAULT_ENTRIES, UPDATE_VAULT_KEY } from '@/fragments/vault' import { CLEAR_VAULT, GET_VAULT_ENTRIES, UPDATE_VAULT_KEY } from '@/fragments/vault'
import { toHex } from '@/lib/hex' import { toHex } from '@/lib/hex'
@ -18,6 +18,11 @@ const useImperativeQuery = (query) => {
return imperativelyCallQuery return imperativelyCallQuery
} }
// reactive variable to store the vault key shared by all vaults
// so all vaults can react to changes in the vault key
// an alternative is to create a vault context which may be more idiomatic(?)
const keyReactiveVar = makeVar(null)
export function useVaultConfigurator ({ onVaultKeySet, beforeDisconnectVault } = {}) { export function useVaultConfigurator ({ onVaultKeySet, beforeDisconnectVault } = {}) {
const { me } = useMe() const { me } = useMe()
const toaster = useToast() const toaster = useToast()
@ -25,50 +30,49 @@ export function useVaultConfigurator ({ onVaultKeySet, beforeDisconnectVault } =
const { set, get, remove } = useIndexedDB(idbConfig) const { set, get, remove } = useIndexedDB(idbConfig)
const [updateVaultKey] = useMutation(UPDATE_VAULT_KEY) const [updateVaultKey] = useMutation(UPDATE_VAULT_KEY)
const getVaultEntries = useImperativeQuery(GET_VAULT_ENTRIES) const getVaultEntries = useImperativeQuery(GET_VAULT_ENTRIES)
const [key, setKey] = useState(null) const key = useReactiveVar(keyReactiveVar)
const [keyHash, setKeyHash] = useState(null)
const disconnectVault = useCallback(async () => {
console.log('disconnecting vault')
beforeDisconnectVault?.()
await remove('key')
keyReactiveVar(null)
}, [remove, keyReactiveVar])
useEffect(() => { useEffect(() => {
if (!me) return if (!me) return
(async () => { (async () => {
try { try {
let localVaultKey = await get('key') const localVaultKey = await get('key')
const localKeyHash = me?.privates?.vaultKeyHash || keyHash if (localVaultKey?.hash && localVaultKey?.hash !== me?.privates?.vaultKeyHash) {
if (localVaultKey?.hash && localVaultKey?.hash !== localKeyHash) { // If the hash stored in the server does not match the hash of the local key,
// If the hash stored in the server does not match the hash of the local key, // we can tell that the key is outdated (reset by another device or other reasons)
// we can tell that the key is outdated (reset by another device or other reasons) // in this case we clear the local key and let the user re-enter the passphrase
// in this case we clear the local key and let the user re-enter the passphrase console.log('vault key hash mismatch, clearing local key', localVaultKey?.hash, '!=', me?.privates?.vaultKeyHash)
console.log('vault key hash mismatch, clearing local key', localVaultKey?.hash, '!=', localKeyHash) await disconnectVault()
localVaultKey = null return
await remove('key')
} }
setKey(localVaultKey) keyReactiveVar(localVaultKey)
} catch (e) { } catch (e) {
console.error('error loading vault configuration', e)
// toaster?.danger('error loading vault configuration ' + e.message) // toaster?.danger('error loading vault configuration ' + e.message)
} }
})() })()
}, [me?.privates?.vaultKeyHash, keyHash, get, remove, setKey]) }, [me?.privates?.vaultKeyHash, get, remove, keyReactiveVar, disconnectVault])
// clear vault: remove everything and reset the key // clear vault: remove everything and reset the key
const [clearVault] = useMutation(CLEAR_VAULT, { const [clearVault] = useMutation(CLEAR_VAULT, {
onCompleted: async () => { onCompleted: async () => {
try { try {
await remove('key') await remove('key')
setKey(null) keyReactiveVar(null)
setKeyHash(null)
} catch (e) { } catch (e) {
toaster.danger('error clearing vault ' + e.message) toaster.danger('error clearing vault ' + e.message)
} }
} }
}) })
const disconnectVault = useCallback(async () => {
beforeDisconnectVault?.()
await remove('key')
setKey(null)
setKeyHash(null)
}, [remove, setKey, setKeyHash])
// initialize the vault and set a vault key // initialize the vault and set a vault key
const setVaultKey = useCallback(async (passphrase) => { const setVaultKey = useCallback(async (passphrase) => {
try { try {
@ -99,14 +103,14 @@ export function useVaultConfigurator ({ onVaultKeySet, beforeDisconnectVault } =
} }
}) })
setKey(vaultKey)
setKeyHash(vaultKey.hash)
await set('key', vaultKey) await set('key', vaultKey)
onVaultKeySet?.(encrypt).catch(console.error) onVaultKeySet?.(encrypt).catch(console.error)
keyReactiveVar(vaultKey)
} catch (e) { } catch (e) {
console.error('error setting vault key', e)
toaster.danger(e.message) toaster.danger(e.message)
} }
}, [getVaultEntries, updateVaultKey, set, get, remove, onVaultKeySet]) }, [getVaultEntries, updateVaultKey, set, get, remove, onVaultKeySet, keyReactiveVar])
return { key, setVaultKey, clearVault, disconnectVault } return { key, setVaultKey, clearVault, disconnectVault }
} }