Skip to content

fix: consistent device ID derivation in invite/listen #16

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

Merged
YairEtzion merged 1 commit into from
Apr 4, 2026
Merged

fix: consistent device ID derivation in invite/listen #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion packages/agent/src/commands/invite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Command, Args, Flags } from '@oclif/core';
import { loadContext } from '../context.js';
import { runControllerHandshake } from '../handshake.js';
import { generateDeviceId } from '../identity.js';
const DEFAULT_RELAY = 'wss://relay.authmesh.dev/ws';

export default class Invite extends Command {
Expand Down Expand Up @@ -65,7 +66,7 @@ export default class Invite extends Command {
this.log('');

await allowList.addDevice({
deviceId: `am_${Buffer.from(result.peerPublicKey).toString('base64url').slice(0, 16)}`,
deviceId: generateDeviceId(result.peerPublicKey),
publicKey: Buffer.from(result.peerPublicKey).toString('base64'),
friendlyName: result.peerFriendlyName,
addedAt: new Date().toISOString(),
Expand Down
3 changes: 2 additions & 1 deletion packages/agent/src/commands/listen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Command, Flags } from '@oclif/core';
import { loadContext } from '../context.js';
import { generateOTC, runTargetHandshake, verifySAS } from '../handshake.js';
import { generateDeviceId } from '../identity.js';
import { createInterface } from 'node:readline';

const DEFAULT_RELAY = 'wss://relay.authmesh.dev/ws';
Expand Down Expand Up @@ -72,7 +73,7 @@ export default class Listen extends Command {
}

const newDevice = {
deviceId: `am_${Buffer.from(result.peerPublicKey).toString('base64url').slice(0, 16)}`,
deviceId: generateDeviceId(result.peerPublicKey),
publicKey: Buffer.from(result.peerPublicKey).toString('base64'),
friendlyName: result.peerFriendlyName,
addedAt: new Date().toISOString(),
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/commands/invite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Command, Args, Flags } from '@oclif/core';
import { loadContext } from '../context.js';
import { runControllerHandshake } from '../handshake.js';
import { generateDeviceId } from '../identity.js';
const DEFAULT_RELAY = 'wss://relay.authmesh.dev/ws';

export default class Invite extends Command {
Expand Down Expand Up @@ -65,7 +66,7 @@ export default class Invite extends Command {
this.log('');

await allowList.addDevice({
deviceId: `am_${Buffer.from(result.peerPublicKey).toString('base64url').slice(0, 16)}`,
deviceId: generateDeviceId(result.peerPublicKey),
publicKey: Buffer.from(result.peerPublicKey).toString('base64'),
friendlyName: result.peerFriendlyName,
addedAt: new Date().toISOString(),
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/commands/listen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Command, Flags } from '@oclif/core';
import { loadContext } from '../context.js';
import { generateOTC, runTargetHandshake, verifySAS } from '../handshake.js';
import { generateDeviceId } from '../identity.js';
import { createInterface } from 'node:readline';

const DEFAULT_RELAY = 'wss://relay.authmesh.dev/ws';
Expand Down Expand Up @@ -72,7 +73,7 @@ export default class Listen extends Command {
}

const newDevice = {
deviceId: `am_${Buffer.from(result.peerPublicKey).toString('base64url').slice(0, 16)}`,
deviceId: generateDeviceId(result.peerPublicKey),
publicKey: Buffer.from(result.peerPublicKey).toString('base64'),
friendlyName: result.peerFriendlyName,
addedAt: new Date().toISOString(),
Expand Down
Loading