@oxy.so/core 7.24.0 → 7.25.0

package/src/crypto/keyManager.ts

@@ -30,7 +30,8 @@ import {
 } from '@oxy.so/protocol/secp256k1';
 import { isDev, logger } from '../logger';
 import { deriveScopedSeedFromKey, signSocialReceiveDigest } from './identityDerivations';
-import type { IdentitySignerStore } from './identitySigner';
+import { type IdentitySignerStore, registerIdentitySignerStore } from './identitySigner';
+import { getOrganizationPrivateKey, isOrganizationAccountId } from './organizationKeys';
 import {
   type IdentityMarker,
   clearIdentityMarker,
@@ -457,6 +458,7 @@ export class KeyManager {
    */
   static setIdentitySignerStore(store: IdentitySignerStore | null): void {
     KeyManager.identitySignerStore = store;
+    registerIdentitySignerStore(store);
     KeyManager.invalidateSharedCache();
   }
 
@@ -3237,14 +3239,26 @@ export class KeyManager {
    * Both reproduce from the user's Oxy recovery phrase, so the seed is
    * recoverable, and the IPC answer is byte-identical to the local one.
    *
+   * With `opts.accountId` the seed is derived from that ORGANIZATION's key
+   * instead (ADR 0061 D6), from the same places: Commons' own copy, the iOS
+   * keychain group, or Commons' identity host. It never falls back to the
+   * personal key.
+   *
    * @param info Context/domain-binding label (distinct labels → independent seeds).
+   * @param opts.accountId An organization's account id, for its key.
    * @returns 32 bytes of derived keying material, or `null` on web / when no
    *          identity key is available to this app.
    */
-  static async deriveScopedSeed(info: string): Promise<Uint8Array | null> {
+  static async deriveScopedSeed(
+    info: string,
+    opts?: { accountId?: string },
+  ): Promise<Uint8Array | null> {
     if (isWebPlatform()) {
       return null;
     }
+    if (opts?.accountId !== undefined) {
+      return KeyManager._deriveOrganizationScopedSeed(info, opts.accountId);
+    }
     if (isAndroid()) {
       if (KeyManager.identitySignerStore) {
         // Commons: its own key.
@@ -3263,6 +3277,28 @@ export class KeyManager {
     return deriveScopedSeedFromKey(privateKey, info);
   }
 
+  /**
+   * {@link deriveScopedSeed} over an ORGANIZATION key (ADR 0061 D6): Commons'
+   * own copy inside Commons and on iOS the keychain group, everywhere else on
+   * Android Commons' identity host. Never falls back to the personal key: an
+   * organization this device cannot reach is `null`.
+   */
+  private static async _deriveOrganizationScopedSeed(
+    info: string,
+    accountId: string,
+  ): Promise<Uint8Array | null> {
+    if (!isOrganizationAccountId(accountId)) {
+      return null;
+    }
+    if (isAndroid() && !KeyManager.identitySignerStore) {
+      const bridge = await loadCommonsIdentityBridge();
+      const seed = (await bridge?.deriveScopedSeed(info, accountId)) ?? null;
+      return seed ? hexToBytes(seed) : null;
+    }
+    const privateKey = await getOrganizationPrivateKey(accountId);
+    return privateKey ? deriveScopedSeedFromKey(privateKey, info) : null;
+  }
+
   /**
    * Sign a 32-byte digest (a transaction sighash, lowercase hex) with the
    * identity's social-receive child key `index`: the non-hardened BIP32 child
@@ -3270,8 +3306,9 @@ export class KeyManager {
    * signature is RFC 6979, low-S, DER hex; `publicKey` is the child's
    * compressed public key for the scriptSig.
    *
-   * Key source: as {@link deriveScopedSeed}. On Android outside Commons the
-   * signature comes from Commons, which allows it for the wallet app only.
+   * Key source: as {@link deriveScopedSeed}, including `opts.accountId` for an
+   * organization's key (ADR 0061 D6). On Android outside Commons the signature
+   * comes from Commons, which allows it for the wallet app only.
    *
    * @returns the signature, or `null` on web / when no identity key is
    *          available to this app.
@@ -3279,10 +3316,24 @@ export class KeyManager {
   static async signSocialReceive(
     index: number,
     digest: string,
+    opts?: { accountId?: string },
   ): Promise<CommonsSocialReceiveSignature | null> {
     if (isWebPlatform()) {
       return null;
     }
+    const accountId = opts?.accountId;
+    if (accountId !== undefined) {
+      // An organization key (ADR 0061 D6); never the personal one in its place.
+      if (!isOrganizationAccountId(accountId)) {
+        return null;
+      }
+      if (isAndroid() && !KeyManager.identitySignerStore) {
+        const bridge = await loadCommonsIdentityBridge();
+        return (await bridge?.signSocialReceive(index, digest, accountId)) ?? null;
+      }
+      const organizationKey = await getOrganizationPrivateKey(accountId);
+      return organizationKey ? signSocialReceiveDigest(organizationKey, index, digest) : null;
+    }
     if (isAndroid() && !KeyManager.identitySignerStore) {
       // Every app but Commons: Commons signs.
       const bridge = await loadCommonsIdentityBridge();

package/src/crypto/organizationKeys.ts

@@ -0,0 +1,399 @@
+/**
+ * Organization keys on the device (ADR 0061 D6).
+ *
+ * An organization's identity key is created in Commons by one of its owners or
+ * admins, from a fresh 24-word phrase (`seed[0:32]`, the personal-root
+ * derivation), and is published as the organization's DID `#key-1`. Commons
+ * holds it beside the person's own root, under the organization's account id;
+ * other Oxy apps reach it the way they reach the personal identity, by
+ * derivation and never by the key:
+ *
+ * - iOS: the keychain access group `group.so.oxy.shared`, like the personal
+ *   shared slot. Only Commons writes it.
+ * - Android: Commons' own expo-secure-store slot, mirrored into the identity
+ *   signer store (`./identitySigner`) that Commons' identity host answers
+ *   `accountId` requests from. Every other app asks Commons over IPC
+ *   (`loadCommonsIdentityBridge`), and never gets the key.
+ *
+ * The phrase is kept only in Commons, on the device that created or imported
+ * it, so an owner can show it to another owner (ADR 0061 D5); it never reaches
+ * the keychain group, an IPC answer or a log.
+ *
+ * This module imports nothing from `./keyManager` (which imports it): the
+ * signer store comes from `./identitySigner`'s registry.
+ */
+
+import { generateMnemonic, mnemonicToSeed, validateMnemonic } from '@scure/bip39';
+import { wordlist } from '@scure/bip39/wordlists/english.js';
+import {
+  type ExpoSecureStoreLike,
+  loadCommonsIdentityBridge,
+  loadSecureStore,
+} from '@oxy.so/protocol';
+import {
+  deriveSecp256k1PublicKey,
+  isValidSecp256k1PrivateKey,
+  isValidSecp256k1PublicKey,
+  normalizeSecp256k1PrivateKey,
+  normalizeSecp256k1PublicKey,
+} from '@oxy.so/protocol/secp256k1';
+import { logger } from '../logger';
+import { isAndroid, isIOS, isWeb } from '../utils/platform';
+import { registeredIdentitySignerStore } from './identitySigner';
+
+/** A secp256k1 pair: private key 64 hex, public key lowercase uncompressed (`04…`, 130 hex). */
+export interface OrganizationKeyPair {
+  privateKey: string;
+  publicKey: string;
+}
+
+/** A new organization key and the 24-word phrase it derives from. */
+export interface GeneratedOrganizationKey extends OrganizationKeyPair {
+  mnemonic: string;
+}
+
+/** What {@link storeOrganizationKey} keeps: the pair, and the phrase when the device has it. */
+export interface StoredOrganizationKey extends OrganizationKeyPair {
+  mnemonic?: string;
+}
+
+/** Same set the server's account ids come from: a legacy 24-hex id or a lowercase uuid. */
+const ACCOUNT_ID =
+  /^(?:[0-9a-f]{24}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/;
+
+const IOS_KEYCHAIN_GROUP = 'group.so.oxy.shared';
+/** Android, Commons-local: its own Keystore key, shared with no personal slot. */
+const ANDROID_KEYCHAIN_SERVICE = 'oxy_org_identity';
+const MNEMONIC_KEYCHAIN_SERVICE = 'oxy_org_identity_mnemonic';
+const INDEX_KEYCHAIN_SERVICE = 'oxy_org_identity_index';
+const INDEX_STORAGE_KEY = 'oxy_org_identity_index_v1';
+const ORGANIZATION_PHRASE_WORDS = 24;
+
+interface SecureStoreOptions {
+  keychainService?: string;
+  keychainAccessible?: number;
+  keychainAccessGroup?: string;
+}
+
+/** Whether `value` is an account id an organization key can be stored under. */
+export function isOrganizationAccountId(value: string): boolean {
+  return ACCOUNT_ID.test(value);
+}
+
+function assertAccountId(accountId: string): void {
+  if (!isOrganizationAccountId(accountId)) {
+    throw new Error('organization key: accountId must be a 24-hex or uuid account id');
+  }
+}
+
+const privateKeyName = (accountId: string) => `oxy_org_identity_private_key.${accountId}`;
+const publicKeyName = (accountId: string) => `oxy_org_identity_public_key.${accountId}`;
+const mnemonicName = (accountId: string) => `oxy_org_identity_mnemonic.${accountId}`;
+
+function toHex(bytes: Uint8Array): string {
+  return Array.from(bytes, (b) => b.toString(16).padStart(2, '0')).join('');
+}
+
+/** Lowercase uncompressed public key of `privateKey`. */
+function publicKeyOf(privateKey: string): string {
+  return deriveSecp256k1PublicKey(normalizeSecp256k1PrivateKey(privateKey));
+}
+
+/** True only when both halves are well-formed AND the public key derives from the private one. */
+export function isHealthyOrganizationKeyPair(
+  privateKey: string | null | undefined,
+  publicKey: string | null | undefined,
+): boolean {
+  if (!privateKey || !publicKey) return false;
+  if (!isValidSecp256k1PrivateKey(privateKey) || !isValidSecp256k1PublicKey(publicKey)) {
+    return false;
+  }
+  try {
+    return publicKeyOf(privateKey) === normalizeSecp256k1PublicKey(publicKey);
+  } catch {
+    return false;
+  }
+}
+
+function normalizePhrase(phrase: string): string {
+  return phrase.trim().toLowerCase().split(/\s+/).join(' ');
+}
+
+async function pairFromPhrase(phrase: string): Promise<OrganizationKeyPair> {
+  const normalized = normalizePhrase(phrase);
+  if (
+    normalized.split(' ').length !== ORGANIZATION_PHRASE_WORDS ||
+    !validateMnemonic(normalized, wordlist)
+  ) {
+    throw new Error('organization key: not a valid 24-word recovery phrase');
+  }
+  const seed = await mnemonicToSeed(normalized);
+  const privateKey = toHex(seed.subarray(0, 32));
+  return { privateKey, publicKey: publicKeyOf(privateKey) };
+}
+
+/**
+ * A fresh organization key: a 24-word phrase and the pair derived from it
+ * exactly as a personal root is (`seed[0:32]`). Stores NOTHING: the caller shows
+ * the phrase, links the key (`oxy.accounts.identityKey`), and only then calls
+ * {@link storeOrganizationKey}.
+ */
+export async function generateOrganizationKey(): Promise<GeneratedOrganizationKey> {
+  const mnemonic = generateMnemonic(wordlist, 256);
+  return { mnemonic, ...(await pairFromPhrase(mnemonic)) };
+}
+
+/**
+ * The pair a 24-word organization phrase derives. Stores nothing; the caller
+ * checks the public key against the organization's DID `#key-1` before keeping
+ * it (ADR 0061 D5).
+ */
+export async function organizationKeyFromPhrase(phrase: string): Promise<OrganizationKeyPair> {
+  return pairFromPhrase(phrase);
+}
+
+async function secureStore(): Promise<ExpoSecureStoreLike> {
+  return loadSecureStore();
+}
+
+async function readIndex(store: ExpoSecureStoreLike): Promise<string[]> {
+  const raw = await store.getItemAsync(INDEX_STORAGE_KEY, {
+    keychainService: INDEX_KEYCHAIN_SERVICE,
+  } satisfies SecureStoreOptions);
+  if (!raw) return [];
+  try {
+    const parsed: unknown = JSON.parse(raw);
+    return Array.isArray(parsed)
+      ? parsed.filter((id): id is string => typeof id === 'string' && isOrganizationAccountId(id))
+      : [];
+  } catch (error) {
+    logger.warn('Organization key index unreadable; treating as empty', {
+      component: 'OrganizationKeys',
+      error: error instanceof Error ? error.name : 'unknown',
+    });
+    return [];
+  }
+}
+
+async function writeIndex(store: ExpoSecureStoreLike, ids: string[]): Promise<void> {
+  await store.setItemAsync(INDEX_STORAGE_KEY, JSON.stringify([...new Set(ids)].sort()), {
+    keychainService: INDEX_KEYCHAIN_SERVICE,
+  } satisfies SecureStoreOptions);
+}
+
+/** Where this platform keeps the pair: the iOS keychain group, or Commons' own Android slot. */
+function pairOptions(store: ExpoSecureStoreLike, forPrivateWrite: boolean): SecureStoreOptions {
+  if (isIOS()) {
+    return forPrivateWrite
+      ? {
+          keychainAccessible: store.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
+          keychainAccessGroup: IOS_KEYCHAIN_GROUP,
+        }
+      : { keychainAccessGroup: IOS_KEYCHAIN_GROUP };
+  }
+  return forPrivateWrite
+    ? {
+        keychainAccessible: store.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
+        keychainService: ANDROID_KEYCHAIN_SERVICE,
+      }
+    : { keychainService: ANDROID_KEYCHAIN_SERVICE };
+}
+
+/** The pair from this app's own storage (iOS group; Android Commons slot, then signer store). */
+async function readLocalPair(accountId: string): Promise<OrganizationKeyPair | null> {
+  if (isWeb()) return null;
+  if (isAndroid()) {
+    const signer = registeredIdentitySignerStore();
+    if (!signer) return null; // Only Commons holds organization keys on Android.
+    const store = await secureStore();
+    const options = pairOptions(store, false);
+    const privateKey = await store.getItemAsync(privateKeyName(accountId), options);
+    const publicKey = await store.getItemAsync(publicKeyName(accountId), options);
+    if (privateKey && publicKey && isHealthyOrganizationKeyPair(privateKey, publicKey)) {
+      return {
+        privateKey: normalizeSecp256k1PrivateKey(privateKey),
+        publicKey: normalizeSecp256k1PublicKey(publicKey),
+      };
+    }
+    // The signer store is a rung: a wiped expo-secure-store slot still has it.
+    const mirrored = (await signer.readOrganization?.(accountId)) ?? null;
+    return mirrored && isHealthyOrganizationKeyPair(mirrored.privateKey, mirrored.publicKey)
+      ? mirrored
+      : null;
+  }
+  if (!isIOS()) return null;
+  const store = await secureStore();
+  const options = pairOptions(store, false);
+  const privateKey = await store.getItemAsync(privateKeyName(accountId), options);
+  const publicKey = await store.getItemAsync(publicKeyName(accountId), options);
+  return privateKey && publicKey && isHealthyOrganizationKeyPair(privateKey, publicKey)
+    ? {
+        privateKey: normalizeSecp256k1PrivateKey(privateKey),
+        publicKey: normalizeSecp256k1PublicKey(publicKey),
+      }
+    : null;
+}
+
+/**
+ * Keep an organization key on this device. Commons only: on Android it needs
+ * the identity signer store Commons registers, so the identity host can serve
+ * it; on iOS only Commons calls it (the keychain group is shared).
+ *
+ * Refuses a pair whose public key does not derive from its private key, and a
+ * phrase that does not derive the pair. Overwrites whatever this device held for
+ * the organization (a replaced key is the caller's decision, ADR 0061 D7).
+ */
+export async function storeOrganizationKey(
+  accountId: string,
+  key: StoredOrganizationKey,
+): Promise<void> {
+  assertAccountId(accountId);
+  if (isWeb()) throw new Error('organization key: only a native device holds one');
+  if (!isHealthyOrganizationKeyPair(key.privateKey, key.publicKey)) {
+    throw new Error('organization key: the public key does not derive from the private key');
+  }
+  const privateKey = normalizeSecp256k1PrivateKey(key.privateKey);
+  const publicKey = normalizeSecp256k1PublicKey(key.publicKey);
+  if (key.mnemonic !== undefined) {
+    const fromPhrase = await pairFromPhrase(key.mnemonic);
+    if (fromPhrase.publicKey !== publicKey) {
+      throw new Error('organization key: the phrase derives a different key');
+    }
+  }
+
+  const signer = isAndroid() ? registeredIdentitySignerStore() : null;
+  if (isAndroid() && !signer?.writeOrganization) {
+    throw new Error(
+      'On Android only Commons holds organization keys; this app has no identity signer store for them.',
+    );
+  }
+  const store = await secureStore();
+  await store.setItemAsync(privateKeyName(accountId), privateKey, pairOptions(store, true));
+  await store.setItemAsync(publicKeyName(accountId), publicKey, pairOptions(store, false));
+  if (
+    signer?.writeOrganization &&
+    !(await signer.writeOrganization(accountId, privateKey, publicKey))
+  ) {
+    throw new Error(
+      `The identity signer store (${signer.name}) did not confirm the organization key.`,
+    );
+  }
+  if (key.mnemonic !== undefined) {
+    await store.setItemAsync(mnemonicName(accountId), normalizePhrase(key.mnemonic), {
+      keychainService: MNEMONIC_KEYCHAIN_SERVICE,
+      keychainAccessible: store.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
+    } satisfies SecureStoreOptions);
+  } else {
+    await store.deleteItemAsync(mnemonicName(accountId), {
+      keychainService: MNEMONIC_KEYCHAIN_SERVICE,
+    } satisfies SecureStoreOptions);
+  }
+  await writeIndex(store, [...(await readIndex(store)), accountId]);
+}
+
+/**
+ * The organization's public key as THIS device can reach it, or `null`.
+ * iOS: the keychain group. Android: Commons' own slot inside Commons, and
+ * Commons' identity host (`describe` with `accountId`) everywhere else. Compare
+ * it with the organization's DID `#key-1` before receiving (Peable ADR 0002).
+ */
+export async function getOrganizationPublicKey(accountId: string): Promise<string | null> {
+  if (!isOrganizationAccountId(accountId) || isWeb()) return null;
+  try {
+    if (isAndroid() && !registeredIdentitySignerStore()) {
+      const bridge = await loadCommonsIdentityBridge();
+      const description = (await bridge?.describe(accountId)) ?? null;
+      return description?.accountId === accountId ? description.publicKey : null;
+    }
+    return (await readLocalPair(accountId))?.publicKey ?? null;
+  } catch (error) {
+    logger.warn('Failed to read an organization public key', {
+      component: 'OrganizationKeys',
+      error: error instanceof Error ? error.name : 'unknown',
+    });
+    return null;
+  }
+}
+
+/**
+ * The organization's private key, where this app may hold it: Commons (both
+ * platforms) and, on iOS, the keychain group. `null` on Android outside
+ * Commons. Use it to sign within the app only; never transmit it.
+ */
+export async function getOrganizationPrivateKey(accountId: string): Promise<string | null> {
+  if (!isOrganizationAccountId(accountId)) return null;
+  try {
+    return (await readLocalPair(accountId))?.privateKey ?? null;
+  } catch (error) {
+    logger.warn('Failed to read an organization private key', {
+      component: 'OrganizationKeys',
+      error: error instanceof Error ? error.name : 'unknown',
+    });
+    return null;
+  }
+}
+
+/** The organization's phrase, if this device created or imported it with one. Commons only. */
+export async function getOrganizationRecoveryPhrase(accountId: string): Promise<string | null> {
+  if (!isOrganizationAccountId(accountId) || isWeb()) return null;
+  const store = await secureStore();
+  return store.getItemAsync(mnemonicName(accountId), {
+    keychainService: MNEMONIC_KEYCHAIN_SERVICE,
+  } satisfies SecureStoreOptions);
+}
+
+/** The organizations this device keeps a key for (Commons' own index). */
+export async function listOrganizationKeys(): Promise<string[]> {
+  if (isWeb()) return [];
+  return readIndex(await secureStore());
+}
+
+/** Forget an organization key on this device: its pair, its phrase, its signer copy and its index entry. */
+export async function deleteOrganizationKey(accountId: string): Promise<void> {
+  assertAccountId(accountId);
+  if (isWeb()) return;
+  const store = await secureStore();
+  const options = pairOptions(store, false);
+  await store.deleteItemAsync(privateKeyName(accountId), options);
+  await store.deleteItemAsync(publicKeyName(accountId), options);
+  await store.deleteItemAsync(mnemonicName(accountId), {
+    keychainService: MNEMONIC_KEYCHAIN_SERVICE,
+  } satisfies SecureStoreOptions);
+  const signer = isAndroid() ? registeredIdentitySignerStore() : null;
+  await signer?.clearOrganization?.(accountId);
+  await writeIndex(
+    store,
+    (await readIndex(store)).filter((id) => id !== accountId),
+  );
+}
+
+/**
+ * Commons on Android: copy every held organization key into the identity
+ * signer store again, so the identity host answers for it after that file was
+ * rebuilt (its self-heal leaves it empty). Call on every boot, beside
+ * `KeyManager.syncSharedIdentity`. Resolves how many it mirrored. Elsewhere 0.
+ */
+export async function syncOrganizationKeys(): Promise<number> {
+  const signer = isAndroid() ? registeredIdentitySignerStore() : null;
+  if (!signer?.writeOrganization || !signer.readOrganization) return 0;
+  const store = await secureStore();
+  let mirrored = 0;
+  for (const accountId of await readIndex(store)) {
+    const options = pairOptions(store, false);
+    const privateKey = await store.getItemAsync(privateKeyName(accountId), options);
+    const publicKey = await store.getItemAsync(publicKeyName(accountId), options);
+    if (!privateKey || !publicKey || !isHealthyOrganizationKeyPair(privateKey, publicKey)) continue;
+    const current = await signer.readOrganization(accountId);
+    if (current?.publicKey.toLowerCase() === publicKey.toLowerCase()) continue;
+    if (
+      await signer.writeOrganization(
+        accountId,
+        normalizeSecp256k1PrivateKey(privateKey),
+        publicKey.toLowerCase(),
+      )
+    ) {
+      mirrored += 1;
+    }
+  }
+  return mirrored;
+}