diff --git a/package.json b/package.json index 628f695..a5170a9 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "plebeian-signer", - "version": "v1.0.1", + "version": "v1.0.2", "custom": { "chrome": { - "version": "v1.0.1" + "version": "v1.0.2" }, "firefox": { - "version": "v1.0.1" + "version": "v1.0.2" } }, "scripts": { diff --git a/projects/chrome/public/manifest.json b/projects/chrome/public/manifest.json index 8be0cf2..e2bf71c 100644 --- a/projects/chrome/public/manifest.json +++ b/projects/chrome/public/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 3, "name": "Plebeian Signer - Nostr Identity Manager & Signer", "description": "Manage and switch between multiple identities while interacting with Nostr apps", - "version": "1.0.1", + "version": "1.0.2", "homepage_url": "https://git.mleku.dev/mleku/plebeian-signer", "options_page": "options.html", "permissions": [ diff --git a/projects/chrome/public/gooti-with-bg.png b/projects/chrome/public/plebian-signer-with-bg.png similarity index 100% rename from projects/chrome/public/gooti-with-bg.png rename to projects/chrome/public/plebian-signer-with-bg.png diff --git a/projects/chrome/public/gooti.svg b/projects/chrome/public/plebian-signer.svg similarity index 100% rename from projects/chrome/public/gooti.svg rename to projects/chrome/public/plebian-signer.svg diff --git a/projects/chrome/public/prompt.html b/projects/chrome/public/prompt.html index 8c9b8b2..8bf219a 100644 --- a/projects/chrome/public/prompt.html +++ b/projects/chrome/public/prompt.html @@ -226,7 +226,7 @@
-
- diff --git a/projects/chrome/src/app/app.routes.ts b/projects/chrome/src/app/app.routes.ts index 863ea3e..71bf424 100644 --- a/projects/chrome/src/app/app.routes.ts +++ b/projects/chrome/src/app/app.routes.ts @@ -9,6 +9,7 @@ import { IdentitiesComponent } from './components/home/identities/identities.com import { IdentityComponent } from './components/home/identity/identity.component'; import { InfoComponent } from './components/home/info/info.component'; import { SettingsComponent } from './components/home/settings/settings.component'; +import { LogsComponent } from './components/home/logs/logs.component'; import { NewIdentityComponent } from './components/new-identity/new-identity.component'; import { EditIdentityComponent } from './components/edit-identity/edit-identity.component'; import { HomeComponent as EditIdentityHomeComponent } from './components/edit-identity/home/home.component'; @@ -66,6 +67,10 @@ export const routes: Routes = [ path: 'settings', component: SettingsComponent, }, + { + path: 'logs', + component: LogsComponent, + }, ], }, { diff --git a/projects/chrome/src/app/components/edit-identity/permissions/permissions.component.html b/projects/chrome/src/app/components/edit-identity/permissions/permissions.component.html index 68ac758..5a303a6 100644 --- a/projects/chrome/src/app/components/edit-identity/permissions/permissions.component.html +++ b/projects/chrome/src/app/components/edit-identity/permissions/permissions.component.html @@ -7,7 +7,12 @@ Nothing configured so far. -} @for(hostPermissions of hostsPermissions; track hostPermissions) { +} @else { + +} +@for(hostPermissions of hostsPermissions; track hostPermissions) {
{{ hostPermissions.host }} diff --git a/projects/chrome/src/app/components/edit-identity/permissions/permissions.component.scss b/projects/chrome/src/app/components/edit-identity/permissions/permissions.component.scss index f28de31..f3d864d 100644 --- a/projects/chrome/src/app/components/edit-identity/permissions/permissions.component.scss +++ b/projects/chrome/src/app/components/edit-identity/permissions/permissions.component.scss @@ -17,6 +17,10 @@ top: 0; } + .remove-all-btn { + margin-bottom: var(--size); + } + .permissions-card { background: var(--background-light); border-radius: 8px; diff --git a/projects/chrome/src/app/components/edit-identity/permissions/permissions.component.ts b/projects/chrome/src/app/components/edit-identity/permissions/permissions.component.ts index e65fb54..0fe2ed7 100644 --- a/projects/chrome/src/app/components/edit-identity/permissions/permissions.component.ts +++ b/projects/chrome/src/app/components/edit-identity/permissions/permissions.component.ts @@ -41,6 +41,14 @@ export class PermissionsComponent extends NavComponent implements OnInit { this.#buildHostsPermissions(this.identity?.id); } + async onClickRemoveAllPermissions() { + const allPermissions = this.hostsPermissions.flatMap(hp => hp.permissions); + for (const permission of allPermissions) { + await this.#storage.deletePermission(permission.id); + } + this.#buildHostsPermissions(this.identity?.id); + } + #initialize(identityId: string) { this.identity = this.#storage .getBrowserSessionHandler() diff --git a/projects/chrome/src/app/components/home/home.component.html b/projects/chrome/src/app/components/home/home.component.html index 6f98ae8..e8e6075 100644 --- a/projects/chrome/src/app/components/home/home.component.html +++ b/projects/chrome/src/app/components/home/home.component.html @@ -33,4 +33,8 @@ + + + 🪵 +
diff --git a/projects/chrome/src/app/components/home/logs/logs.component.html b/projects/chrome/src/app/components/home/logs/logs.component.html new file mode 100644 index 0000000..d1e35db --- /dev/null +++ b/projects/chrome/src/app/components/home/logs/logs.component.html @@ -0,0 +1,20 @@ +
+ Logs + +
+ +
+ @if (logs.length === 0) { +
No logs yet
+ } + @for (log of logs; track log.timestamp) { +
+ {{ log.timestamp | date:'HH:mm:ss' }} + {{ log.level }} + {{ log.message }} + @if (log.data) { + 
{{ log.data | json }}
+ } +
+ } +
diff --git a/projects/chrome/src/app/components/home/logs/logs.component.scss b/projects/chrome/src/app/components/home/logs/logs.component.scss new file mode 100644 index 0000000..1e4e790 --- /dev/null +++ b/projects/chrome/src/app/components/home/logs/logs.component.scss @@ -0,0 +1,93 @@ +:host { + height: 100%; + display: flex; + flex-direction: column; + padding: var(--size); + overflow: hidden; +} + +.logs-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: var(--size); + flex-shrink: 0; +} + +.logs-title { + font-weight: 600; + font-size: 1.1rem; +} + +.logs-container { + flex: 1; + overflow-y: auto; + background: var(--background-light); + border-radius: 8px; + padding: var(--size-h); +} + +.logs-empty { + color: var(--muted-foreground); + text-align: center; + padding: var(--size); +} + +.log-entry { + font-family: monospace; + font-size: 11px; + padding: 4px 8px; + border-radius: 4px; + margin-bottom: 2px; + display: flex; + flex-wrap: wrap; + gap: 8px; + align-items: flex-start; + + &.log-error { + background: rgba(220, 53, 69, 0.15); + color: #ff6b6b; + } + + &.log-warn { + background: rgba(255, 193, 7, 0.15); + color: #ffc107; + } + + &.log-debug { + background: rgba(108, 117, 125, 0.15); + color: #adb5bd; + } + + &.log-info { + background: rgba(13, 110, 253, 0.1); + color: var(--foreground); + } +} + +.log-time { + color: var(--muted-foreground); + flex-shrink: 0; +} + +.log-level { + font-weight: 600; + text-transform: uppercase; + width: 40px; + flex-shrink: 0; +} + +.log-message { + flex: 1; + word-break: break-word; +} + +.log-data { + width: 100%; + margin: 4px 0 0 0; + padding: 4px; + background: rgba(0, 0, 0, 0.2); + border-radius: 4px; + font-size: 10px; + overflow-x: auto; +} diff --git a/projects/chrome/src/app/components/home/logs/logs.component.ts b/projects/chrome/src/app/components/home/logs/logs.component.ts new file mode 100644 index 0000000..c4ea17d --- /dev/null +++ b/projects/chrome/src/app/components/home/logs/logs.component.ts @@ -0,0 +1,34 @@ +import { Component, inject } from '@angular/core'; +import { LoggerService, LogEntry } from '@common'; +import { DatePipe, JsonPipe } from '@angular/common'; + +@Component({ + selector: 'app-logs', + templateUrl: './logs.component.html', + styleUrl: './logs.component.scss', + imports: [DatePipe, JsonPipe], +}) +export class LogsComponent { + readonly #logger = inject(LoggerService); + + get logs(): LogEntry[] { + return this.#logger.logs; + } + + onClear() { + this.#logger.clear(); + } + + getLevelClass(level: LogEntry['level']): string { + switch (level) { + case 'error': + return 'log-error'; + case 'warn': + return 'log-warn'; + case 'debug': + return 'log-debug'; + default: + return 'log-info'; + } + } +} diff --git a/projects/chrome/src/background-common.ts b/projects/chrome/src/background-common.ts index ffa6cbe..3a07a47 100644 --- a/projects/chrome/src/background-common.ts +++ b/projects/chrome/src/background-common.ts @@ -14,6 +14,7 @@ import { } from '@common'; import { ChromeMetaHandler } from './app/common/data/chrome-meta-handler'; import { Event, EventTemplate, finalizeEvent, nip04, nip44 } from 'nostr-tools'; +import { Buffer } from 'buffer'; export const debug = function (message: any) { const dateString = new Date().toISOString(); @@ -66,6 +67,8 @@ export const shouldRecklessModeApprove = async function ( host: string ): Promise { const signerMetaData = await getSignerMetaData(); + debug(`shouldRecklessModeApprove: recklessMode=${signerMetaData.recklessMode}, host=${host}`); + debug(`Full signerMetaData: ${JSON.stringify(signerMetaData)}`); if (!signerMetaData.recklessMode) { return false; @@ -223,8 +226,7 @@ export const storePermission = async function ( // Encrypt permission to store in sync storage (depending on sync flow). const encryptedPermission = await encryptPermission( permission, - browserSessionData.iv, - browserSessionData.vaultPassword as string + browserSessionData ); await savePermissionsToBrowserSyncStorage([ @@ -321,22 +323,20 @@ export const nip44Decrypt = async function ( const encryptPermission = async function ( permission: Permission_DECRYPTED, - iv: string, - password: string + sessionData: BrowserSessionData ): Promise { const encryptedPermission: Permission_ENCRYPTED = { - id: await encrypt(permission.id, iv, password), - identityId: await encrypt(permission.identityId, iv, password), - host: await encrypt(permission.host, iv, password), - method: await encrypt(permission.method, iv, password), - methodPolicy: await encrypt(permission.methodPolicy, iv, password), + id: await encrypt(permission.id, sessionData), + identityId: await encrypt(permission.identityId, sessionData), + host: await encrypt(permission.host, sessionData), + method: await encrypt(permission.method, sessionData), + methodPolicy: await encrypt(permission.methodPolicy, sessionData), }; if (typeof permission.kind !== 'undefined') { encryptedPermission.kind = await encrypt( permission.kind.toString(), - iv, - password + sessionData ); } @@ -345,8 +345,30 @@ const encryptPermission = async function ( const encrypt = async function ( value: string, - iv: string, - password: string + sessionData: BrowserSessionData ): Promise { - return await CryptoHelper.encrypt(value, iv, password); + // v2: Use pre-derived key with AES-GCM directly + if (sessionData.vaultKey) { + const keyBytes = Buffer.from(sessionData.vaultKey, 'base64'); + const iv = Buffer.from(sessionData.iv, 'base64'); + + const key = await crypto.subtle.importKey( + 'raw', + keyBytes, + { name: 'AES-GCM' }, + false, + ['encrypt'] + ); + + const cipherText = await crypto.subtle.encrypt( + { name: 'AES-GCM', iv }, + key, + new TextEncoder().encode(value) + ); + + return Buffer.from(cipherText).toString('base64'); + } + + // v1: Use password with PBKDF2 + return await CryptoHelper.encrypt(value, sessionData.iv, sessionData.vaultPassword!); }; diff --git a/projects/chrome/src/background.ts b/projects/chrome/src/background.ts index 5577f1b..71f1fca 100644 --- a/projects/chrome/src/background.ts +++ b/projects/chrome/src/background.ts @@ -67,6 +67,7 @@ browser.runtime.onMessage.addListener(async (message /*, sender*/) => { // Check reckless mode first const recklessApprove = await shouldRecklessModeApprove(req.host); + debug(`recklessApprove result: ${recklessApprove}`); if (recklessApprove) { debug('Request auto-approved via reckless mode.'); } else { @@ -78,6 +79,7 @@ browser.runtime.onMessage.addListener(async (message /*, sender*/) => { req.method, req.params ); + debug(`permissionState result: ${permissionState}`); if (permissionState === false) { throw new Error('Permission denied'); diff --git a/projects/chrome/src/prompt.ts b/projects/chrome/src/prompt.ts index 95aa6fc..9e70828 100644 --- a/projects/chrome/src/prompt.ts +++ b/projects/chrome/src/prompt.ts @@ -1,14 +1,32 @@ import browser from 'webextension-polyfill'; -import { Buffer } from 'buffer'; import { Nip07Method } from '@common'; import { PromptResponse, PromptResponseMessage } from './background-common'; +/** + * Decode base64 string to UTF-8 using native browser APIs. + * This avoids race conditions with the Buffer polyfill initialization. + */ +function base64ToUtf8(base64: string): string { + const binaryString = atob(base64); + const bytes = Uint8Array.from(binaryString, char => char.charCodeAt(0)); + return new TextDecoder('utf-8').decode(bytes); +} + const params = new URLSearchParams(location.search); const id = params.get('id') as string; const method = params.get('method') as Nip07Method; const host = params.get('host') as string; const nick = params.get('nick') as string; -const event = Buffer.from(params.get('event') as string, 'base64').toString(); + +let event = '{}'; +// eslint-disable-next-line @typescript-eslint/no-explicit-any +let eventParsed: any = {}; +try { + event = base64ToUtf8(params.get('event') as string); + eventParsed = JSON.parse(event); +} catch (e) { + console.error('Failed to parse event:', e); +} let title = ''; switch (method) { @@ -62,8 +80,8 @@ Array.from(document.getElementsByClassName('host-INSERT')).forEach( ); const kindSpanElement = document.getElementById('kindSpan'); -if (kindSpanElement) { - kindSpanElement.innerText = JSON.parse(event).kind; +if (kindSpanElement && eventParsed.kind !== undefined) { + kindSpanElement.innerText = eventParsed.kind; } const cardGetPublicKeyElement = document.getElementById('cardGetPublicKey'); @@ -108,9 +126,8 @@ if (cardNip04EncryptElement && card2Nip04EncryptElement) { 'card2Nip04Encrypt_text' ); if (card2Nip04Encrypt_textElement) { - const eventObject: { peerPubkey: string; plaintext: string } = - JSON.parse(event); - card2Nip04Encrypt_textElement.innerText = eventObject.plaintext; + const eventObject = eventParsed as { peerPubkey: string; plaintext: string }; + card2Nip04Encrypt_textElement.innerText = eventObject.plaintext || ''; } } else { cardNip04EncryptElement.style.display = 'none'; @@ -126,9 +143,8 @@ if (cardNip44EncryptElement && card2Nip44EncryptElement) { 'card2Nip44Encrypt_text' ); if (card2Nip44Encrypt_textElement) { - const eventObject: { peerPubkey: string; plaintext: string } = - JSON.parse(event); - card2Nip44Encrypt_textElement.innerText = eventObject.plaintext; + const eventObject = eventParsed as { peerPubkey: string; plaintext: string }; + card2Nip44Encrypt_textElement.innerText = eventObject.plaintext || ''; } } else { cardNip44EncryptElement.style.display = 'none'; @@ -143,9 +159,8 @@ if (cardNip04DecryptElement && card2Nip04DecryptElement) { 'card2Nip04Decrypt_text' ); if (card2Nip04Decrypt_textElement) { - const eventObject: { peerPubkey: string; ciphertext: string } = - JSON.parse(event); - card2Nip04Decrypt_textElement.innerText = eventObject.ciphertext; + const eventObject = eventParsed as { peerPubkey: string; ciphertext: string }; + card2Nip04Decrypt_textElement.innerText = eventObject.ciphertext || ''; } } else { cardNip04DecryptElement.style.display = 'none'; @@ -161,9 +176,8 @@ if (cardNip44DecryptElement && card2Nip44DecryptElement) { 'card2Nip44Decrypt_text' ); if (card2Nip44Decrypt_textElement) { - const eventObject: { peerPubkey: string; ciphertext: string } = - JSON.parse(event); - card2Nip44Decrypt_textElement.innerText = eventObject.ciphertext; + const eventObject = eventParsed as { peerPubkey: string; ciphertext: string }; + card2Nip44Decrypt_textElement.innerText = eventObject.ciphertext || ''; } } else { cardNip44DecryptElement.style.display = 'none'; @@ -175,36 +189,38 @@ if (cardNip44DecryptElement && card2Nip44DecryptElement) { // Functions // -function deliver(response: PromptResponse) { +async function deliver(response: PromptResponse) { const message: PromptResponseMessage = { id, response, }; - browser.runtime.sendMessage(message); + try { + await browser.runtime.sendMessage(message); + } catch (error) { + console.error('Failed to send message:', error); + } window.close(); } document.addEventListener('DOMContentLoaded', function () { - const rejectJustOnceButton = document.getElementById('rejectJustOnceButton'); - rejectJustOnceButton?.addEventListener('click', () => { + const rejectOnceButton = document.getElementById('rejectOnceButton'); + rejectOnceButton?.addEventListener('click', () => { deliver('reject-once'); }); - const rejectButton = document.getElementById('rejectButton'); - rejectButton?.addEventListener('click', () => { + const rejectAlwaysButton = document.getElementById('rejectAlwaysButton'); + rejectAlwaysButton?.addEventListener('click', () => { deliver('reject'); }); - const approveJustOnceButton = document.getElementById( - 'approveJustOnceButton' - ); - approveJustOnceButton?.addEventListener('click', () => { + const approveOnceButton = document.getElementById('approveOnceButton'); + approveOnceButton?.addEventListener('click', () => { deliver('approve-once'); }); - const approveButton = document.getElementById('approveButton'); - approveButton?.addEventListener('click', () => { + const approveAlwaysButton = document.getElementById('approveAlwaysButton'); + approveAlwaysButton?.addEventListener('click', () => { deliver('approve'); }); }); diff --git a/projects/common/src/lib/components/deriving-modal/deriving-modal.component.html b/projects/common/src/lib/components/deriving-modal/deriving-modal.component.html index 38574b7..7217b97 100644 --- a/projects/common/src/lib/components/deriving-modal/deriving-modal.component.html +++ b/projects/common/src/lib/components/deriving-modal/deriving-modal.component.html @@ -3,8 +3,7 @@

{{ message }}

-
{{ elapsed.toFixed(1) }}s
-

This may take 3-6 seconds for security

+

This may take a few seconds

} diff --git a/projects/common/src/lib/components/deriving-modal/deriving-modal.component.scss b/projects/common/src/lib/components/deriving-modal/deriving-modal.component.scss index 002e7b5..9ee2c54 100644 --- a/projects/common/src/lib/components/deriving-modal/deriving-modal.component.scss +++ b/projects/common/src/lib/components/deriving-modal/deriving-modal.component.scss @@ -30,14 +30,6 @@ } } -.deriving-timer { - font-size: 2.5rem; - font-weight: bold; - color: #ff3eb5; - font-family: monospace; - margin: 0.5rem 0; -} - .deriving-note { margin: 0.5rem 0 0; color: #a1a1a1; diff --git a/projects/common/src/lib/components/deriving-modal/deriving-modal.component.ts b/projects/common/src/lib/components/deriving-modal/deriving-modal.component.ts index 50eae9c..4a6bd24 100644 --- a/projects/common/src/lib/components/deriving-modal/deriving-modal.component.ts +++ b/projects/common/src/lib/components/deriving-modal/deriving-modal.component.ts @@ -1,23 +1,16 @@ -import { - Component, - OnDestroy, -} from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'app-deriving-modal', templateUrl: './deriving-modal.component.html', styleUrl: './deriving-modal.component.scss', }) -export class DerivingModalComponent implements OnDestroy { +export class DerivingModalComponent { visible = false; - elapsed = 0; message = 'Deriving encryption key'; - #startTime: number | null = null; - #animationFrame: number | null = null; - /** - * Show the deriving modal and start the timer + * Show the deriving modal * @param message Optional custom message */ show(message?: string): void { @@ -25,35 +18,12 @@ export class DerivingModalComponent implements OnDestroy { this.message = message; } this.visible = true; - this.elapsed = 0; - this.#startTime = performance.now(); - this.#updateTimer(); } /** - * Hide the modal and stop the timer + * Hide the modal */ hide(): void { this.visible = false; - this.#stopTimer(); - } - - ngOnDestroy(): void { - this.#stopTimer(); - } - - #updateTimer(): void { - if (this.#startTime !== null) { - this.elapsed = (performance.now() - this.#startTime) / 1000; - this.#animationFrame = requestAnimationFrame(() => this.#updateTimer()); - } - } - - #stopTimer(): void { - this.#startTime = null; - if (this.#animationFrame !== null) { - cancelAnimationFrame(this.#animationFrame); - this.#animationFrame = null; - } } } diff --git a/projects/common/src/lib/services/logger/logger.service.ts b/projects/common/src/lib/services/logger/logger.service.ts index 6046f85..ce2a745 100644 --- a/projects/common/src/lib/services/logger/logger.service.ts +++ b/projects/common/src/lib/services/logger/logger.service.ts @@ -1,24 +1,76 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Injectable } from '@angular/core'; +export interface LogEntry { + timestamp: Date; + level: 'log' | 'warn' | 'error' | 'debug'; + message: string; + data?: any; +} + @Injectable({ providedIn: 'root', }) export class LoggerService { #namespace: string | undefined; + #logs: LogEntry[] = []; + #maxLogs = 500; + + get logs(): LogEntry[] { + return this.#logs; + } initialize(namespace: string): void { this.#namespace = namespace; } - log(value: any) { + log(value: any, data?: any) { this.#assureInitialized(); - + this.#addLog('log', value, data); const nowString = new Date().toLocaleString(); - console.log(`[${this.#namespace} - ${nowString}]`, JSON.stringify(value)); } + warn(value: any, data?: any) { + this.#assureInitialized(); + this.#addLog('warn', value, data); + const nowString = new Date().toLocaleString(); + console.warn(`[${this.#namespace} - ${nowString}]`, JSON.stringify(value)); + } + + error(value: any, data?: any) { + this.#assureInitialized(); + this.#addLog('error', value, data); + const nowString = new Date().toLocaleString(); + console.error(`[${this.#namespace} - ${nowString}]`, JSON.stringify(value)); + } + + debug(value: any, data?: any) { + this.#assureInitialized(); + this.#addLog('debug', value, data); + const nowString = new Date().toLocaleString(); + console.debug(`[${this.#namespace} - ${nowString}]`, JSON.stringify(value)); + } + + clear() { + this.#logs = []; + } + + #addLog(level: LogEntry['level'], message: any, data?: any) { + const entry: LogEntry = { + timestamp: new Date(), + level, + message: typeof message === 'string' ? message : JSON.stringify(message), + data, + }; + this.#logs.unshift(entry); + + // Limit stored logs + if (this.#logs.length > this.#maxLogs) { + this.#logs.pop(); + } + } + #assureInitialized() { if (!this.#namespace) { throw new Error( diff --git a/projects/common/src/lib/services/storage/related/permission.ts b/projects/common/src/lib/services/storage/related/permission.ts index 84a7d2b..1d4e85c 100644 --- a/projects/common/src/lib/services/storage/related/permission.ts +++ b/projects/common/src/lib/services/storage/related/permission.ts @@ -146,12 +146,17 @@ export const decryptPermissions = async function ( const decryptedPermissions: Permission_DECRYPTED[] = []; for (const permission of permissions) { - const decryptedPermission = await decryptPermission.call( - this, - permission, - withLockedVault - ); - decryptedPermissions.push(decryptedPermission); + try { + const decryptedPermission = await decryptPermission.call( + this, + permission, + withLockedVault + ); + decryptedPermissions.push(decryptedPermission); + } catch (error) { + // Skip corrupted permissions (e.g., encrypted with wrong key) + console.warn('[vault] Skipping corrupted permission:', error); + } } return decryptedPermissions; diff --git a/projects/firefox/public/manifest.json b/projects/firefox/public/manifest.json index c64b69c..867d91d 100644 --- a/projects/firefox/public/manifest.json +++ b/projects/firefox/public/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 3, "name": "Plebeian Signer", "description": "Nostr Identity Manager & Signer", - "version": "1.0.1", + "version": "1.0.2", "homepage_url": "https://git.mleku.dev/mleku/plebeian-signer", "options_page": "options.html", "permissions": [ diff --git a/projects/firefox/public/gooti-with-bg.png b/projects/firefox/public/plebian-signer-with-bg.png similarity index 100% rename from projects/firefox/public/gooti-with-bg.png rename to projects/firefox/public/plebian-signer-with-bg.png diff --git a/projects/firefox/public/gooti.svg b/projects/firefox/public/plebian-signer.svg similarity index 100% rename from projects/firefox/public/gooti.svg rename to projects/firefox/public/plebian-signer.svg diff --git a/projects/firefox/public/prompt.html b/projects/firefox/public/prompt.html index 8c9b8b2..8bf219a 100644 --- a/projects/firefox/public/prompt.html +++ b/projects/firefox/public/prompt.html @@ -226,7 +226,7 @@
-
- diff --git a/projects/firefox/src/app/app.routes.ts b/projects/firefox/src/app/app.routes.ts index a23bc30..8ed738c 100644 --- a/projects/firefox/src/app/app.routes.ts +++ b/projects/firefox/src/app/app.routes.ts @@ -6,6 +6,7 @@ import { IdentitiesComponent } from './components/home/identities/identities.com import { IdentityComponent } from './components/home/identity/identity.component'; import { InfoComponent } from './components/home/info/info.component'; import { SettingsComponent } from './components/home/settings/settings.component'; +import { LogsComponent } from './components/home/logs/logs.component'; import { NewIdentityComponent } from './components/new-identity/new-identity.component'; import { EditIdentityComponent } from './components/edit-identity/edit-identity.component'; import { HomeComponent as EditIdentityHomeComponent } from './components/edit-identity/home/home.component'; @@ -66,6 +67,10 @@ export const routes: Routes = [ path: 'settings', component: SettingsComponent, }, + { + path: 'logs', + component: LogsComponent, + }, ], }, { diff --git a/projects/firefox/src/app/components/edit-identity/permissions/permissions.component.html b/projects/firefox/src/app/components/edit-identity/permissions/permissions.component.html index a27caba..d4704d0 100644 --- a/projects/firefox/src/app/components/edit-identity/permissions/permissions.component.html +++ b/projects/firefox/src/app/components/edit-identity/permissions/permissions.component.html @@ -10,7 +10,12 @@ Nothing configured so far. -} @for(hostPermissions of hostsPermissions; track hostPermissions) { +} @else { + +} +@for(hostPermissions of hostsPermissions; track hostPermissions) {
{{ hostPermissions.host }} diff --git a/projects/firefox/src/app/components/edit-identity/permissions/permissions.component.scss b/projects/firefox/src/app/components/edit-identity/permissions/permissions.component.scss index f28de31..f3d864d 100644 --- a/projects/firefox/src/app/components/edit-identity/permissions/permissions.component.scss +++ b/projects/firefox/src/app/components/edit-identity/permissions/permissions.component.scss @@ -17,6 +17,10 @@ top: 0; } + .remove-all-btn { + margin-bottom: var(--size); + } + .permissions-card { background: var(--background-light); border-radius: 8px; diff --git a/projects/firefox/src/app/components/edit-identity/permissions/permissions.component.ts b/projects/firefox/src/app/components/edit-identity/permissions/permissions.component.ts index 6a42b86..967249c 100644 --- a/projects/firefox/src/app/components/edit-identity/permissions/permissions.component.ts +++ b/projects/firefox/src/app/components/edit-identity/permissions/permissions.component.ts @@ -35,6 +35,14 @@ export class PermissionsComponent extends NavComponent implements OnInit { this.#buildHostsPermissions(this.identity?.id); } + async onClickRemoveAllPermissions() { + const allPermissions = this.hostsPermissions.flatMap(hp => hp.permissions); + for (const permission of allPermissions) { + await this.#storage.deletePermission(permission.id); + } + this.#buildHostsPermissions(this.identity?.id); + } + #initialize(identityId: string) { this.identity = this.#storage .getBrowserSessionHandler() diff --git a/projects/firefox/src/app/components/home/home.component.html b/projects/firefox/src/app/components/home/home.component.html index 6f98ae8..e8e6075 100644 --- a/projects/firefox/src/app/components/home/home.component.html +++ b/projects/firefox/src/app/components/home/home.component.html @@ -33,4 +33,8 @@ + + + 🪵 +
diff --git a/projects/firefox/src/app/components/home/logs/logs.component.html b/projects/firefox/src/app/components/home/logs/logs.component.html new file mode 100644 index 0000000..d1e35db --- /dev/null +++ b/projects/firefox/src/app/components/home/logs/logs.component.html @@ -0,0 +1,20 @@ +
+ Logs + +
+ +
+ @if (logs.length === 0) { +
No logs yet
+ } + @for (log of logs; track log.timestamp) { +
+ {{ log.timestamp | date:'HH:mm:ss' }} + {{ log.level }} + {{ log.message }} + @if (log.data) { + 
{{ log.data | json }}
+ } +
+ } +
diff --git a/projects/firefox/src/app/components/home/logs/logs.component.scss b/projects/firefox/src/app/components/home/logs/logs.component.scss new file mode 100644 index 0000000..1e4e790 --- /dev/null +++ b/projects/firefox/src/app/components/home/logs/logs.component.scss @@ -0,0 +1,93 @@ +:host { + height: 100%; + display: flex; + flex-direction: column; + padding: var(--size); + overflow: hidden; +} + +.logs-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: var(--size); + flex-shrink: 0; +} + +.logs-title { + font-weight: 600; + font-size: 1.1rem; +} + +.logs-container { + flex: 1; + overflow-y: auto; + background: var(--background-light); + border-radius: 8px; + padding: var(--size-h); +} + +.logs-empty { + color: var(--muted-foreground); + text-align: center; + padding: var(--size); +} + +.log-entry { + font-family: monospace; + font-size: 11px; + padding: 4px 8px; + border-radius: 4px; + margin-bottom: 2px; + display: flex; + flex-wrap: wrap; + gap: 8px; + align-items: flex-start; + + &.log-error { + background: rgba(220, 53, 69, 0.15); + color: #ff6b6b; + } + + &.log-warn { + background: rgba(255, 193, 7, 0.15); + color: #ffc107; + } + + &.log-debug { + background: rgba(108, 117, 125, 0.15); + color: #adb5bd; + } + + &.log-info { + background: rgba(13, 110, 253, 0.1); + color: var(--foreground); + } +} + +.log-time { + color: var(--muted-foreground); + flex-shrink: 0; +} + +.log-level { + font-weight: 600; + text-transform: uppercase; + width: 40px; + flex-shrink: 0; +} + +.log-message { + flex: 1; + word-break: break-word; +} + +.log-data { + width: 100%; + margin: 4px 0 0 0; + padding: 4px; + background: rgba(0, 0, 0, 0.2); + border-radius: 4px; + font-size: 10px; + overflow-x: auto; +} diff --git a/projects/firefox/src/app/components/home/logs/logs.component.ts b/projects/firefox/src/app/components/home/logs/logs.component.ts new file mode 100644 index 0000000..c4ea17d --- /dev/null +++ b/projects/firefox/src/app/components/home/logs/logs.component.ts @@ -0,0 +1,34 @@ +import { Component, inject } from '@angular/core'; +import { LoggerService, LogEntry } from '@common'; +import { DatePipe, JsonPipe } from '@angular/common'; + +@Component({ + selector: 'app-logs', + templateUrl: './logs.component.html', + styleUrl: './logs.component.scss', + imports: [DatePipe, JsonPipe], +}) +export class LogsComponent { + readonly #logger = inject(LoggerService); + + get logs(): LogEntry[] { + return this.#logger.logs; + } + + onClear() { + this.#logger.clear(); + } + + getLevelClass(level: LogEntry['level']): string { + switch (level) { + case 'error': + return 'log-error'; + case 'warn': + return 'log-warn'; + case 'debug': + return 'log-debug'; + default: + return 'log-info'; + } + } +} diff --git a/projects/firefox/src/background-common.ts b/projects/firefox/src/background-common.ts index 213c801..730a6c9 100644 --- a/projects/firefox/src/background-common.ts +++ b/projects/firefox/src/background-common.ts @@ -15,6 +15,7 @@ import { import { Event, EventTemplate, finalizeEvent, nip04, nip44 } from 'nostr-tools'; import { FirefoxMetaHandler } from './app/common/data/firefox-meta-handler'; import browser from 'webextension-polyfill'; +import { Buffer } from 'buffer'; export const debug = function (message: any) { const dateString = new Date().toISOString(); @@ -67,6 +68,8 @@ export const shouldRecklessModeApprove = async function ( host: string ): Promise { const signerMetaData = await getSignerMetaData(); + debug(`shouldRecklessModeApprove: recklessMode=${signerMetaData.recklessMode}, host=${host}`); + debug(`Full signerMetaData: ${JSON.stringify(signerMetaData)}`); if (!signerMetaData.recklessMode) { return false; @@ -228,8 +231,7 @@ export const storePermission = async function ( // Encrypt permission to store in sync storage (depending on sync flow). const encryptedPermission = await encryptPermission( permission, - browserSessionData.iv, - browserSessionData.vaultPassword as string + browserSessionData ); await savePermissionsToBrowserSyncStorage([ @@ -326,22 +328,20 @@ export const nip44Decrypt = async function ( const encryptPermission = async function ( permission: Permission_DECRYPTED, - iv: string, - password: string + sessionData: BrowserSessionData ): Promise { const encryptedPermission: Permission_ENCRYPTED = { - id: await encrypt(permission.id, iv, password), - identityId: await encrypt(permission.identityId, iv, password), - host: await encrypt(permission.host, iv, password), - method: await encrypt(permission.method, iv, password), - methodPolicy: await encrypt(permission.methodPolicy, iv, password), + id: await encrypt(permission.id, sessionData), + identityId: await encrypt(permission.identityId, sessionData), + host: await encrypt(permission.host, sessionData), + method: await encrypt(permission.method, sessionData), + methodPolicy: await encrypt(permission.methodPolicy, sessionData), }; if (typeof permission.kind !== 'undefined') { encryptedPermission.kind = await encrypt( permission.kind.toString(), - iv, - password + sessionData ); } @@ -350,8 +350,30 @@ const encryptPermission = async function ( const encrypt = async function ( value: string, - iv: string, - password: string + sessionData: BrowserSessionData ): Promise { - return await CryptoHelper.encrypt(value, iv, password); + // v2: Use pre-derived key with AES-GCM directly + if (sessionData.vaultKey) { + const keyBytes = Buffer.from(sessionData.vaultKey, 'base64'); + const iv = Buffer.from(sessionData.iv, 'base64'); + + const key = await crypto.subtle.importKey( + 'raw', + keyBytes, + { name: 'AES-GCM' }, + false, + ['encrypt'] + ); + + const cipherText = await crypto.subtle.encrypt( + { name: 'AES-GCM', iv }, + key, + new TextEncoder().encode(value) + ); + + return Buffer.from(cipherText).toString('base64'); + } + + // v1: Use password with PBKDF2 + return await CryptoHelper.encrypt(value, sessionData.iv, sessionData.vaultPassword!); }; diff --git a/projects/firefox/src/background.ts b/projects/firefox/src/background.ts index 5577f1b..71f1fca 100644 --- a/projects/firefox/src/background.ts +++ b/projects/firefox/src/background.ts @@ -67,6 +67,7 @@ browser.runtime.onMessage.addListener(async (message /*, sender*/) => { // Check reckless mode first const recklessApprove = await shouldRecklessModeApprove(req.host); + debug(`recklessApprove result: ${recklessApprove}`); if (recklessApprove) { debug('Request auto-approved via reckless mode.'); } else { @@ -78,6 +79,7 @@ browser.runtime.onMessage.addListener(async (message /*, sender*/) => { req.method, req.params ); + debug(`permissionState result: ${permissionState}`); if (permissionState === false) { throw new Error('Permission denied'); diff --git a/projects/firefox/src/prompt.ts b/projects/firefox/src/prompt.ts index 279c880..f76c35c 100644 --- a/projects/firefox/src/prompt.ts +++ b/projects/firefox/src/prompt.ts @@ -1,14 +1,32 @@ import browser from 'webextension-polyfill'; -import { Buffer } from 'buffer'; import { Nip07Method } from '@common'; import { PromptResponse, PromptResponseMessage } from './background-common'; +/** + * Decode base64 string to UTF-8 using native browser APIs. + * This avoids race conditions with the Buffer polyfill initialization. + */ +function base64ToUtf8(base64: string): string { + const binaryString = atob(base64); + const bytes = Uint8Array.from(binaryString, char => char.charCodeAt(0)); + return new TextDecoder('utf-8').decode(bytes); +} + const params = new URLSearchParams(location.search); const id = params.get('id') as string; const method = params.get('method') as Nip07Method; const host = params.get('host') as string; const nick = params.get('nick') as string; -const event = Buffer.from(params.get('event') as string, 'base64').toString(); + +let event = '{}'; +// eslint-disable-next-line @typescript-eslint/no-explicit-any +let eventParsed: any = {}; +try { + event = base64ToUtf8(params.get('event') as string); + eventParsed = JSON.parse(event); +} catch (e) { + console.error('Failed to parse event:', e); +} let title = ''; switch (method) { @@ -62,8 +80,8 @@ Array.from(document.getElementsByClassName('host-INSERT')).forEach( ); const kindSpanElement = document.getElementById('kindSpan'); -if (kindSpanElement) { - kindSpanElement.innerText = JSON.parse(event).kind; +if (kindSpanElement && eventParsed.kind !== undefined) { + kindSpanElement.innerText = eventParsed.kind; } const cardGetPublicKeyElement = document.getElementById('cardGetPublicKey'); @@ -108,9 +126,8 @@ if (cardNip04EncryptElement && card2Nip04EncryptElement) { 'card2Nip04Encrypt_text' ); if (card2Nip04Encrypt_textElement) { - const eventObject: { peerPubkey: string; plaintext: string } = - JSON.parse(event); - card2Nip04Encrypt_textElement.innerText = eventObject.plaintext; + const eventObject = eventParsed as { peerPubkey: string; plaintext: string }; + card2Nip04Encrypt_textElement.innerText = eventObject.plaintext || ''; } } else { cardNip04EncryptElement.style.display = 'none'; @@ -126,9 +143,8 @@ if (cardNip44EncryptElement && card2Nip44EncryptElement) { 'card2Nip44Encrypt_text' ); if (card2Nip44Encrypt_textElement) { - const eventObject: { peerPubkey: string; plaintext: string } = - JSON.parse(event); - card2Nip44Encrypt_textElement.innerText = eventObject.plaintext; + const eventObject = eventParsed as { peerPubkey: string; plaintext: string }; + card2Nip44Encrypt_textElement.innerText = eventObject.plaintext || ''; } } else { cardNip44EncryptElement.style.display = 'none'; @@ -144,9 +160,8 @@ if (cardNip04DecryptElement && card2Nip04DecryptElement) { 'card2Nip04Decrypt_text' ); if (card2Nip04Decrypt_textElement) { - const eventObject: { peerPubkey: string; ciphertext: string } = - JSON.parse(event); - card2Nip04Decrypt_textElement.innerText = eventObject.ciphertext; + const eventObject = eventParsed as { peerPubkey: string; ciphertext: string }; + card2Nip04Decrypt_textElement.innerText = eventObject.ciphertext || ''; } } else { cardNip04DecryptElement.style.display = 'none'; @@ -162,9 +177,8 @@ if (cardNip44DecryptElement && card2Nip44DecryptElement) { 'card2Nip44Decrypt_text' ); if (card2Nip44Decrypt_textElement) { - const eventObject: { peerPubkey: string; ciphertext: string } = - JSON.parse(event); - card2Nip44Decrypt_textElement.innerText = eventObject.ciphertext; + const eventObject = eventParsed as { peerPubkey: string; ciphertext: string }; + card2Nip44Decrypt_textElement.innerText = eventObject.ciphertext || ''; } } else { cardNip44DecryptElement.style.display = 'none'; @@ -176,36 +190,38 @@ if (cardNip44DecryptElement && card2Nip44DecryptElement) { // Functions // -function deliver(response: PromptResponse) { +async function deliver(response: PromptResponse) { const message: PromptResponseMessage = { id, response, }; - browser.runtime.sendMessage(message); + try { + await browser.runtime.sendMessage(message); + } catch (error) { + console.error('Failed to send message:', error); + } window.close(); } document.addEventListener('DOMContentLoaded', function () { - const rejectJustOnceButton = document.getElementById('rejectJustOnceButton'); - rejectJustOnceButton?.addEventListener('click', () => { + const rejectOnceButton = document.getElementById('rejectOnceButton'); + rejectOnceButton?.addEventListener('click', () => { deliver('reject-once'); }); - const rejectButton = document.getElementById('rejectButton'); - rejectButton?.addEventListener('click', () => { + const rejectAlwaysButton = document.getElementById('rejectAlwaysButton'); + rejectAlwaysButton?.addEventListener('click', () => { deliver('reject'); }); - const approveJustOnceButton = document.getElementById( - 'approveJustOnceButton' - ); - approveJustOnceButton?.addEventListener('click', () => { + const approveOnceButton = document.getElementById('approveOnceButton'); + approveOnceButton?.addEventListener('click', () => { deliver('approve-once'); }); - const approveButton = document.getElementById('approveButton'); - approveButton?.addEventListener('click', () => { + const approveAlwaysButton = document.getElementById('approveAlwaysButton'); + approveAlwaysButton?.addEventListener('click', () => { deliver('approve'); }); });