Harden socket security and add hook installation consent

- Change Unix socket permissions from 0o777 to 0o600 (owner-only)
- Move socket from /tmp/claude-island.sock to ~/.claude/claude-island.sock
- Add token-based authentication to the socket protocol
- Require user consent before modifying ~/.claude/settings.json

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: pablotp

ClaudeIsland/App/AppDelegate.swift

@@ -67,7 +67,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         Mixpanel.mainInstance().track(event: "App Launched")
         Mixpanel.mainInstance().flush()
 
-        HookInstaller.installIfNeeded()
+        installHooksWithConsent()
         NSApplication.shared.setActivationPolicy(.accessory)
 
         windowManager = WindowManager()
@@ -91,6 +91,44 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         _ = windowManager?.setupNotchWindow()
     }
 
+    private func installHooksWithConsent() {
+        let consent = AppSettings.hooksConsentGiven
+
+        if consent == true {
+            HookInstaller.installIfNeeded()
+            return
+        }
+
+        if consent == false {
+            return
+        }
+
+        // consent == nil: first launch, never asked
+        // Existing users with hooks already installed get implied consent
+        if HookInstaller.isInstalled() {
+            AppSettings.hooksConsentGiven = true
+            HookInstaller.installIfNeeded()
+            return
+        }
+
+        // New user: show consent dialog
+        let alert = NSAlert()
+        alert.messageText = "Enable Claude Code Integration?"
+        alert.informativeText = "Claude Island can integrate with Claude Code by installing hooks into your ~/.claude/settings.json configuration. This enables real-time status monitoring and permission management from the menu bar.\n\nYou can change this later in Settings."
+        alert.alertStyle = .informational
+        alert.addButton(withTitle: "Enable Hooks")
+        alert.addButton(withTitle: "Not Now")
+
+        let response = alert.runModal()
+
+        if response == .alertFirstButtonReturn {
+            AppSettings.hooksConsentGiven = true
+            HookInstaller.installIfNeeded()
+        } else {
+            AppSettings.hooksConsentGiven = false
+        }
+    }
+
     func applicationWillTerminate(_ notification: Notification) {
         Mixpanel.mainInstance().flush()
         updateCheckTimer?.invalidate()

ClaudeIsland/Core/Settings.swift

@@ -38,6 +38,7 @@ enum AppSettings {
 
     private enum Keys {
         static let notificationSound = "notificationSound"
+        static let hooksConsentGiven = "hooksConsentGiven"
     }
 
     // MARK: - Notification Sound
@@ -55,4 +56,24 @@ enum AppSettings {
             defaults.set(newValue.rawValue, forKey: Keys.notificationSound)
         }
     }
+
+    // MARK: - Hooks Consent
+
+    /// Whether the user has given consent for hooks installation.
+    /// Returns nil if never asked (first launch).
+    static var hooksConsentGiven: Bool? {
+        get {
+            guard defaults.object(forKey: Keys.hooksConsentGiven) != nil else {
+                return nil
+            }
+            return defaults.bool(forKey: Keys.hooksConsentGiven)
+        }
+        set {
+            if let value = newValue {
+                defaults.set(value, forKey: Keys.hooksConsentGiven)
+            } else {
+                defaults.removeObject(forKey: Keys.hooksConsentGiven)
+            }
+        }
+    }
 }

ClaudeIsland/Resources/claude-island-state.py

@@ -9,10 +9,20 @@
 import socket
 import sys
 
-SOCKET_PATH = "/tmp/claude-island.sock"
+SOCKET_PATH = os.path.expanduser("~/.claude/claude-island.sock")
+TOKEN_PATH = os.path.expanduser("~/.claude/hooks/.claude-island-token")
 TIMEOUT_SECONDS = 300  # 5 minutes for permission decisions
 
 
+def get_token():
+    """Read the authentication token written by ClaudeIsland.app"""
+    try:
+        with open(TOKEN_PATH, "r") as f:
+            return f.read().strip()
+    except (OSError, IOError):
+        return None
+
+
 def get_tty():
     """Get the TTY of the Claude process (parent)"""
     import subprocess
@@ -95,6 +105,11 @@ def main():
         "tty": tty,
     }
 
+    # Add authentication token
+    token = get_token()
+    if token:
+        state["token"] = token
+
     # Map events to status
     if event == "UserPromptSubmit":
         # User just sent a message - Claude is now processing

ClaudeIsland/Services/Hooks/HookSocketServer.swift

@@ -25,18 +25,19 @@ struct HookEvent: Codable, Sendable {
     let toolUseId: String?
     let notificationType: String?
     let message: String?
+    let token: String?
 
     enum CodingKeys: String, CodingKey {
         case sessionId = "session_id"
         case cwd, event, status, pid, tty, tool
         case toolInput = "tool_input"
         case toolUseId = "tool_use_id"
         case notificationType = "notification_type"
-        case message
+        case message, token
     }
 
     /// Create a copy with updated toolUseId
-    init(sessionId: String, cwd: String, event: String, status: String, pid: Int?, tty: String?, tool: String?, toolInput: [String: AnyCodable]?, toolUseId: String?, notificationType: String?, message: String?) {
+    init(sessionId: String, cwd: String, event: String, status: String, pid: Int?, tty: String?, tool: String?, toolInput: [String: AnyCodable]?, toolUseId: String?, notificationType: String?, message: String?, token: String? = nil) {
         self.sessionId = sessionId
         self.cwd = cwd
         self.event = event
@@ -48,6 +49,7 @@ struct HookEvent: Codable, Sendable {
         self.toolUseId = toolUseId
         self.notificationType = notificationType
         self.message = message
+        self.token = token
     }
 
     var sessionPhase: SessionPhase {
@@ -107,9 +109,16 @@ typealias PermissionFailureHandler = @Sendable (_ sessionId: String, _ toolUseId
 /// Uses GCD DispatchSource for non-blocking I/O
 class HookSocketServer {
     static let shared = HookSocketServer()
-    static let socketPath = "/tmp/claude-island.sock"
+    static let socketPath: String = FileManager.default.homeDirectoryForCurrentUser
+        .appendingPathComponent(".claude/claude-island.sock")
+        .path
+    static let tokenPath: String = FileManager.default.homeDirectoryForCurrentUser
+        .appendingPathComponent(".claude/hooks/.claude-island-token")
+        .path
 
     private var serverSocket: Int32 = -1
+    /// The expected token for authenticating hook connections
+    private var expectedToken: String?
     private var acceptSource: DispatchSourceRead?
     private var eventHandler: HookEventHandler?
     private var permissionFailureHandler: PermissionFailureHandler?
@@ -141,6 +150,8 @@ class HookSocketServer {
         permissionFailureHandler = onPermissionFailure
 
         unlink(Self.socketPath)
+        // Clean up legacy socket path from previous versions
+        unlink("/tmp/claude-island.sock")
 
         serverSocket = socket(AF_UNIX, SOCK_STREAM, 0)
         guard serverSocket >= 0 else {
@@ -174,7 +185,7 @@ class HookSocketServer {
             return
         }
 
-        chmod(Self.socketPath, 0o777)
+        chmod(Self.socketPath, 0o600)
 
         guard listen(serverSocket, 10) == 0 else {
             logger.error("Failed to listen: \(errno)")
@@ -185,6 +196,8 @@ class HookSocketServer {
 
         logger.info("Listening on \(Self.socketPath, privacy: .public)")
 
+        expectedToken = generateAndWriteToken()
+
         acceptSource = DispatchSource.makeReadSource(fileDescriptor: serverSocket, queue: queue)
         acceptSource?.setEventHandler { [weak self] in
             self?.acceptConnection()
@@ -203,6 +216,7 @@ class HookSocketServer {
         acceptSource?.cancel()
         acceptSource = nil
         unlink(Self.socketPath)
+        unlink(Self.tokenPath)
 
         permissionsLock.lock()
         for (_, pending) in pendingPermissions {
@@ -280,6 +294,26 @@ class HookSocketServer {
         permissionsLock.unlock()
     }
 
+    // MARK: - Token Authentication
+
+    /// Generate a random token and write it to the token file
+    private func generateAndWriteToken() -> String {
+        let token = UUID().uuidString
+        let tokenDir = (Self.tokenPath as NSString).deletingLastPathComponent
+        try? FileManager.default.createDirectory(
+            atPath: tokenDir,
+            withIntermediateDirectories: true,
+            attributes: nil
+        )
+        FileManager.default.createFile(
+            atPath: Self.tokenPath,
+            contents: token.data(using: .utf8),
+            attributes: [.posixPermissions: 0o600]
+        )
+        logger.info("Auth token written to \(Self.tokenPath, privacy: .public)")
+        return token
+    }
+
     // MARK: - Tool Use ID Cache
 
     /// Encoder with sorted keys for deterministic cache keys
@@ -411,6 +445,15 @@ class HookSocketServer {
             return
         }
 
+        // Validate authentication token
+        if let expected = expectedToken {
+            guard event.token == expected else {
+                logger.warning("Rejected event with invalid token from \(event.sessionId.prefix(8), privacy: .public)")
+                close(clientSocket)
+                return
+            }
+        }
+
         logger.debug("Received: \(event.event, privacy: .public) for \(event.sessionId.prefix(8), privacy: .public)")
 
         if event.event == "PreToolUse" {

ClaudeIsland/UI/Views/NotchMenuView.swift

@@ -70,9 +70,11 @@ struct NotchMenuView: View {
                 if hooksInstalled {
                     HookInstaller.uninstall()
                     hooksInstalled = false
+                    AppSettings.hooksConsentGiven = false
                 } else {
                     HookInstaller.installIfNeeded()
                     hooksInstalled = true
+                    AppSettings.hooksConsentGiven = true
                 }
             }