Remove unreachable code and ensure consistent escaping for both Debian and Alpine

Co-authored-by: whyour <22700758+whyour@users.noreply.github.com>

.github/workflows/build-docker-image.yml

@@ -129,6 +129,13 @@ jobs:
         with:
           cache: "pnpm"
 
+      - name: Read version from version.yaml
+        id: version
+        run: |
+          VERSION=$(grep '^version:' version.yaml | awk '{print $2}')
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Version: $VERSION"
+
       - name: Setup timezone
         uses: szenius/set-timezone@v2.0
         with:
@@ -154,19 +161,13 @@ jobs:
           images: |
             ${{ github.repository }}
             ghcr.io/${{ github.repository }}
-          # generate Docker tags based on the following events/attributes
-          #   nightly, master, pr-2, 1.2.3, 1.2, 1
           flavor: |
             latest=false
           tags: |
-            type=schedule,pattern=nightly
-            type=edge
-            type=ref,event=pr
-            type=ref,event=branch,enable=${{ github.ref != format('refs/heads/{0}', 'master') }}
+            type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'develop') }}
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+            type=raw,value=${{ steps.version.outputs.version }},enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
             type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -216,6 +217,13 @@ jobs:
         with:
           cache: "pnpm"
 
+      - name: Read version from version.yaml
+        id: version
+        run: |
+          VERSION=$(grep '^version:' version.yaml | awk '{print $2}')
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Version: $VERSION"
+
       - name: Setup timezone
         uses: szenius/set-timezone@v2.0
         with:
@@ -254,7 +262,9 @@ jobs:
           context: .
           file: ./docker/310.Dockerfile
           push: true
-          tags: whyour/qinglong:python3.10
+          tags: |
+            whyour/qinglong:python3.10
+            whyour/qinglong:${{ steps.version.outputs.version }}-python3.10
           cache-from: type=registry,ref=whyour/qinglong:cache-python3.10
           cache-to: type=registry,ref=whyour/qinglong:cache-python3.10,mode=max
 

back/api/script.ts

@@ -129,6 +129,7 @@ export default (app: Router) => {
         content: Joi.string().optional().allow(''),
         originFilename: Joi.string().optional().allow(''),
         directory: Joi.string().optional().allow(''),
+        file: Joi.string().optional().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -175,6 +176,7 @@ export default (app: Router) => {
           path,
           `${originFilename.replace(/\//g, '')}`,
         );
+        await fs.mkdir(path, { recursive: true });
         const filePath = join(path, `${filename.replace(/\//g, '')}`);
         const fileExists = await fileExist(filePath);
         if (fileExists) {

back/data/notify.ts

@@ -142,6 +142,7 @@ export class WebhookNotification extends NotificationBaseInfo {
 
 export class LarkNotification extends NotificationBaseInfo {
   public larkKey = '';
+  public larkSecret = '';
 }
 
 export class NtfyNotification extends NotificationBaseInfo {

back/services/dependence.ts

@@ -107,7 +107,7 @@ export default class DependenceService {
     query: any = {},
   ): Promise<Dependence[]> {
     let condition = query;
-    if (DependenceTypes[type]) {
+    if (type && DependenceTypes[type] !== undefined) {
       condition.type = DependenceTypes[type];
     }
     if (status) {

back/services/notify.ts

@@ -550,19 +550,33 @@ export default class NotificationService {
   }
 
   private async lark() {
-    let { larkKey } = this.params;
+    let { larkKey, larkSecret } = this.params;
 
     if (!larkKey.startsWith('http')) {
       larkKey = `https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`;
     }
 
+    const body: Record<string, any> = {
+      msg_type: 'text',
+      content: { text: `${this.title}\n\n${this.content}` },
+    };
+
+    // Add signature if secret is provided
+    // Note: Feishu's signature algorithm uses timestamp+"\n"+secret as the HMAC key
+    // and signs an empty message, which differs from typical HMAC usage
+    if (larkSecret) {
+      const timestamp = Math.floor(Date.now() / 1000).toString();
+      const stringToSign = `${timestamp}\n${larkSecret}`;
+      const hmac = crypto.createHmac('sha256', stringToSign);
+      const sign = hmac.digest('base64');
+      body.timestamp = timestamp;
+      body.sign = sign;
+    }
+
     try {
       const res = await httpClient.post(larkKey, {
         ...this.gotOption,
-        json: {
-          msg_type: 'text',
-          content: { text: `${this.title}\n\n${this.content}` },
-        },
+        json: body,
         headers: { 'Content-Type': 'application/json' },
       });
       if (res.StatusCode === 0 || res.code === 0) {

back/services/system.ts

@@ -218,28 +218,108 @@ export default class SystemService {
       ...oDoc,
       info: { ...oDoc.info, ...info },
     });
-    let defaultDomain = 'https://dl-cdn.alpinelinux.org';
-    let targetDomain = 'https://dl-cdn.alpinelinux.org';
+    
     if (os.platform() !== 'linux') {
       return;
     }
-    const content = await fs.promises.readFile('/etc/apk/repositories', {
-      encoding: 'utf-8',
-    });
-    const domainMatch = content.match(/(http.*)\/alpine\/.*/);
-    if (domainMatch) {
-      defaultDomain = domainMatch[1];
+
+    let command = '';
+    
+    // Check if this is a Debian-based system (including Armbian)
+    // Check for both sources.list and debian_version for more reliable detection
+    const hasAptSourcesList = await fs.promises.access('/etc/apt/sources.list')
+      .then(() => true)
+      .catch(() => false);
+    const hasDebianVersion = await fs.promises.access('/etc/debian_version')
+      .then(() => true)
+      .catch(() => false);
+    const isDebianBased = hasAptSourcesList || hasDebianVersion;
+    
+    if (isDebianBased) {
+      // Handle Debian/Ubuntu/Armbian systems
+      let defaultDomain = '';
+      let targetDomain = info.linuxMirror || '';
+      
+      try {
+        // Read the current sources.list
+        const content = await fs.promises.readFile('/etc/apt/sources.list', {
+          encoding: 'utf-8',
+        });
+        
+        // Match the first deb line to extract the current mirror
+        // Note: This assumes all mirrors in sources.list use the same base URL
+        // If multiple different mirrors are configured, only the first one will be replaced
+        const debMatch = content.match(/^deb\s+(https?:\/\/[^\s]+)/m);
+        if (debMatch) {
+          defaultDomain = debMatch[1];
+        }
+        
+        if (defaultDomain && targetDomain) {
+          // Sanitize and escape special characters for sed
+          // Escape backslashes first, then other special characters
+          const escapedDefault = defaultDomain
+            .replace(/\\/g, '\\\\')  // Escape backslashes first
+            .replace(/\//g, '\\/')   // Escape forward slashes
+            .replace(/\./g, '\\.');  // Escape dots
+          const escapedTarget = targetDomain
+            .replace(/\\/g, '\\\\')  // Escape backslashes first
+            .replace(/\//g, '\\/');  // Escape forward slashes
+          
+          // Replace mirror URL in main sources.list
+          command = `sed -i 's/${escapedDefault}/${escapedTarget}/g' /etc/apt/sources.list`;
+          
+          // Also update sources.list.d if it exists
+          command += ` && if [ -d /etc/apt/sources.list.d ]; then find /etc/apt/sources.list.d -type f \\( -name "*.list" -o -name "*.sources" \\) -exec sed -i 's/${escapedDefault}/${escapedTarget}/g' {} \\;; fi`;
+          
+          // Update package lists
+          command += ` && apt-get update`;
+        } else if (!defaultDomain && targetDomain) {
+          // Cannot detect current mirror, log warning
+          this.logger.warn('Unable to detect current mirror from /etc/apt/sources.list. Mirror update skipped.');
+          this.sockService.sendMessage({
+            type: 'updateLinuxMirror',
+            message: 'Warning: Unable to detect current mirror. Please manually configure /etc/apt/sources.list',
+          });
+        }
+      } catch (error) {
+        this.logger.error('Failed to read /etc/apt/sources.list', error);
+      }
+    } else {
+      // Handle Alpine Linux systems
+      let defaultDomain = 'https://dl-cdn.alpinelinux.org';
+      let targetDomain = 'https://dl-cdn.alpinelinux.org';
+      
+      try {
+        const content = await fs.promises.readFile('/etc/apk/repositories', {
+          encoding: 'utf-8',
+        });
+        const domainMatch = content.match(/(http.*)\/alpine\/.*/);
+        if (domainMatch) {
+          defaultDomain = domainMatch[1];
+        }
+        if (info.linuxMirror) {
+          targetDomain = info.linuxMirror;
+        }
+        // Sanitize and escape special characters for sed
+        // Escape backslashes first, then other special characters
+        command = `sed -i 's/${defaultDomain
+          .replace(/\\/g, '\\\\')  // Escape backslashes first
+          .replace(/\//g, '\\/')   // Escape forward slashes
+          .replace(/\./g, '\\.')}/${targetDomain
+          .replace(/\\/g, '\\\\')  // Escape backslashes first
+          .replace(/\//g, '\\/')}/g' /etc/apk/repositories && apk update -f`;
+      } catch (error) {
+        this.logger.error('Failed to read /etc/apk/repositories', error);
+      }
     }
-    if (info.linuxMirror) {
-      targetDomain = info.linuxMirror;
+
+    if (!command) {
+      this.sockService.sendMessage({
+        type: 'updateLinuxMirror',
+        message: 'No supported package manager found or mirror not configured',
+      });
+      return;
     }
-    const command = `sed -i 's/${defaultDomain.replace(
-      /\//g,
-      '\\/',
-    )}/${targetDomain.replace(
-      /\//g,
-      '\\/',
-    )}/g' /etc/apk/repositories && apk update -f`;
 
     this.scheduleService.runTask(
       command,

back/shared/runCron.ts

@@ -15,11 +15,11 @@ export function runCron(cmd: string, cron: ICron): Promise<number | void> {
         });
 
         // Default to single instance mode (0) for backward compatibility
-        const allowMultipleInstances =
-          existingCron?.allow_multiple_instances === 1;
+        const allowSingleInstances =
+          existingCron?.allow_multiple_instances === 0;
 
         if (
-          !allowMultipleInstances &&
+          allowSingleInstances &&
           existingCron &&
           existingCron.pid &&
           (existingCron.status === CrontabStatus.running ||

back/validation/schedule.ts

@@ -81,5 +81,5 @@ export const commonCronSchema = {
       'string.max': '日志名称不能超过100个字符',
       'string.unsafePath': '绝对路径必须在日志目录内或使用 /dev/null',
     }),
-  allow_multiple_instances: Joi.number().optional().valid(0, 1),
+  allow_multiple_instances: Joi.number().optional().valid(0, 1).allow(null),
 };

sample/notify.js

@@ -52,6 +52,7 @@ const push_config = {
   DD_BOT_TOKEN: '', // 钉钉机器人的 DD_BOT_TOKEN
 
   FSKEY: '', // 飞书机器人的 FSKEY
+  FSSECRET: '', // 飞书机器人的 FSSECRET，对应安全设置里的签名校验密钥
 
   // 推送到个人QQ：http://127.0.0.1/send_private_msg
   // 群：http://127.0.0.1/send_group_msg
@@ -989,11 +990,26 @@ function aibotkNotify(text, desp) {
 
 function fsBotNotify(text, desp) {
   return new Promise((resolve) => {
-    const { FSKEY } = push_config;
+    const { FSKEY, FSSECRET } = push_config;
     if (FSKEY) {
+      const body = { msg_type: 'text', content: { text: `${text}\n\n${desp}` } };
+
+      // Add signature if secret is provided
+      // Note: Feishu's signature algorithm uses timestamp+"\n"+secret as the HMAC key
+      // and signs an empty message, which differs from typical HMAC usage
+      if (FSSECRET) {
+        const crypto = require('crypto');
+        const timestamp = Math.floor(Date.now() / 1000).toString();
+        const stringToSign = `${timestamp}\n${FSSECRET}`;
+        const hmac = crypto.createHmac('sha256', stringToSign);
+        const sign = hmac.digest('base64');
+        body.timestamp = timestamp;
+        body.sign = sign;
+      }
+
       const options = {
         url: `https://open.feishu.cn/open-apis/bot/v2/hook/${FSKEY}`,
-        json: { msg_type: 'text', content: { text: `${text}\n\n${desp}` } },
+        json: body,
         headers: {
           'Content-Type': 'application/json',
         },

sample/notify.py

@@ -49,6 +49,7 @@ push_config = {
     'DD_BOT_TOKEN': '',                 # 钉钉机器人的 DD_BOT_TOKEN
 
     'FSKEY': '',                        # 飞书机器人的 FSKEY
+    'FSSECRET': '',                     # 飞书机器人的 FSSECRET，对应安全设置里的签名校验密钥
 
     'GOBOT_URL': '',                    # go-cqhttp
                                         # 推送到个人QQ：http://127.0.0.1/send_private_msg
@@ -233,6 +234,20 @@ def feishu_bot(title: str, content: str) -> None:
 
     url = f'https://open.feishu.cn/open-apis/bot/v2/hook/{push_config.get("FSKEY")}'
     data = {"msg_type": "text", "content": {"text": f"{title}\n\n{content}"}}
+
+    # Add signature if secret is provided
+    # Note: Feishu's signature algorithm uses timestamp+"\n"+secret as the HMAC key
+    # and signs an empty message, which differs from typical HMAC usage
+    if push_config.get("FSSECRET"):
+        timestamp = str(int(time.time()))
+        string_to_sign = f'{timestamp}\n{push_config.get("FSSECRET")}'
+        hmac_code = hmac.new(
+            string_to_sign.encode("utf-8"), digestmod=hashlib.sha256
+        ).digest()
+        sign = base64.b64encode(hmac_code).decode("utf-8")
+        data["timestamp"] = timestamp
+        data["sign"] = sign
+
     response = requests.post(url, data=json.dumps(data)).json()
 
     if response.get("StatusCode") == 0 or response.get("code") == 0:

src/locales/en-US.json

@@ -389,6 +389,7 @@
   "消息接收人": "message recipient",
   "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版": "Version, you can specify 'pro' for the Professional version and 'personal' for the Personal version. If left blank, it will default to the Professional version.",
   "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "Feishu group bot: https://www.feishu.cn/hc/zh-CN/articles/360024984973",
+  "飞书群组机器人加签密钥，安全设置中开启签名校验后获得": "Feishu group bot signature secret, obtained after enabling signature verification in security settings",
   "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "Email service name, e.g., 126, 163, Gmail, QQ, etc. Supported list: https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
   "邮箱地址": "Email Address",
   "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "The SMTP login password may also be a special passphrase, depending on the specific email service provider's instructions",

src/locales/zh-CN.json

@@ -389,6 +389,7 @@
   "消息接收人": "消息接收人",
   "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版": "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版",
   "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973",
+  "飞书群组机器人加签密钥，安全设置中开启签名校验后获得": "飞书群组机器人加签密钥，安全设置中开启签名校验后获得",
   "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
   "邮箱地址": "邮箱地址",
   "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定",

src/pages/script/saveModal.tsx

@@ -16,7 +16,7 @@ const SaveModal = ({
 
   const handleOk = async (values: any) => {
     setLoading(true);
-    const payload = { ...file, ...values, originFilename: file.title };
+    const payload = { ...values, originFilename: file.title, content: file.content };
     request
       .post(`${config.apiPrefix}scripts`, payload)
       .then(({ code, data }) => {

src/utils/config.ts

@@ -395,6 +395,12 @@ export default {
         ),
         required: true,
       },
+      {
+        label: 'larkSecret',
+        tip: intl.get(
+          '飞书群组机器人加签密钥，安全设置中开启签名校验后获得',
+        ),
+      },
     ],
     email: [
       {

version.yaml

@@ -1,10 +1,47 @@
-version: 2.19.2
-changeLogLink: https://t.me/jiao_long/431
-publishTime: 2025-06-27 23:59
+version: 2.20.0
+changeLogLink: https://t.me/jiao_long/432
+publishTime: 2025-12-10 01:05
 changeLog: |
-  1. 备份数据支持选择模块，支持清除依赖缓存
-  2. QLAPI 和 openapi 的 systemNotify 支持自定义通知类型和参数
-  3. ntfy 增加可选的认证与用户动作，感谢 https://github.com/liheji
-  4. 修复取消安装依赖
-  5. 修复环境变量过大解析报错
-  6. 修改服务启动方式
+  1. 定时任务（cron / task）相关的大量修复 & 增强
+
+  修复 cron 解析错误（修复 parse cron / 升级 cron-parser）
+  修复集群模式下定时任务可能不执行（race condition）
+  定时任务支持订阅筛选
+  定时任务支持排序调整
+  定时任务支持自定义日志文件或无日志
+  修复任务实例默认值
+  任务支持单实例 / 多实例模式
+  修复 task 命令软链可能失败问题
+
+  2. 日志系统相关的大更新
+
+  修复日志目录逻辑
+  修复 pm2 日志目录
+  优化日志写入（stream pooling）
+
+  3. 环境变量（env）系统的改进与修复
+
+  修复环境变量复制到剪贴板时可能失败
+  添加环境变量“置顶”功能
+  修复 QlPort 与 QlGrpcPort 环境变量在 host network 模式下被忽略
+  增加全局 SSH 私钥配置
+
+  4. Docker / 非 root 用户 / Alpine 兼容性增强
+
+  新增非 root Docker 用户支持，自动初始化命令
+  修复 Alpine 容器 DNS 解析失败（设置 ndots:0）
+  修复 PM2 在 ARM 路由器（Node.js 不兼容）上的启动失败
+  移除 nginx（可能是考虑更轻量的镜像运行）
+
+  5. API 安全与校验增强
+
+  Dependencies GET endpoint 增加校验
+  Script API routes 增加输入校验
+  修复 JWT 认证问题
+  Feishu 机器人通知增加签名校验
+  QLAPI 增加 cron task 管理功能
+  修复 URIError（错误 cookie 导致白屏）
+
+  6. 系统设置
+
+  新增多终端/多平台的并发登录会话支持