Merge pull request #11 from BitcoinErrorLog/fix/phase2-high-priority-fixes

fix: Phase 2 High Priority Fixes - SDK Singleton, Capability Validation, DOMPurify

Author: BitcoinErrorLog

package-lock.json

@@ -21,16 +21,19 @@
     "test:e2e:errors": "node run-e2e-with-error-capture.js"
   },
   "dependencies": {
-    "@synonymdev/pubky": "latest",
+    "@synonymdev/pubky": "^0.5.4",
+    "@types/dompurify": "^3.0.5",
     "dom-anchor-text-position": "^5.0.0",
     "dom-anchor-text-quote": "^4.0.2",
+    "dompurify": "^3.3.1",
     "pubky-app-specs": "^0.4.0",
     "qrcode": "^1.5.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-image-crop": "^10.1.8"
   },
   "devDependencies": {
+    "@playwright/test": "^1.40.0",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.2.1",
     "@types/chrome": "^0.0.268",
@@ -47,7 +50,6 @@
     "tailwindcss": "^3.4.4",
     "typescript": "^5.5.3",
     "vite": "^5.3.3",
-    "vitest": "^1.3.1",
-    "@playwright/test": "^1.40.0"
+    "vitest": "^1.3.1"
   }
 }

package.json

@@ -10,6 +10,7 @@ import {
 } from '../utils/validation';
 import { ANNOTATION_CONSTANTS, MESSAGE_TYPES, TIMING_CONSTANTS, UI_CONSTANTS } from '../utils/constants';
 import { isHTMLButtonElement } from '../utils/type-guards';
+import DOMPurify from 'dompurify';
 
 /**
  * Annotation data structure
@@ -460,12 +461,14 @@ export class AnnotationManager {
 
     const button = document.createElement('button');
     button.className = 'pubky-annotation-button';
-    button.innerHTML = `
+    // Use DOMPurify to sanitize HTML (defense-in-depth, even though this is static)
+    const buttonHtml = `
       <svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 8h10M7 12h4m1 8l-4-4H5a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v8a2 2 0 01-2 2h-3l-4 4z" />
       </svg>
       Add Annotation
     `;
+    button.innerHTML = DOMPurify.sanitize(buttonHtml);
 
     // Position button to the right and slightly below the selection
     // Account for button width (approximately 140px) and add some padding
@@ -572,7 +575,8 @@ export class AnnotationManager {
     modal.className = 'pubky-annotation-modal';
     modal.onclick = (e) => e.stopPropagation();
 
-    modal.innerHTML = `
+    // Sanitize modal HTML with DOMPurify
+    const modalHtml = `
       <h3>Add Annotation</h3>
       <div class="selected-text">"${this.escapeHtml(this.currentSelection.text)}"</div>
       <textarea placeholder="Add your comment..." autofocus maxlength="${VALIDATION_LIMITS.COMMENT_MAX_LENGTH}"></textarea>
@@ -585,6 +589,7 @@ export class AnnotationManager {
         <button class="submit-btn">Post Annotation</button>
       </div>
     `;
+    modal.innerHTML = DOMPurify.sanitize(modalHtml);
 
     const textarea = modal.querySelector('textarea')!;
     const cancelBtn = modal.querySelector('.cancel-btn')!;
@@ -920,18 +925,29 @@ export class AnnotationManager {
   private handleHighlightClick(annotation: Annotation) {
     logger.info('ContentScript', 'Highlight clicked', { id: annotation.id });
 
+    // Highlight the clicked annotation on the page
     document.querySelectorAll(`.${this.activeHighlightClass}`).forEach((el) => {
       el.classList.remove(this.activeHighlightClass);
     });
 
     const highlight = document.querySelector(`[data-annotation-id="${annotation.id}"]`);
     if (highlight) {
       highlight.classList.add(this.activeHighlightClass);
+      // Scroll the highlight into view
+      highlight.scrollIntoView({ behavior: 'smooth', block: 'center' });
     }
 
+    // Send message to background to open sidepanel
+    // Must be synchronous to preserve user gesture context
     chrome.runtime.sendMessage({
-      type: 'SHOW_ANNOTATION',
+      type: 'OPEN_SIDE_PANEL_FOR_ANNOTATION',
       annotationId: annotation.id,
+    }, () => {
+      if (chrome.runtime.lastError) {
+        logger.warn('ContentScript', 'Failed to send open sidepanel message', new Error(chrome.runtime.lastError.message));
+      } else {
+        logger.info('ContentScript', 'Sidepanel open requested', { annotationId: annotation.id });
+      }
     });
   }
 

src/content/AnnotationManager.ts

@@ -2,6 +2,7 @@ import { contentLogger as logger } from './logger';
 import { compressCanvas, getRecommendedQuality, formatBytes } from '../utils/image-compression';
 import { DRAWING_CONSTANTS, DRAWING_UI_CONSTANTS, MESSAGE_TYPES, UI_CONSTANTS } from '../utils/constants';
 import { isHTMLInputElement } from '../utils/type-guards';
+import DOMPurify from 'dompurify';
 
 export class DrawingManager {
   private canvas: HTMLCanvasElement | null = null;
@@ -202,7 +203,7 @@ export class DrawingManager {
       backdrop-filter: blur(10px);
     `;
 
-    this.toolbar.innerHTML = `
+    const toolbarHtml = `
       <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px;">
         <div>
           <div style="font-weight: 600; margin-bottom: 2px;">Graphiti Drawing</div>
@@ -284,6 +285,7 @@ export class DrawingManager {
         ">Save</button>
       </div>
     `;
+    this.toolbar.innerHTML = DOMPurify.sanitize(toolbarHtml);
 
     document.body.appendChild(this.toolbar);
 

src/content/DrawingManager.ts

@@ -1,4 +1,5 @@
 import { contentLogger as logger } from './logger';
+import DOMPurify from 'dompurify';
 
 export class PubkyURLHandler {
   constructor() {
@@ -165,10 +166,12 @@ export class PubkyURLHandler {
 
         const normalizedUrl = url.replace(/^pubky:(?!\/\/)/, 'pubky://');
         button.setAttribute('data-pubky-url', normalizedUrl);
-        button.innerHTML = `
+        // Sanitize button HTML with DOMPurify (synchronous import)
+        const buttonHtml = `
         <span class="pubky-link-icon">🔗</span>
         <span>${url.length > 30 ? url.substring(0, 30) + '...' : url}</span>
       `;
+        button.innerHTML = DOMPurify.sanitize(buttonHtml);
         fragments.push(button);
 
         lastIndex = matchIndex + url.length;

src/content/PubkyURLHandler.ts

@@ -54,8 +54,8 @@ class OffscreenHandler {
     try {
       console.log('[Graphiti Offscreen] Initializing Pubky client...');
 
-      const { Client } = await import('@synonymdev/pubky');
-      this.client = new Client();
+      const { getPubkyClientAsync } = await import('../utils/pubky-client-factory');
+      this.client = await getPubkyClientAsync();
       this.isInitialized = true;
 
       console.log('[Graphiti Offscreen] Pubky client initialized successfully');
@@ -287,7 +287,14 @@ class OffscreenHandler {
       const allAnnotations = await annotationStorage.getAllAnnotations();
       for (const url in allAnnotations) {
         for (const annotation of allAnnotations[url]) {
-          if (!annotation.postUri && annotation.author) {
+          // Sync if: no postUri AND (has author OR we can assign current session as author)
+          if (!annotation.postUri) {
+            // If annotation was created while logged out, assign current session as author
+            if (!annotation.author || annotation.author === '') {
+              annotation.author = session.pubky;
+              await annotationStorage.saveAnnotation(annotation);
+            }
+            
             const result = await this.syncAnnotation({
               url: annotation.url,
               selectedText: annotation.selectedText,

src/offscreen/offscreen.ts

@@ -4,6 +4,7 @@
  */
 
 import { imageHandler } from '../utils/image-handler';
+import DOMPurify from 'dompurify';
 
 // Inline logger for profile renderer
 class ProfileRendererLogger {
@@ -76,9 +77,9 @@ class ProfileRenderer {
 
   private async initializePubky() {
     try {
-      const { Client } = await import('@synonymdev/pubky');
-      this.pubky = new Client();
-      rendererLogger.info('Pubky Client initialized');
+      const { getPubkyClientAsync } = await import('../utils/pubky-client-factory');
+      this.pubky = await getPubkyClientAsync();
+      rendererLogger.info('Pubky Client initialized via singleton');
     } catch (error) {
       rendererLogger.error('Failed to initialize Pubky Client', error);
       throw new Error('Failed to initialize Pubky client');
@@ -255,16 +256,16 @@ class ProfileRenderer {
     }
   }
 
-  private showContent(html: string, title: string) {
+  private async showContent(html: string, title: string) {
     // Update document title
     document.title = title;
 
     // Hide loading and error
     this.loadingEl.classList.add('hidden');
     this.errorEl.classList.add('hidden');
 
-    // Show content
-    this.contentEl.innerHTML = html;
+    // Sanitize HTML from homeserver before displaying (critical security fix)
+    this.contentEl.innerHTML = DOMPurify.sanitize(html);
     this.contentEl.classList.remove('hidden');
   }
 

src/profile/profile-renderer.ts

@@ -1,6 +1,7 @@
 import { logger } from './logger';
 import { storage, Session } from './storage';
 import { profileManager } from './profile-manager';
+import { getPubkyClientAsync } from './pubky-client-factory';
 
 /**
  * Pubky authentication using official @synonymdev/pubky SDK
@@ -25,7 +26,21 @@ class AuthManagerSDK {
   private currentAuthRequest: AuthRequest | null = null;
 
   private constructor() {
-    this.initializePubky();
+    // Client will be initialized lazily via ensureClient()
+  }
+  
+  /**
+   * Validate capabilities format before use
+   */
+  private validateCapabilities(capabilities: string): string {
+    if (!capabilities || typeof capabilities !== 'string') {
+      throw new Error('Capabilities must be a non-empty string');
+    }
+    // Validate format - must start with /pub/
+    if (!capabilities.startsWith('/pub/')) {
+      throw new Error('Capabilities must start with /pub/');
+    }
+    return capabilities;
   }
 
   static getInstance(): AuthManagerSDK {
@@ -36,28 +51,14 @@ class AuthManagerSDK {
   }
 
   /**
-   * Initialize Pubky client
-   */
-  private async initializePubky() {
-    try {
-      // Dynamic import to handle the SDK
-      const { Client } = await import('@synonymdev/pubky');
-      this.client = new Client();
-      logger.info('AuthSDK', 'Pubky Client initialized');
-    } catch (error) {
-      logger.error('AuthSDK', 'Failed to initialize Pubky Client', error as Error);
-      throw error;
-    }
-  }
-
-  /**
-   * Ensure Client is initialized
+   * Ensure Client is initialized using singleton factory
    */
   private async ensureClient(): Promise<Client> {
     if (!this.client) {
-      await this.initializePubky();
+      this.client = await getPubkyClientAsync();
+      logger.info('AuthSDK', 'Pubky Client initialized via singleton');
     }
-    return this.client!;
+    return this.client;
   }
 
   /**
@@ -69,8 +70,11 @@ class AuthManagerSDK {
 
       const client = await this.ensureClient();
 
-      // Create auth request with capabilities
-      this.currentAuthRequest = client.authRequest(RELAY_URL, REQUIRED_CAPABILITIES);
+      // Validate capabilities before creating auth request
+      const validatedCapabilities = this.validateCapabilities(REQUIRED_CAPABILITIES);
+      
+      // Create auth request with validated capabilities
+      this.currentAuthRequest = client.authRequest(RELAY_URL, validatedCapabilities);
 
       // Get authorization URL (pubkyauth:// URL)
       const authUrl = this.currentAuthRequest.url();

src/utils/auth-sdk.ts

@@ -24,8 +24,8 @@ export class ImageHandler {
 
   private async ensureClient(): Promise<any> {
     if (!this.client) {
-      const { Client } = await import('@synonymdev/pubky');
-      this.client = new Client();
+      const { getPubkyClientAsync } = await import('./pubky-client-factory');
+      this.client = await getPubkyClientAsync();
     }
     return this.client;
   }

src/utils/image-handler.ts

@@ -28,12 +28,12 @@ export class ProfileManager {
   }
 
   /**
-   * Initialize the Pubky client
+   * Initialize the Pubky client using singleton factory
    */
   private async ensureClient(): Promise<any> {
     if (!this.client) {
-      const { Client } = await import('@synonymdev/pubky');
-      this.client = new Client();
+      const { getPubkyClientAsync } = await import('./pubky-client-factory');
+      this.client = await getPubkyClientAsync();
     }
     return this.client;
   }