From 9dc559a43a4d3a9da7749783d992319970539837 Mon Sep 17 00:00:00 2001
From: stswangzhiping <59632378+stswangzhiping@users.noreply.github.com>
Date: Mon, 16 Mar 2026 16:15:13 +0800
Subject: [PATCH] fix: run ttyd shell as normal user (sts) instead of root

Made-with: Cursor
---
 .commitmsg  | 6 ------
 lib/frpc.js | 7 +++++--
 2 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 .commitmsg

diff --git a/.commitmsg b/.commitmsg
deleted file mode 100644
index 6a05fa9..0000000
--- a/.commitmsg
+++ /dev/null
@@ -1,6 +0,0 @@
-ui: redesign WiFi list with signal bars and cleaner layout
-
-- Replace <select> with scrollable list of clickable items
-- Show signal strength as 4-bar icon instead of percentage text
-- Remove security info from parentheses, show lock icon only
-- Smaller font size for compact mobile display
diff --git a/lib/frpc.js b/lib/frpc.js
index cdd61c8..54d0d31 100644
--- a/lib/frpc.js
+++ b/lib/frpc.js
@@ -119,12 +119,15 @@ async function startTtyd() {
 
   try {
     const shell = fs.existsSync('/bin/bash') ? '/bin/bash' : '/bin/sh';
-    const proc = spawn(TTYD_BIN, ['-p', String(TTYD_PORT), '-i', '127.0.0.1', '-W', '-t', 'cursorBlink=true', shell], {
+    // 以普通用户身份启动 shell（与 SSH 登录一致）
+    const ttydUser = process.env.CLAWD_TTY_USER || 'sts';
+    const loginCmd = `/bin/su - ${ttydUser}`;
+    const proc = spawn(TTYD_BIN, ['-p', String(TTYD_PORT), '-i', '127.0.0.1', '-W', '-t', 'cursorBlink=true', loginCmd], {
       stdio: 'ignore',
       detached: true,
     });
     proc.unref();
-    log.info('ttyd', `已启动，端口 ${TTYD_PORT}，shell=${shell}`);
+    log.info('ttyd', `已启动，端口 ${TTYD_PORT}，用户=${ttydUser}`);
     return true;
   } catch (e) {
     log.warn('ttyd', '启动失败:', e.message);