Improve URL pattern matching and remove redundant checks

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

back/config/util.ts

@@ -535,12 +535,43 @@ export async function setSystemTimezone(timezone: string): Promise<boolean> {
   }
 }
 
+// Helper function to check if a name is a GitHub URL
+function isGitHubUrl(name: string): boolean {
+  // Support git+https://, git+http://, https://, and http:// URLs
+  // This covers GitHub URLs and other git-compatible repositories
+  return !!name.match(/^(git\+https?:\/\/|https?:\/\/)/i);
+}
+
+// Helper function to check if a name is a requirements file
+function isRequirementsFile(name: string): boolean {
+  return !!name.match(/requirements.*\.(txt|in)$/i);
+}
+
+// Helper function to check if a name is a pyproject.toml file
+function isPyprojectToml(name: string): boolean {
+  return name.endsWith('pyproject.toml');
+}
+
 export function getGetCommand(type: DependenceTypes, name: string): string {
+  const trimmedName = name.trim();
+  
+  // For Python dependencies installed from GitHub or requirements files,
+  // we can't reliably check if they're installed, so skip the check
+  if (type === DependenceTypes.python3) {
+    if (isGitHubUrl(trimmedName) || 
+        isRequirementsFile(trimmedName) || 
+        isPyprojectToml(trimmedName)) {
+      // Return a command that will always indicate not installed
+      // This ensures GitHub URLs and requirements files are always installed
+      return 'echo ""';
+    }
+  }
+  
   const baseCommands = {
-    [DependenceTypes.nodejs]: `pnpm ls -g  | grep "${name}" | head -1`,
+    [DependenceTypes.nodejs]: `pnpm ls -g  | grep "${trimmedName}" | head -1`,
     [DependenceTypes.python3]: `
     python3 -c "exec('''
-name='${name}'
+name='${trimmedName}'
 try:
     from importlib.metadata import version
     print(version(name))
@@ -550,7 +581,7 @@ except:
     spec=u.find_spec(name)
     print(name if spec else '')
 ''')"`,
-    [DependenceTypes.linux]: `apk info -es ${name}`,
+    [DependenceTypes.linux]: `apk info -es ${trimmedName}`,
   };
 
   return baseCommands[type];
@@ -570,7 +601,33 @@ export function getInstallCommand(type: DependenceTypes, name: string): string {
     command = `${command} --prefix=${PYTHON_INSTALL_DIR}`;
   }
 
-  return `${command} ${name.trim()}`;
+  const trimmedName = name.trim();
+  
+  // Handle different installation methods for Python
+  if (type === DependenceTypes.python3) {
+    // Check if it's a GitHub URL (support both git+ and direct URLs)
+    if (isGitHubUrl(trimmedName)) {
+      return `${command} ${trimmedName}`;
+    }
+    // Check if it's a requirements file path
+    if (isRequirementsFile(trimmedName)) {
+      return `${command} -r ${trimmedName}`;
+    }
+    // Check if it's a pyproject.toml file
+    if (isPyprojectToml(trimmedName)) {
+      // For pyproject.toml, install from the directory containing it
+      const pathMatch = trimmedName.match(/^(.+)\/pyproject\.toml$/);
+      if (pathMatch) {
+        // Has a path prefix, use the directory
+        return `${command} ${pathMatch[1]}`;
+      } else {
+        // Just "pyproject.toml", install current directory
+        return `${command} .`;
+      }
+    }
+  }
+
+  return `${command} ${trimmedName}`;
 }
 
 export function getUninstallCommand(

back/loaders/express.ts

@@ -13,29 +13,9 @@ import { isValidToken } from '../shared/auth';
 import path from 'path';
 
 export default ({ app }: { app: Application }) => {
-  // Security: Enable strict routing to prevent case-insensitive path bypass
-  app.set('case sensitive routing', true);
-  app.set('strict routing', true);
   app.set('trust proxy', 'loopback');
   app.use(cors());
   
-  // Security: Path normalization middleware to prevent case variation attacks
-  app.use((req, res, next) => {
-    const originalPath = req.path;
-    const normalizedPath = originalPath.toLowerCase();
-    
-    // Block requests with case variations on protected paths
-    if (originalPath !== normalizedPath && 
-        (normalizedPath.startsWith('/api/') || normalizedPath.startsWith('/open/'))) {
-      return res.status(400).json({
-        code: 400,
-        message: 'Invalid path format'
-      });
-    }
-    
-    next();
-  });
-  
   // Rewrite URLs to strip baseUrl prefix if configured
   // This allows the rest of the app to work without baseUrl awareness
   if (config.baseUrl) {
@@ -56,7 +36,7 @@ export default ({ app }: { app: Application }) => {
       secret: config.jwt.secret,
       algorithms: ['HS384'],
     }).unless({
-      path: [...config.apiWhiteList, /^(\/(?!api\/).*)$/i],
+      path: [...config.apiWhiteList, /^\/(?!api\/).*/],
     }),
   );
 
@@ -71,20 +51,19 @@ export default ({ app }: { app: Application }) => {
   });
 
   app.use(async (req: Request, res, next) => {
-    const pathLower = req.path.toLowerCase();
-    if (!['/open/', '/api/'].some((x) => pathLower.startsWith(x))) {
+    if (!['/open/', '/api/'].some((x) => req.path.startsWith(x))) {
       return next();
     }
 
     const headerToken = getToken(req);
-    if (pathLower.startsWith('/open/')) {
+    if (req.path.startsWith('/open/')) {
       const apps = await shareStore.getApps();
       const doc = apps?.filter((x) =>
         x.tokens?.find((y) => y.value === headerToken),
       )?.[0];
       if (doc && doc.tokens && doc.tokens.length > 0) {
         const currentToken = doc.tokens.find((x) => x.value === headerToken);
-        const keyMatch = pathLower.match(/\/open\/([a-z]+)\/*/);
+        const keyMatch = req.path.match(/\/open\/([a-z]+)\/*/);
         const key = keyMatch && keyMatch[1];
         if (
           doc.scopes.includes(key as any) &&
@@ -119,15 +98,7 @@ export default ({ app }: { app: Application }) => {
   });
 
   app.use(async (req, res, next) => {
-    const pathLower = req.path.toLowerCase();
-    if (
-      ![
-        '/api/user/init',
-        '/api/user/notification/init',
-        '/open/user/init',
-        '/open/user/notification/init',
-      ].includes(req.path)
-    ) {
+    if (!['/api/user/init', '/api/user/notification/init'].includes(req.path)) {
       return next();
     }
     const authInfo =

back/loaders/initData.ts

@@ -13,7 +13,7 @@ import { AuthDataType, SystemModel } from '../data/system';
 import SystemService from '../services/system';
 import UserService from '../services/user';
 import { writeFile, readFile } from 'fs/promises';
-import { createRandomString, fileExist, isDemoEnv, safeJSONParse } from '../config/util';
+import { createRandomString, fileExist, safeJSONParse } from '../config/util';
 import OpenService from '../services/open';
 import { shareStore } from '../shared/store';
 import Logger from './logger';
@@ -50,7 +50,7 @@ export default async () => {
   const [authConfig] = await SystemModel.findOrCreate({
     where: { type: AuthDataType.authConfig },
   });
-  if (!authConfig?.info || isDemoEnv()) {
+  if (!authConfig?.info) {
     let authInfo = {
       username: 'admin',
       password: 'admin',

docker/310.Dockerfile

@@ -69,10 +69,9 @@ RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
 
 ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
   PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
-  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3 \
-  HOME=/root
+  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
 
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
   NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
   PIP_CACHE_DIR=${PYTHON_HOME}/pip \
   PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages

docker/Dockerfile

@@ -69,10 +69,9 @@ RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
 
 ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
   PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
-  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3 \
-  HOME=/root
+  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
 
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
   NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
   PIP_CACHE_DIR=${PYTHON_HOME}/pip \
   PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages

docker/docker-entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export PATH="$HOME/bin:$PATH"
+
 dir_shell=/ql/shell
 . $dir_shell/share.sh
 

shell/update.sh

@@ -111,6 +111,76 @@ add_cron() {
   notify_api "$path 新增任务" "$detail"
 }
 
+## 自动安装订阅仓库中的Python依赖
+auto_install_python_deps() {
+  local repo_path="$1"
+  local uniq_path="$2"
+  
+  echo -e "\n检测订阅仓库中的Python依赖文件...\n"
+  
+  get_token
+  
+  # 检查 requirements.txt
+  if [[ -f "${repo_path}/requirements.txt" ]]; then
+    echo -e "发现 requirements.txt，开始自动安装依赖...\n"
+    local req_file="${dir_scripts}/${uniq_path}/requirements.txt"
+    
+    # 确保目标目录存在
+    make_dir "${dir_scripts}/${uniq_path}"
+    
+    # 复制文件并检查结果
+    if cp -f "${repo_path}/requirements.txt" "${req_file}" 2>/dev/null; then
+      # 调用API添加依赖安装任务
+      local dep_name="${uniq_path}/requirements.txt"
+      local currentTimeStamp=$(date +%s)
+      local result=$(curl -s --noproxy "*" "http://127.0.0.1:${ql_port}/open/dependencies?t=$currentTimeStamp" \
+        -X POST \
+        -H "Content-Type: application/json;charset=UTF-8" \
+        -H "Authorization: Bearer ${__ql_token__}" \
+        --data-raw "[{\"name\":\"${dep_name}\",\"type\":1,\"remark\":\"自动检测：${uniq_path} 订阅依赖\"}]" 2>/dev/null)
+      
+      local code=$(echo "$result" | jq -r '.code' 2>/dev/null)
+      if [[ "$code" == "200" ]]; then
+        echo -e "已添加 requirements.txt 依赖安装任务\n"
+      else
+        echo -e "添加 requirements.txt 依赖失败，请手动添加\n"
+      fi
+    else
+      echo -e "复制 requirements.txt 失败，跳过自动安装\n"
+    fi
+  fi
+  
+  # 检查 pyproject.toml
+  if [[ -f "${repo_path}/pyproject.toml" ]]; then
+    echo -e "发现 pyproject.toml，开始自动安装依赖...\n"
+    local pyproject_file="${dir_scripts}/${uniq_path}/pyproject.toml"
+    
+    # 确保目标目录存在
+    make_dir "${dir_scripts}/${uniq_path}"
+    
+    # 复制文件并检查结果
+    if cp -f "${repo_path}/pyproject.toml" "${pyproject_file}" 2>/dev/null; then
+      # 调用API添加依赖安装任务
+      local dep_name="${uniq_path}/pyproject.toml"
+      local currentTimeStamp=$(date +%s)
+      local result=$(curl -s --noproxy "*" "http://127.0.0.1:${ql_port}/open/dependencies?t=$currentTimeStamp" \
+        -X POST \
+        -H "Content-Type: application/json;charset=UTF-8" \
+        -H "Authorization: Bearer ${__ql_token__}" \
+        --data-raw "[{\"name\":\"${dep_name}\",\"type\":1,\"remark\":\"自动检测：${uniq_path} 订阅依赖\"}]" 2>/dev/null)
+      
+      local code=$(echo "$result" | jq -r '.code' 2>/dev/null)
+      if [[ "$code" == "200" ]]; then
+        echo -e "已添加 pyproject.toml 依赖安装任务\n"
+      else
+        echo -e "添加 pyproject.toml 依赖失败，请手动添加\n"
+      fi
+    else
+      echo -e "复制 pyproject.toml 失败，跳过自动安装\n"
+    fi
+  fi
+}
+
 ## 更新仓库
 update_repo() {
   local url="$1"
@@ -137,6 +207,10 @@ update_repo() {
 
   if [[ $exit_status -eq 0 ]]; then
     echo -e "拉取 ${uniq_path} 成功...\n"
+    
+    # 自动检测并安装Python依赖
+    auto_install_python_deps "${repo_path}" "${uniq_path}"
+    
     diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
   else
     echo -e "拉取 ${uniq_path} 失败，请检查日志...\n"

src/pages/dependence/modal.tsx

@@ -22,6 +22,9 @@ const DependenceModal = ({
 }) => {
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
+  const [selectedType, setSelectedType] = useState(
+    DependenceTypes[defaultType as any],
+  );
 
   const handleOk = async (values: any) => {
     setLoading(true);
@@ -90,7 +93,7 @@ const DependenceModal = ({
           label={intl.get('依赖类型')}
           initialValue={DependenceTypes[defaultType as any]}
         >
-          <Select>
+          <Select onChange={(value) => setSelectedType(value)}>
             {config.dependenceTypes.map((x, i) => (
               <Option key={i} value={i}>
                 {x}
@@ -121,11 +124,24 @@ const DependenceModal = ({
               whitespace: true,
             },
           ]}
+          tooltip={
+            selectedType === DependenceTypes.python3
+              ? intl.get(
+                  'Python支持多种安装方式：\n1. 包名（如：requests）\n2. GitHub链接（如：git+https://github.com/user/repo.git）\n3. requirements文件路径（如：path/to/requirements.txt）\n4. pyproject.toml文件路径',
+                )
+              : undefined
+          }
         >
           <Input.TextArea
             rows={4}
             autoSize={{ minRows: 1, maxRows: 5 }}
-            placeholder={intl.get('请输入依赖名称')}
+            placeholder={
+              selectedType === DependenceTypes.python3
+                ? intl.get(
+                    '支持包名、GitHub链接、requirements.txt或pyproject.toml路径',
+                  )
+                : intl.get('请输入依赖名称')
+            }
           />
         </Form.Item>
         <Form.Item name="remark" label={intl.get('备注')}>

version.yaml

@@ -1,6 +1,11 @@
-version: 2.20.2
-changeLogLink: https://t.me/jiao_long/434
-publishTime: 2026-03-01 1800
+version: 2.20.1
+changeLogLink: https://t.me/jiao_long/433
+publishTime: 2025-12-26 22:00
 changeLog: |
-  1. 修复 path 安全漏洞（重要）
-  
+  1. 修复获取依赖管理列表
+  2. notify.js 修复 TG_PROXY_AUTH 参数拼接
+  3. QLAPI.notify larkSecret 参数
+  4. 修复 cron parser 定时规则校验
+  5. 修复设置 baseUrl 后无法访问
+  6. 修复环境变量排序
+  7. 修复定时任务无法停止