nworks 1.2.1 → 1.2.2

package/dist/mcp.js

@@ -31,13 +31,14 @@ import { join } from "path";
 function hasServiceAccountCreds(creds) {
   return !!(creds.serviceAccount && creds.privateKeyPath && creds.botId);
 }
+var IS_UNIX = process.platform !== "win32";
 var CONFIG_DIR = join(homedir(), ".config", "nworks");
 var CREDENTIALS_PATH = join(CONFIG_DIR, "credentials.json");
 var TOKEN_PATH = join(CONFIG_DIR, "token.json");
 var USER_TOKEN_PATH = join(CONFIG_DIR, "user-token.json");
 async function ensureConfigDir() {
   if (!existsSync(CONFIG_DIR)) {
-    await mkdir(CONFIG_DIR, { recursive: true });
+    await mkdir(CONFIG_DIR, { recursive: true, ...IS_UNIX && { mode: 448 } });
   }
 }
 function getCredentialsFromEnv() {
@@ -77,7 +78,11 @@ async function saveCredentials(creds, profile = "default") {
     profiles = JSON.parse(raw);
   }
   profiles[profile] = creds;
-  await writeFile(CREDENTIALS_PATH, JSON.stringify(profiles, null, 2), "utf-8");
+  await writeFile(
+    CREDENTIALS_PATH,
+    JSON.stringify(profiles, null, 2),
+    { encoding: "utf-8", ...IS_UNIX && { mode: 384 } }
+  );
 }
 async function loadToken(profile = "default") {
   if (!existsSync(TOKEN_PATH)) return null;
@@ -98,7 +103,11 @@ async function saveToken(token, profile = "default") {
     tokens = JSON.parse(raw);
   }
   tokens[profile] = token;
-  await writeFile(TOKEN_PATH, JSON.stringify(tokens, null, 2), "utf-8");
+  await writeFile(
+    TOKEN_PATH,
+    JSON.stringify(tokens, null, 2),
+    { encoding: "utf-8", ...IS_UNIX && { mode: 384 } }
+  );
 }
 async function loadUserToken(profile = "default") {
   if (!existsSync(USER_TOKEN_PATH)) return null;
@@ -121,7 +130,11 @@ async function saveUserToken(token, profile = "default") {
     tokens = JSON.parse(raw);
   }
   tokens[profile] = token;
-  await writeFile(USER_TOKEN_PATH, JSON.stringify(tokens, null, 2), "utf-8");
+  await writeFile(
+    USER_TOKEN_PATH,
+    JSON.stringify(tokens, null, 2),
+    { encoding: "utf-8", ...IS_UNIX && { mode: 384 } }
+  );
 }
 async function clearCredentials(profile = "default") {
   if (existsSync(CREDENTIALS_PATH)) {
@@ -131,25 +144,33 @@ async function clearCredentials(profile = "default") {
     await writeFile(
       CREDENTIALS_PATH,
       JSON.stringify(profiles, null, 2),
-      "utf-8"
+      { encoding: "utf-8", ...IS_UNIX && { mode: 384 } }
     );
   }
   if (existsSync(TOKEN_PATH)) {
     const raw = await readFile(TOKEN_PATH, "utf-8");
     const tokens = JSON.parse(raw);
     delete tokens[profile];
-    await writeFile(TOKEN_PATH, JSON.stringify(tokens, null, 2), "utf-8");
+    await writeFile(
+      TOKEN_PATH,
+      JSON.stringify(tokens, null, 2),
+      { encoding: "utf-8", ...IS_UNIX && { mode: 384 } }
+    );
   }
   if (existsSync(USER_TOKEN_PATH)) {
     const raw = await readFile(USER_TOKEN_PATH, "utf-8");
     const tokens = JSON.parse(raw);
     delete tokens[profile];
-    await writeFile(USER_TOKEN_PATH, JSON.stringify(tokens, null, 2), "utf-8");
+    await writeFile(
+      USER_TOKEN_PATH,
+      JSON.stringify(tokens, null, 2),
+      { encoding: "utf-8", ...IS_UNIX && { mode: 384 } }
+    );
   }
 }
 
 // src/auth/jwt.ts
-import { readFile as readFile2 } from "fs/promises";
+import { readFile as readFile2, stat } from "fs/promises";
 import jwt from "jsonwebtoken";
 async function createJWT(creds) {
   if (!creds.serviceAccount || !creds.privateKeyPath) {
@@ -158,6 +179,15 @@ async function createJWT(creds) {
     );
   }
   const privateKey = await readFile2(creds.privateKeyPath, "utf-8");
+  if (process.platform !== "win32") {
+    const fileStat = await stat(creds.privateKeyPath);
+    const mode = fileStat.mode & 511;
+    if (mode & 63) {
+      console.error(
+        `[nworks] Warning: Private key file has permissions ${mode.toString(8)}. Recommended: 600`
+      );
+    }
+  }
   const now = Math.floor(Date.now() / 1e3);
   const payload = {
     iss: creds.clientId,
@@ -194,7 +224,8 @@ async function refreshToken(profile = "default") {
   });
   if (!res.ok) {
     const text = await res.text();
-    throw new AuthError(`Token exchange failed (${res.status}): ${text}`);
+    const truncated = text.length > 200 ? text.substring(0, 200) + "..." : text;
+    throw new AuthError(`Token exchange failed (${res.status}): ${truncated}`);
   }
   const data = await res.json();
   const expiresIn = Number(data.expires_in);
@@ -210,7 +241,7 @@ async function refreshToken(profile = "default") {
 var BASE_URL = "https://www.worksapis.com/v1.0";
 var MAX_RETRIES = 3;
 function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
 async function request(opts, _retryCount = 0) {
   const { method, path, body, profile = "default" } = opts;
@@ -232,7 +263,9 @@ async function request(opts, _retryCount = 0) {
     return request(opts, _retryCount + 1);
   }
   if (res.status === 429 && _retryCount < MAX_RETRIES) {
-    const retryAfter = parseInt(res.headers.get("Retry-After") ?? "5", 10);
+    const MAX_RETRY_AFTER = 60;
+    const rawRetry = parseInt(res.headers.get("Retry-After") ?? "5", 10);
+    const retryAfter = Math.min(Number.isNaN(rawRetry) ? 5 : rawRetry, MAX_RETRY_AFTER);
     await sleep(retryAfter * 1e3);
     return request(opts, _retryCount + 1);
   }
@@ -257,6 +290,58 @@ async function request(opts, _retryCount = 0) {
   return JSON.parse(text);
 }
 
+// src/utils/sanitize.ts
+import { basename, resolve, sep } from "path";
+import { randomBytes } from "crypto";
+function sanitizePathSegment(value) {
+  if (!value || typeof value !== "string") {
+    throw new Error("Path segment must be a non-empty string");
+  }
+  if (value === "me") return value;
+  if (/[/\\]/.test(value) || value.includes("..")) {
+    throw new Error(`Invalid path segment: "${value}"`);
+  }
+  return encodeURIComponent(value);
+}
+function sanitizeFileName(name) {
+  if (!name || typeof name !== "string") {
+    throw new Error("File name must be a non-empty string");
+  }
+  const base = basename(name);
+  return base.replace(/[\r\n"\\]/g, "_");
+}
+function validateLocalPath(filePath, allowedBase) {
+  const resolved = resolve(filePath);
+  if (allowedBase) {
+    const resolvedBase = resolve(allowedBase);
+    if (resolved !== resolvedBase && !resolved.startsWith(resolvedBase + sep)) {
+      throw new Error(`Path "${filePath}" escapes the allowed directory "${allowedBase}"`);
+    }
+  }
+  return resolved;
+}
+function validateRedirectUrl(location, allowedHosts) {
+  let parsed;
+  try {
+    parsed = new URL(location);
+  } catch {
+    throw new Error(`Invalid redirect URL: "${location}"`);
+  }
+  if (parsed.protocol !== "https:") {
+    throw new Error(`Redirect URL must use HTTPS: "${location}"`);
+  }
+  const isAllowed = allowedHosts.some(
+    (host) => parsed.hostname === host || parsed.hostname.endsWith("." + host)
+  );
+  if (!isAllowed) {
+    throw new Error(`Redirect to untrusted host: "${parsed.hostname}"`);
+  }
+  return location;
+}
+function generateSecureState() {
+  return randomBytes(32).toString("hex");
+}
+
 // src/api/message.ts
 function buildContent(opts) {
   const type = opts.type ?? "text";
@@ -264,7 +349,11 @@ function buildContent(opts) {
     return { type: "text", text: opts.text };
   }
   if (type === "button") {
-    const actions = opts.actions ? JSON.parse(opts.actions) : [];
+    const actions = opts.actions ? (() => {
+      const parsed = JSON.parse(opts.actions);
+      if (!Array.isArray(parsed)) throw new Error("actions must be a JSON array");
+      return parsed;
+    })() : [];
     return {
       type: "button_template",
       contentText: opts.text,
@@ -272,7 +361,11 @@ function buildContent(opts) {
     };
   }
   if (type === "list") {
-    const elements = opts.elements ? JSON.parse(opts.elements) : [];
+    const elements = opts.elements ? (() => {
+      const parsed = JSON.parse(opts.elements);
+      if (!Array.isArray(parsed)) throw new Error("elements must be a JSON array");
+      return parsed;
+    })() : [];
     return {
       type: "list_template",
       coverData: { text: opts.text },
@@ -294,7 +387,7 @@ async function send(opts) {
   if (opts.to) {
     const result = await request({
       method: "POST",
-      path: `/bots/${creds.botId}/users/${opts.to}/messages`,
+      path: `/bots/${sanitizePathSegment(creds.botId)}/users/${sanitizePathSegment(opts.to)}/messages`,
       body,
       profile
     });
@@ -303,7 +396,7 @@ async function send(opts) {
   if (opts.channel) {
     const result = await request({
       method: "POST",
-      path: `/bots/${creds.botId}/channels/${opts.channel}/messages`,
+      path: `/bots/${sanitizePathSegment(creds.botId)}/channels/${sanitizePathSegment(opts.channel)}/messages`,
       body,
       profile
     });
@@ -320,7 +413,7 @@ async function listMembers(channelId, profile = "default") {
   }
   const result = await request({
     method: "GET",
-    path: `/bots/${creds.botId}/channels/${channelId}/members`,
+    path: `/bots/${sanitizePathSegment(creds.botId)}/channels/${sanitizePathSegment(channelId)}/members`,
     profile
   });
   return { members: result.members ?? [], responseMetaData: result.responseMetaData };
@@ -341,7 +434,8 @@ import { randomUUID } from "crypto";
 
 // src/auth/oauth-user.ts
 import { createServer } from "http";
-import { URL } from "url";
+import { randomBytes as randomBytes2 } from "crypto";
+import { URL as URL2 } from "url";
 var AUTH_URL2 = "https://auth.worksmobile.com/oauth2/v2.0/authorize";
 var TOKEN_URL = "https://auth.worksmobile.com/oauth2/v2.0/token";
 var REDIRECT_PORT = 9876;
@@ -356,14 +450,14 @@ function buildAuthorizeUrl(clientId, scope, state) {
   });
   return `${AUTH_URL2}?${params.toString()}`;
 }
-function waitForAuthCode() {
-  return new Promise((resolve, reject) => {
+function waitForAuthCode(expectedState) {
+  return new Promise((resolve2, reject) => {
     const timeout = setTimeout(() => {
       server.close();
       reject(new AuthError("OAuth login timed out (120s). Try again."));
     }, 12e4);
     const server = createServer((req, res) => {
-      const url = new URL(req.url ?? "/", `http://localhost:${REDIRECT_PORT}`);
+      const url = new URL2(req.url ?? "/", `http://localhost:${REDIRECT_PORT}`);
       if (url.pathname !== "/callback") {
         res.writeHead(404);
         res.end("Not found");
@@ -371,6 +465,15 @@ function waitForAuthCode() {
       }
       const code = url.searchParams.get("code");
       const error = url.searchParams.get("error");
+      const state = url.searchParams.get("state");
+      if (state !== expectedState) {
+        res.writeHead(403, { "Content-Type": "text/html; charset=utf-8" });
+        res.end("<h2>\uBCF4\uC548 \uC624\uB958</h2><p>state \uBD88\uC77C\uCE58. \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC138\uC694.</p>");
+        clearTimeout(timeout);
+        server.close();
+        reject(new AuthError("OAuth state mismatch \u2014 possible CSRF attack."));
+        return;
+      }
       if (error) {
         res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
         res.end("<h2>\uB85C\uADF8\uC778 \uC2E4\uD328</h2><p>\uC774 \uCC3D\uC744 \uB2EB\uC544\uB3C4 \uB429\uB2C8\uB2E4.</p>");
@@ -391,9 +494,9 @@ function waitForAuthCode() {
       res.end("<h2>\uB85C\uADF8\uC778 \uC131\uACF5!</h2><p>\uC774 \uCC3D\uC744 \uB2EB\uACE0 \uD130\uBBF8\uB110\uB85C \uB3CC\uC544\uAC00\uC138\uC694.</p>");
       clearTimeout(timeout);
       server.close();
-      resolve(code);
+      resolve2(code);
     });
-    server.listen(REDIRECT_PORT, () => {
+    server.listen(REDIRECT_PORT, "127.0.0.1", () => {
     });
     server.on("error", (err) => {
       clearTimeout(timeout);
@@ -416,7 +519,8 @@ async function exchangeCodeForToken(code, clientId, clientSecret) {
   });
   if (!res.ok) {
     const text = await res.text();
-    throw new AuthError(`Token exchange failed (${res.status}): ${text}`);
+    const truncated = text.length > 200 ? text.substring(0, 200) + "..." : text;
+    throw new AuthError(`Token exchange failed (${res.status}): ${truncated}`);
   }
   const data = await res.json();
   return {
@@ -441,7 +545,8 @@ async function refreshUserToken(refreshToken2, profile = "default") {
   });
   if (!res.ok) {
     const text = await res.text();
-    throw new AuthError(`Token refresh failed (${res.status}): ${text}`);
+    const truncated = text.length > 200 ? text.substring(0, 200) + "..." : text;
+    throw new AuthError(`Token refresh failed (${res.status}): ${truncated}`);
   }
   const data = await res.json();
   return {
@@ -451,11 +556,28 @@ async function refreshUserToken(refreshToken2, profile = "default") {
     scope: data.scope
   };
 }
-function startOAuthCallbackServer(clientId, clientSecret) {
-  return waitForAuthCode().then(
+function startOAuthCallbackServer(clientId, clientSecret, expectedState) {
+  return waitForAuthCode(expectedState).then(
     (code) => exchangeCodeForToken(code, clientId, clientSecret)
   );
 }
+async function revokeToken(token, clientId, clientSecret) {
+  try {
+    const res = await fetch("https://auth.worksmobile.com/oauth2/v2.0/revoke", {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: new URLSearchParams({
+        token,
+        client_id: clientId,
+        client_secret: clientSecret
+      }).toString()
+    });
+    if (!res.ok && process.env["NWORKS_VERBOSE"] === "1") {
+      console.error(`[nworks] Token revoke returned ${res.status}`);
+    }
+  } catch {
+  }
+}
 
 // src/auth/token-user.ts
 async function getValidUserToken(profile = "default") {
@@ -508,7 +630,7 @@ function normalizeDateTime(dt) {
 async function listEvents(fromDateTime, untilDateTime, userId = "me", profile = "default") {
   const from = encodeURIComponent(fromDateTime);
   const until = encodeURIComponent(untilDateTime);
-  const url = `${BASE_URL2}/users/${userId}/calendar/events?fromDateTime=${from}&untilDateTime=${until}`;
+  const url = `${BASE_URL2}/users/${sanitizePathSegment(userId)}/calendar/events?fromDateTime=${from}&untilDateTime=${until}`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] GET ${url}`);
   }
@@ -545,10 +667,10 @@ async function createEvent(opts) {
     eventComponents: [eventComponent],
     sendNotification: opts.sendNotification ?? false
   };
-  const url = `${BASE_URL2}/users/${userId}/calendar/events`;
+  const url = `${BASE_URL2}/users/${sanitizePathSegment(userId)}/calendar/events`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] POST ${url}`);
-    console.error(`[nworks] Body: ${JSON.stringify(body, null, 2)}`);
+    console.error(`[nworks] Body: ${JSON.stringify(body).length} bytes`);
   }
   const res = await authedFetch(
     url,
@@ -566,7 +688,7 @@ async function createEvent(opts) {
   return await res.json();
 }
 async function getEvent(eventId, userId = "me", profile = "default") {
-  const url = `${BASE_URL2}/users/${userId}/calendar/events/${eventId}`;
+  const url = `${BASE_URL2}/users/${sanitizePathSegment(userId)}/calendar/events/${sanitizePathSegment(eventId)}`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] GET ${url}`);
   }
@@ -609,10 +731,10 @@ async function updateEvent(opts) {
     eventComponents: [eventComponent],
     sendNotification: opts.sendNotification ?? false
   };
-  const url = `${BASE_URL2}/users/${userId}/calendar/events/${opts.eventId}`;
+  const url = `${BASE_URL2}/users/${sanitizePathSegment(userId)}/calendar/events/${sanitizePathSegment(opts.eventId)}`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] PUT ${url}`);
-    console.error(`[nworks] Body: ${JSON.stringify(body, null, 2)}`);
+    console.error(`[nworks] Body: ${JSON.stringify(body).length} bytes`);
   }
   const res = await authedFetch(
     url,
@@ -628,7 +750,7 @@ async function updateEvent(opts) {
 async function deleteEvent(eventId, userId = "me", sendNotification = false, profile = "default") {
   const params = new URLSearchParams();
   params.set("sendNotification", String(sendNotification));
-  const url = `${BASE_URL2}/users/${userId}/calendar/events/${eventId}?${params.toString()}`;
+  const url = `${BASE_URL2}/users/${sanitizePathSegment(userId)}/calendar/events/${sanitizePathSegment(eventId)}?${params.toString()}`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] DELETE ${url}`);
   }
@@ -638,9 +760,15 @@ async function deleteEvent(eventId, userId = "me", sendNotification = false, pro
 }
 
 // src/api/drive.ts
-import { readFile as readFile3, stat } from "fs/promises";
-import { basename } from "path";
+import { readFile as readFile3, stat as stat2 } from "fs/promises";
+import { basename as basename2 } from "path";
 var BASE_URL3 = "https://www.worksapis.com/v1.0";
+var MAX_UPLOAD_SIZE = 100 * 1024 * 1024;
+var ALLOWED_HOSTS = [
+  "storage.worksmobile.com",
+  "www.worksapis.com",
+  "worksapis.com"
+];
 async function authedFetch2(url, init, profile) {
   const token = await getValidUserToken(profile);
   const headers = new Headers(init.headers);
@@ -662,8 +790,8 @@ async function handleError2(res) {
   throw new ApiError(code, description, res.status);
 }
 async function listFiles(userId = "me", folderId, count = 20, cursor, profile = "default") {
-  const base = `${BASE_URL3}/users/${userId}/drive/files`;
-  const path = folderId ? `${base}/${folderId}/children` : base;
+  const base = `${BASE_URL3}/users/${sanitizePathSegment(userId)}/drive/files`;
+  const path = folderId ? `${base}/${sanitizePathSegment(folderId)}/children` : base;
   const params = new URLSearchParams();
   params.set("count", String(count));
   if (cursor) params.set("cursor", cursor);
@@ -677,11 +805,15 @@ async function listFiles(userId = "me", folderId, count = 20, cursor, profile =
   return { files: data.files ?? [], responseMetaData: data.responseMetaData };
 }
 async function uploadFile(localPath, userId = "me", folderId, overwrite = false, profile = "default") {
-  const fileName = basename(localPath);
-  const fileStat = await stat(localPath);
+  const fileName = basename2(localPath);
+  const safeName = sanitizeFileName(fileName);
+  const fileStat = await stat2(localPath);
   const fileSize = fileStat.size;
-  const base = `${BASE_URL3}/users/${userId}/drive/files`;
-  const createUrl = folderId ? `${base}/${folderId}` : base;
+  if (fileSize > MAX_UPLOAD_SIZE) {
+    throw new ApiError("FILE_TOO_LARGE", `File size (${fileSize} bytes) exceeds maximum allowed (${MAX_UPLOAD_SIZE} bytes)`, 413);
+  }
+  const base = `${BASE_URL3}/users/${sanitizePathSegment(userId)}/drive/files`;
+  const createUrl = folderId ? `${base}/${sanitizePathSegment(folderId)}` : base;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] POST ${createUrl} (create upload URL)`);
   }
@@ -696,11 +828,12 @@ async function uploadFile(localPath, userId = "me", folderId, overwrite = false,
   );
   if (!createRes.ok) return handleError2(createRes);
   const { uploadUrl } = await createRes.json();
+  validateRedirectUrl(uploadUrl, ALLOWED_HOSTS);
   const fileBuffer = await readFile3(localPath);
   const boundary = `----nworks${Date.now()}`;
   const header = Buffer.from(
     `--${boundary}\r
-Content-Disposition: form-data; name="Filedata"; filename="${fileName}"\r
+Content-Disposition: form-data; name="Filedata"; filename="${safeName}"\r
 Content-Type: application/octet-stream\r
 \r
 `
@@ -726,8 +859,11 @@ Content-Type: application/octet-stream\r
 }
 async function uploadBuffer(fileBuffer, fileName, userId = "me", folderId, overwrite = false, profile = "default") {
   const fileSize = fileBuffer.length;
-  const base = `${BASE_URL3}/users/${userId}/drive/files`;
-  const createUrl = folderId ? `${base}/${folderId}` : base;
+  if (fileSize > MAX_UPLOAD_SIZE) {
+    throw new ApiError("FILE_TOO_LARGE", `File size (${fileSize} bytes) exceeds maximum allowed (${MAX_UPLOAD_SIZE} bytes)`, 413);
+  }
+  const base = `${BASE_URL3}/users/${sanitizePathSegment(userId)}/drive/files`;
+  const createUrl = folderId ? `${base}/${sanitizePathSegment(folderId)}` : base;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] POST ${createUrl} (create upload URL for buffer)`);
   }
@@ -742,10 +878,11 @@ async function uploadBuffer(fileBuffer, fileName, userId = "me", folderId, overw
   );
   if (!createRes.ok) return handleError2(createRes);
   const { uploadUrl } = await createRes.json();
+  validateRedirectUrl(uploadUrl, ALLOWED_HOSTS);
   const boundary = `----nworks${Date.now()}`;
   const header = Buffer.from(
     `--${boundary}\r
-Content-Disposition: form-data; name="Filedata"; filename="${fileName}"\r
+Content-Disposition: form-data; name="Filedata"; filename="${sanitizeFileName(fileName)}"\r
 Content-Type: application/octet-stream\r
 \r
 `
@@ -770,7 +907,7 @@ Content-Type: application/octet-stream\r
   return await uploadRes.json();
 }
 async function downloadFile(fileId, userId = "me", profile = "default") {
-  const url = `${BASE_URL3}/users/${userId}/drive/files/${fileId}/download`;
+  const url = `${BASE_URL3}/users/${sanitizePathSegment(userId)}/drive/files/${sanitizePathSegment(fileId)}/download`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] GET ${url} (get download URL)`);
   }
@@ -787,10 +924,11 @@ async function downloadFile(fileId, userId = "me", profile = "default") {
     if (!redirectRes.ok) return handleError2(redirectRes);
     throw new ApiError("NO_REDIRECT", "No download URL returned", redirectRes.status);
   }
+  const safeLocation = validateRedirectUrl(location, ALLOWED_HOSTS);
   if (process.env["NWORKS_VERBOSE"] === "1") {
-    console.error(`[nworks] GET ${location} (download content)`);
+    console.error(`[nworks] GET ${safeLocation} (download content)`);
   }
-  const downloadRes = await authedFetch2(location, { method: "GET" }, profile);
+  const downloadRes = await fetch(safeLocation, { method: "GET" });
   if (!downloadRes.ok) return handleError2(downloadRes);
   const arrayBuffer = await downloadRes.arrayBuffer();
   const buffer = Buffer.from(arrayBuffer);
@@ -830,7 +968,7 @@ async function handleError3(res) {
 async function sendMail(opts) {
   const userId = opts.userId ?? "me";
   const profile = opts.profile ?? "default";
-  const url = `${BASE_URL4}/users/${userId}/mail`;
+  const url = `${BASE_URL4}/users/${sanitizePathSegment(userId)}/mail`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] POST ${url}`);
   }
@@ -859,7 +997,7 @@ async function listMails(folderId = 0, userId = "me", count = 30, cursor, isUnre
   params.set("count", String(count));
   if (cursor) params.set("cursor", cursor);
   if (isUnread) params.set("isUnread", "true");
-  const url = `${BASE_URL4}/users/${userId}/mail/mailfolders/${folderId}/children?${params.toString()}`;
+  const url = `${BASE_URL4}/users/${sanitizePathSegment(userId)}/mail/mailfolders/${sanitizePathSegment(String(folderId))}/children?${params.toString()}`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] GET ${url}`);
   }
@@ -875,7 +1013,7 @@ async function listMails(folderId = 0, userId = "me", count = 30, cursor, isUnre
   };
 }
 async function readMail(mailId, userId = "me", profile = "default") {
-  const url = `${BASE_URL4}/users/${userId}/mail/${mailId}`;
+  const url = `${BASE_URL4}/users/${sanitizePathSegment(userId)}/mail/${sanitizePathSegment(String(mailId))}`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] GET ${url}`);
   }
@@ -908,7 +1046,7 @@ async function handleError4(res) {
 }
 async function resolveUserId(userId, profile) {
   if (userId !== "me") return userId;
-  const url = `${BASE_URL5}/users/me`;
+  const url = `${BASE_URL5}/users/${sanitizePathSegment(userId)}`;
   const res = await authedFetch4(url, { method: "GET" }, profile);
   if (!res.ok) return handleError4(res);
   const data = await res.json();
@@ -923,7 +1061,7 @@ async function listTasks(categoryId = "default", userId = "me", count = 50, curs
   params.set("count", String(count));
   params.set("status", status);
   if (cursor) params.set("cursor", cursor);
-  const url = `${BASE_URL5}/users/${userId}/tasks?${params.toString()}`;
+  const url = `${BASE_URL5}/users/${sanitizePathSegment(userId)}/tasks?${params.toString()}`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] GET ${url}`);
   }
@@ -947,10 +1085,10 @@ async function createTask(opts) {
   };
   if (opts.dueDate) body.dueDate = opts.dueDate;
   if (opts.categoryId) body.categoryId = opts.categoryId;
-  const url = `${BASE_URL5}/users/${userId}/tasks`;
+  const url = `${BASE_URL5}/users/${sanitizePathSegment(userId)}/tasks`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] POST ${url}`);
-    console.error(`[nworks] Body: ${JSON.stringify(body, null, 2)}`);
+    console.error(`[nworks] Body: ${JSON.stringify(body).length} bytes`);
   }
   const res = await authedFetch4(
     url,
@@ -973,7 +1111,7 @@ async function updateTask(opts) {
   if (opts.title !== void 0) body.title = opts.title;
   if (opts.content !== void 0) body.content = opts.content;
   if (opts.dueDate !== void 0) body.dueDate = opts.dueDate;
-  const url = `${BASE_URL5}/tasks/${opts.taskId}`;
+  const url = `${BASE_URL5}/tasks/${sanitizePathSegment(opts.taskId)}`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] PATCH ${url}`);
   }
@@ -990,7 +1128,7 @@ async function updateTask(opts) {
   return await res.json();
 }
 async function completeTask(taskId, profile = "default") {
-  const url = `${BASE_URL5}/tasks/${taskId}/complete`;
+  const url = `${BASE_URL5}/tasks/${sanitizePathSegment(taskId)}/complete`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] POST ${url}`);
   }
@@ -1003,7 +1141,7 @@ async function completeTask(taskId, profile = "default") {
   if (!res.ok) return handleError4(res);
 }
 async function incompleteTask(taskId, profile = "default") {
-  const url = `${BASE_URL5}/tasks/${taskId}/incomplete`;
+  const url = `${BASE_URL5}/tasks/${sanitizePathSegment(taskId)}/incomplete`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] POST ${url}`);
   }
@@ -1016,7 +1154,7 @@ async function incompleteTask(taskId, profile = "default") {
   if (!res.ok) return handleError4(res);
 }
 async function deleteTask(taskId, profile = "default") {
-  const url = `${BASE_URL5}/tasks/${taskId}`;
+  const url = `${BASE_URL5}/tasks/${sanitizePathSegment(taskId)}`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] DELETE ${url}`);
   }
@@ -1070,7 +1208,7 @@ async function listBoards(count = 20, cursor, profile = "default") {
   if (!res.ok) return handleError5(res);
   const text = await res.text();
   if (process.env["NWORKS_VERBOSE"] === "1") {
-    console.error(`[nworks] Response: ${text}`);
+    console.error(`[nworks] Response: ${res.status} (${text.length} bytes)`);
   }
   const data = safeParseJson(text);
   return { boards: data.boards ?? [], responseMetaData: data.responseMetaData };
@@ -1079,7 +1217,7 @@ async function listPosts(boardId, count = 20, cursor, profile = "default") {
   const params = new URLSearchParams();
   params.set("count", String(count));
   if (cursor) params.set("cursor", cursor);
-  const url = `${BASE_URL6}/boards/${boardId}/posts?${params.toString()}`;
+  const url = `${BASE_URL6}/boards/${sanitizePathSegment(boardId)}/posts?${params.toString()}`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] GET ${url}`);
   }
@@ -1087,13 +1225,13 @@ async function listPosts(boardId, count = 20, cursor, profile = "default") {
   if (!res.ok) return handleError5(res);
   const text = await res.text();
   if (process.env["NWORKS_VERBOSE"] === "1") {
-    console.error(`[nworks] Response: ${text}`);
+    console.error(`[nworks] Response: ${res.status} (${text.length} bytes)`);
   }
   const data = safeParseJson(text);
   return { posts: data.posts ?? [], responseMetaData: data.responseMetaData };
 }
 async function readPost(boardId, postId, profile = "default") {
-  const url = `${BASE_URL6}/boards/${boardId}/posts/${postId}`;
+  const url = `${BASE_URL6}/boards/${sanitizePathSegment(boardId)}/posts/${sanitizePathSegment(postId)}`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] GET ${url}`);
   }
@@ -1101,7 +1239,7 @@ async function readPost(boardId, postId, profile = "default") {
   if (!res.ok) return handleError5(res);
   const text = await res.text();
   if (process.env["NWORKS_VERBOSE"] === "1") {
-    console.error(`[nworks] Response: ${text}`);
+    console.error(`[nworks] Response: ${res.status} (${text.length} bytes)`);
   }
   return safeParseJson(text);
 }
@@ -1113,10 +1251,10 @@ async function createPost(opts) {
   };
   if (opts.enableComment !== void 0) body.enableComment = opts.enableComment;
   if (opts.sendNotifications !== void 0) body.sendNotifications = opts.sendNotifications;
-  const url = `${BASE_URL6}/boards/${opts.boardId}/posts`;
+  const url = `${BASE_URL6}/boards/${sanitizePathSegment(opts.boardId)}/posts`;
   if (process.env["NWORKS_VERBOSE"] === "1") {
     console.error(`[nworks] POST ${url}`);
-    console.error(`[nworks] Body: ${JSON.stringify(body, null, 2)}`);
+    console.error(`[nworks] Body: ${JSON.stringify(body).length} bytes`);
   }
   const res = await authedFetch5(
     url,
@@ -1130,7 +1268,7 @@ async function createPost(opts) {
   if (res.status === 201 || res.ok) {
     const text = await res.text();
     if (process.env["NWORKS_VERBOSE"] === "1") {
-      console.error(`[nworks] Response: ${text}`);
+      console.error(`[nworks] Response: ${res.status} (${text.length} bytes)`);
     }
     return safeParseJson(text);
   }
@@ -1506,7 +1644,7 @@ OAuth Redirect URI: http://localhost:9876/callback`,
                 success: true,
                 message: "\uC778\uC99D \uC815\uBCF4\uAC00 \uC800\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.",
                 nextSteps,
-                clientId,
+                clientId: mask(clientId),
                 clientSecret: `${mask(resolvedSecret)} (\uD658\uACBD\uBCC0\uC218)`,
                 serviceAccount: serviceAccount ?? null,
                 privateKeyPath: resolvedPrivateKeyPath ? `${mask(resolvedPrivateKeyPath)} (\uD658\uACBD\uBCC0\uC218)` : null,
@@ -1642,7 +1780,17 @@ OAuth Redirect URI: http://localhost:9876/callback`,
       sendNotification: z.boolean().optional().describe("\uCC38\uC11D\uC790\uC5D0\uAC8C \uC54C\uB9BC \uBC1C\uC1A1 (\uAE30\uBCF8: false)"),
       userId: z.string().optional().describe("\uB300\uC0C1 \uC0AC\uC6A9\uC790 ID (\uBBF8\uC9C0\uC815 \uC2DC me)")
     },
-    async ({ summary, start, end, timeZone, description, location, attendees, sendNotification, userId }) => {
+    async ({
+      summary,
+      start,
+      end,
+      timeZone,
+      description,
+      location,
+      attendees,
+      sendNotification,
+      userId
+    }) => {
       try {
         const result = await createEvent({
           summary,
@@ -1681,7 +1829,17 @@ OAuth Redirect URI: http://localhost:9876/callback`,
       sendNotification: z.boolean().optional().describe("\uCC38\uC11D\uC790\uC5D0\uAC8C \uC54C\uB9BC \uBC1C\uC1A1 (\uAE30\uBCF8: false)"),
       userId: z.string().optional().describe("\uB300\uC0C1 \uC0AC\uC6A9\uC790 ID (\uBBF8\uC9C0\uC815 \uC2DC me)")
     },
-    async ({ eventId, summary, start, end, timeZone, description, location, sendNotification, userId }) => {
+    async ({
+      eventId,
+      summary,
+      start,
+      end,
+      timeZone,
+      description,
+      location,
+      sendNotification,
+      userId
+    }) => {
       try {
         await updateEvent({
           eventId,
@@ -1794,11 +1952,12 @@ OAuth Redirect URI: http://localhost:9876/callback`,
             overwrite ?? false
           );
         } else if (filePath) {
+          const safePath = validateLocalPath(filePath);
           if (process.env["NWORKS_VERBOSE"] === "1") {
-            console.error(`[nworks] MCP upload: filePath=${filePath}`);
+            console.error(`[nworks] MCP upload: filePath=${safePath}`);
           }
           result = await uploadFile(
-            filePath,
+            safePath,
             userId ?? "me",
             folderId,
             overwrite ?? false
@@ -1813,10 +1972,11 @@ OAuth Redirect URI: http://localhost:9876/callback`,
           content: [{ type: "text", text: JSON.stringify({ success: true, ...result }) }]
         };
       } catch (err) {
-        const error = err;
-        const detail = process.env["NWORKS_VERBOSE"] === "1" ? ` | stack: ${error.stack}` : "";
+        if (process.env["NWORKS_VERBOSE"] === "1") {
+          console.error(`[nworks] drive upload error: ${err.stack}`);
+        }
         return {
-          content: [{ type: "text", text: `${mcpErrorHint(err, "drive.upload")}${detail}` }],
+          content: [{ type: "text", text: mcpErrorHint(err, "drive.upload") }],
           isError: true
         };
       }
@@ -1841,7 +2001,10 @@ OAuth Redirect URI: http://localhost:9876/callback`,
         if (outputDir) {
           const { writeFile: writeFile2 } = await import("fs/promises");
           const { join: join2 } = await import("path");
-          const outPath = join2(outputDir, fileName);
+          const safeDir = validateLocalPath(outputDir);
+          const safeName = sanitizeFileName(fileName);
+          const outPath = join2(safeDir, safeName);
+          validateLocalPath(outPath, safeDir);
           await writeFile2(outPath, result.buffer);
           return {
             content: [{ type: "text", text: JSON.stringify({ success: true, fileName, path: outPath, size: result.buffer.length }) }]
@@ -2262,9 +2425,9 @@ OAuth Redirect URI: http://localhost:9876/callback`,
         const existingScopes = existingToken?.scope?.split(" ").filter(Boolean) ?? [];
         const requestedScopes = expandScopes((scope ?? DEFAULT_SCOPE).split(" ").filter(Boolean));
         const mergedScopes = [.../* @__PURE__ */ new Set([...existingScopes, ...requestedScopes])].join(" ");
-        const state = Math.random().toString(36).substring(2);
+        const state = generateSecureState();
         const authorizeUrl = buildAuthorizeUrl(creds.clientId, mergedScopes, state);
-        startOAuthCallbackServer(creds.clientId, creds.clientSecret).then(
+        startOAuthCallbackServer(creds.clientId, creds.clientSecret, state).then(
           (token) => saveUserToken({
             accessToken: token.accessToken,
             refreshToken: token.refreshToken,
@@ -2309,9 +2472,10 @@ OAuth Redirect URI: http://localhost:9876/callback`,
         const userToken = await loadUserToken();
         const isValid = token ? token.expiresAt > Date.now() / 1e3 : false;
         const userTokenValid = userToken ? userToken.expiresAt > Date.now() / 1e3 : false;
+        const mask = (s) => s.length <= 4 ? "****" : `****${s.slice(-4)}`;
         const info = {
           serviceAccount: creds.serviceAccount ?? null,
-          clientId: creds.clientId,
+          clientId: mask(creds.clientId),
           botId: creds.botId ?? null,
           tokenValid: isValid,
           userOAuth: userToken ? { valid: userTokenValid, scope: userToken.scope } : null
@@ -2333,6 +2497,18 @@ OAuth Redirect URI: http://localhost:9876/callback`,
     {},
     async () => {
       try {
+        try {
+          const creds = await loadCredentials();
+          const token = await loadToken();
+          const userToken = await loadUserToken();
+          if (token?.accessToken) {
+            await revokeToken(token.accessToken, creds.clientId, creds.clientSecret);
+          }
+          if (userToken?.refreshToken) {
+            await revokeToken(userToken.refreshToken, creds.clientId, creds.clientSecret);
+          }
+        } catch {
+        }
         await clearCredentials();
         return {
           content: [
@@ -2360,8 +2536,21 @@ OAuth Redirect URI: http://localhost:9876/callback`,
     async () => {
       try {
         const results = await runChecks("default");
+        const maskedResults = results.map((r) => {
+          if (r.check === "credentials" && r.status === "OK") {
+            return { ...r, detail: r.detail.replace(/clientId: .+/, "clientId: ****") };
+          }
+          if (r.check === "privateKey" && r.status === "OK") {
+            return { ...r, detail: "OK (path hidden)" };
+          }
+          if (r.check === "serviceAccount" && r.status === "OK") {
+            const masked = r.detail.length <= 4 ? "****" : `****${r.detail.slice(-4)}`;
+            return { ...r, detail: masked };
+          }
+          return r;
+        });
         return {
-          content: [{ type: "text", text: JSON.stringify(results) }]
+          content: [{ type: "text", text: JSON.stringify(maskedResults) }]
         };
       } catch (err) {
         return {