Compare commits

..
Author SHA1 Message Date
whyour 13aa99f67d fix(db): repair invalid environment labels before startup
Normalize malformed Envs.labels values to JSON arrays during schema migration so ORM reads cannot abort HTTP worker initialization. Preserve valid label arrays and cover corrupt legacy rows. Fixes #3128.
2026-11-09 01:12:53 +08:00
22 changed files with 1151 additions and 2303 deletions
+2 -18
View File
@@ -33,10 +33,6 @@ on:
type: choice type: choice
options: [branch, tag] options: [branch, tag]
default: branch default: branch
npm_rc_version:
description: Publish the verified main npm RC from develop, for example 2.25.0-rc.0
type: string
default: ''
permissions: permissions:
contents: read contents: read
@@ -474,7 +470,7 @@ jobs:
retention-days: 14 retention-days: 14
publish: publish:
if: ${{ github.repository == 'whyour/qinglong' && (github.ref == 'refs/heads/master' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/develop')) }} if: ${{ github.repository == 'whyour/qinglong' && github.ref == 'refs/heads/master' }}
needs: [build-alpine, build-debian, verify-npm-package] needs: [build-alpine, build-debian, verify-npm-package]
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions: permissions:
@@ -495,8 +491,6 @@ jobs:
- name: Publish npm package with OIDC - name: Publish npm package with OIDC
shell: bash shell: bash
env:
NPM_RC_VERSION: ${{ inputs.npm_rc_version }}
run: | run: |
set -euo pipefail set -euo pipefail
shopt -s nullglob shopt -s nullglob
@@ -509,21 +503,11 @@ jobs:
metadata=$(tar -xOf "$archive" package/package.json) metadata=$(tar -xOf "$archive" package/package.json)
name=$(jq -er '.name | select(. == "@whyour/qinglong")' <<< "$metadata") name=$(jq -er '.name | select(. == "@whyour/qinglong")' <<< "$metadata")
version=$(jq -er '.version | select(type == "string")' <<< "$metadata") version=$(jq -er '.version | select(type == "string")' <<< "$metadata")
if [[ "${GITHUB_EVENT_NAME:-}" == workflow_dispatch && "${GITHUB_REF:-}" == refs/heads/develop ]]; then
if [[ ! "${NPM_RC_VERSION:-}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$ || "$version" != "${NPM_RC_VERSION:-}" ]]; then
echo '::error::Develop npm publication requires the exact requested RC archive version.'
exit 1
fi
fi
if npm view "$name@$version" version --json --registry=https://registry.npmjs.org > "$RUNNER_TEMP/npm-version.json" 2> "$RUNNER_TEMP/npm-version-error.log"; then if npm view "$name@$version" version --json --registry=https://registry.npmjs.org > "$RUNNER_TEMP/npm-version.json" 2> "$RUNNER_TEMP/npm-version-error.log"; then
jq -e --arg version "$version" '. == $version' "$RUNNER_TEMP/npm-version.json" > /dev/null jq -e --arg version "$version" '. == $version' "$RUNNER_TEMP/npm-version.json" > /dev/null
echo "::notice::$name@$version is already published; skipping npm publication for this image rebuild." echo "::notice::$name@$version is already published; skipping npm publication for this image rebuild."
elif jq -e '.error.code == "E404"' "$RUNNER_TEMP/npm-version.json" > /dev/null; then elif jq -e '.error.code == "E404"' "$RUNNER_TEMP/npm-version.json" > /dev/null; then
if [[ "${GITHUB_EVENT_NAME:-}" == workflow_dispatch && "${GITHUB_REF:-}" == refs/heads/develop ]]; then npm publish "./$archive" --ignore-scripts --access public --registry=https://registry.npmjs.org
npm publish "./$archive" --ignore-scripts --access public --tag rc --registry=https://registry.npmjs.org
else
npm publish "./$archive" --ignore-scripts --access public --registry=https://registry.npmjs.org
fi
else else
echo '::error::Could not check the published npm version; refusing to publish.' echo '::error::Could not check the published npm version; refusing to publish.'
exit 1 exit 1
+1
View File
@@ -20,6 +20,7 @@ export default (app: Router) => {
res.status(500).send({ res.status(500).send({
code: 500, code: 500,
message: 'Health check failed', message: 'Health check failed',
error: err.message,
}); });
} }
}); });
+14
View File
@@ -310,6 +310,20 @@ export default (app: Router) => {
}, },
); );
route.put(
'/notification/init',
async (req: Request, res: Response, next: NextFunction) => {
const logger: Logger = Container.get('logger');
try {
const userService = Container.get(UserService);
const result = await userService.updateNotificationMode(req.body);
res.send(result);
} catch (e) {
return next(e);
}
},
);
route.put( route.put(
'/avatar', '/avatar',
upload.single('avatar'), upload.single('avatar'),
+2
View File
@@ -180,10 +180,12 @@ export default {
'/api/user/two-factor/login', '/api/user/two-factor/login',
'/api/system', '/api/system',
'/api/user/init', '/api/user/init',
'/api/user/notification/init',
'/open/user/login', '/open/user/login',
'/open/user/two-factor/login', '/open/user/two-factor/login',
'/open/system', '/open/system',
'/open/user/init', '/open/user/init',
'/open/user/notification/init',
], ],
versionFile, versionFile,
lastVersionFile, lastVersionFile,
+37 -36
View File
@@ -16,7 +16,6 @@ import { t } from '../shared/i18n';
import { AppScope } from '../data/open'; import { AppScope } from '../data/open';
import uniqueConstraintError from '../middlewares/uniqueConstraintError'; import uniqueConstraintError from '../middlewares/uniqueConstraintError';
import protectedPathCase from '../middlewares/protectedPathCase'; import protectedPathCase from '../middlewares/protectedPathCase';
import Logger from './logger';
function resolveTrustProxy(value = process.env.QL_TRUST_PROXY) { function resolveTrustProxy(value = process.env.QL_TRUST_PROXY) {
const setting = value?.trim(); const setting = value?.trim();
@@ -192,7 +191,14 @@ export default ({ app }: { app: Application }) => {
app.use(async (req, res, next) => { app.use(async (req, res, next) => {
const pathLower = req.path.toLowerCase(); const pathLower = req.path.toLowerCase();
if (!['/api/user/init', '/open/user/init'].includes(pathLower)) { if (
![
'/api/user/init',
'/api/user/notification/init',
'/open/user/init',
'/open/user/notification/init',
].includes(pathLower)
) {
return next(); return next();
} }
const authInfo = (await shareStore.getAuthInfo()) || ({} as AuthInfo); const authInfo = (await shareStore.getAuthInfo()) || ({} as AuthInfo);
@@ -232,23 +238,37 @@ export default ({ app }: { app: Application }) => {
app.use( app.use(
( (
err: Error & { status: number; code?: string }, err: Error & { status: number },
req: Request, req: Request,
res: Response, res: Response,
next: NextFunction, next: NextFunction,
) => { ) => {
if (err.name === 'UnauthorizedError') { if (err.name === 'UnauthorizedError') {
let message = err.message; return res
if (!config.isDevelopment) { .status(err.status)
if (err.code === 'credentials_bad_scheme') { .send({ code: 401, message: err.message })
message = t('暂无权限'); .end();
} else if (err.code === 'credentials_required') { }
message = t('请先登录'); return next(err);
} else { },
message = t('Token 已失效'); );
}
} app.use(
return res.status(401).send({ code: 401, message }).end(); (
err: Error & { errors: any[] },
req: Request,
res: Response,
next: NextFunction,
) => {
if (err.name.includes('Sequelize')) {
return res
.status(500)
.send({
code: 400,
message: `${err.message}`,
errors: err.errors,
})
.end();
} }
return next(err); return next(err);
}, },
@@ -261,29 +281,10 @@ export default ({ app }: { app: Application }) => {
res: Response, res: Response,
next: NextFunction, next: NextFunction,
) => { ) => {
const status = res.status(err.status || 500);
Number.isInteger(err.status) && err.status >= 400 && err.status < 600
? err.status
: 500;
if (status >= 500) {
const route =
typeof req.route?.path === 'string' ? req.route.path : '?';
const errorName = /^[A-Za-z][A-Za-z0-9]{0,63}$/.test(err.name)
? err.name
: 'Error';
Logger.error(
'HTTP request failed: status=%d method=%s route=%s type=%s',
status,
req.method,
route,
errorName,
);
}
res.status(status);
res.json({ res.json({
code: status, code: err.status || 500,
message: message: err.message,
!config.isDevelopment && status >= 500 ? t('未知错误') : err.message,
}); });
}, },
); );
+1 -1
View File
@@ -94,7 +94,7 @@ class Client {
const registrationTimeoutMs = Math.min(120000, 5000 + ruleCount * 5); const registrationTimeoutMs = Math.min(120000, 5000 + ruleCount * 5);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.client.addCron( this.client.addCron(
AddCronRequest.fromPartial({ crons: request, replace }), { crons: request, replace },
new Metadata(), new Metadata(),
{ deadline: Date.now() + registrationTimeoutMs }, { deadline: Date.now() + registrationTimeoutMs },
(err, res) => { (err, res) => {
@@ -224,6 +224,7 @@ System/user operations below execute remotely through the panel API. They do not
| `ql user notification-get ` | GET | `user/notification` | --query | | `ql user notification-get ` | GET | `user/notification` | --query |
| `ql user notification-set ` | PUT | `user/notification` | --data, --query | | `ql user notification-set ` | PUT | `user/notification` | --data, --query |
| `ql user init ` | PUT | `user/init` | --data, --query | | `ql user init ` | PUT | `user/init` | --data, --query |
| `ql user notification-init ` | PUT | `user/notification/init` | --data, --query |
| `ql user avatar ` | PUT | `user/avatar` | --data, --file (avatar), --query | | `ql user avatar ` | PUT | `user/avatar` | --data, --file (avatar), --query |
| `ql system apply-reload ` | PUT | `update/reload` | --query | | `ql system apply-reload ` | PUT | `update/reload` | --query |
| `ql system apply-system ` | PUT | `update/system` | --query | | `ql system apply-system ` | PUT | `update/system` | --query |
+7
View File
@@ -608,6 +608,13 @@ export const openOperations: readonly OpenOperation[] = [
body: 'json', body: 'json',
anonymous: true, anonymous: true,
}, },
{
name: 'user notification-init',
method: 'PUT',
path: 'user/notification/init',
body: 'json',
anonymous: true,
},
{ {
name: 'user avatar', name: 'user avatar',
method: 'PUT', method: 'PUT',
+2 -2
View File
@@ -118,9 +118,9 @@ ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \
NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules \ NODE_PATH=/usr/local/bin:/usr/local/lib/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:${QL_DIR}/python-base/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
RUN pip3 install --ignore-installed --prefix ${QL_DIR}/python-base requests RUN pip3 install --prefix ${PYTHON_HOME} requests
COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/ COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
+2 -2
View File
@@ -112,9 +112,9 @@ ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \
NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules \ NODE_PATH=/usr/local/bin:/usr/local/lib/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:${QL_DIR}/python-base/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
RUN pip3 install --ignore-installed --prefix ${QL_DIR}/python-base requests RUN pip3 install --prefix ${PYTHON_HOME} requests
COPY --chown=qinglong:qinglong --from=builder /tmp/build/node_modules/. /ql/node_modules/ COPY --chown=qinglong:qinglong --from=builder /tmp/build/node_modules/. /ql/node_modules/
-17
View File
@@ -1,17 +0,0 @@
# 青龙 2.25.0-rc.0 开发候选
本候选包含 2.24.0 之后的安全、依赖、编辑器、通知及环境变量修复。主 npm 包使用 `rc` 标签发布,正式 `latest` 保持 2.24.0。
## 变更
- 应用权限、首次通知配置与任务环境变量的控制边界更严格;旧数据库中的不安全环境变量标签会在启动前修复,受保护名称不会写入任务环境,服务端错误不会向客户端泄露内部细节。
- 依赖管理页面显示已保存状态,用户可以手动复查;配置与脚本编辑器可切换自动换行。
- 通知请求和线程等待设置上限,避免无响应的通知渠道拖住任务。
- Alpine 和 Debian 镜像的内置 Python 通知依赖放在数据卷之外,挂载空 `/ql/data` 后仍能发送通知。
- 独立远程 CLI 候选 `@whyour/qinglong-cli@0.1.5-rc.1` 改善跨平台配置和 OpenAPI 操作,并移除不安全的首次通知命令。
## 测试与安装
开发镜像 `whyour/qinglong:develop`、`whyour/qinglong:debian-dev` 与主包 `@whyour/qinglong@2.25.0-rc.0` 应对应同一候选源码。主包可用 `npm install @whyour/qinglong@rc` 安装;CLI 可用 `npm install @whyour/qinglong-cli@rc` 安装。
升级前备份 `/ql/data`,在目标设备验证任务、订阅、环境变量、依赖与通知。开发候选不建议覆盖正式环境。
+3 -3
View File
@@ -1,7 +1,7 @@
{ {
"name": "@whyour/qinglong", "name": "@whyour/qinglong",
"packageManager": "pnpm@8.3.1", "packageManager": "pnpm@8.3.1",
"version": "2.25.0-rc.0", "version": "2.24.0",
"description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript", "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -53,7 +53,7 @@
"check:cli": "npm --prefix cli run check", "check:cli": "npm --prefix cli run check",
"test:cli": "npm run build:cli && node cli/scripts/test.cjs", "test:cli": "npm run build:cli && node cli/scripts/test.cjs",
"cli": "node cli/dist/index.js", "cli": "node cli/dist/index.js",
"start": "concurrently -n back,front npm:start:back npm:start:front", "start": "concurrently -n w: npm:start:*",
"start:back": "nodemon ./back/app.ts", "start:back": "nodemon ./back/app.ts",
"start:front": "max dev", "start:front": "max dev",
"build:front": "max build", "build:front": "max build",
@@ -202,7 +202,7 @@
"@types/uuid": "^8.3.4", "@types/uuid": "^8.3.4",
"@uiw/codemirror-extensions-langs": "^4.21.9", "@uiw/codemirror-extensions-langs": "^4.21.9",
"@uiw/react-codemirror": "^4.21.9", "@uiw/react-codemirror": "^4.21.9",
"@umijs/max": "^4.7.33", "@umijs/max": "^4.4.4",
"@umijs/ssr-darkreader": "^4.9.45", "@umijs/ssr-darkreader": "^4.9.45",
"ahooks": "^3.7.8", "ahooks": "^3.7.8",
"ansi-to-react": "^6.1.6", "ansi-to-react": "^6.1.6",
+982 -2118
View File
File diff suppressed because it is too large Load Diff
+83 -2
View File
@@ -1,21 +1,38 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import React, { useEffect, useState } from 'react'; import React, { Fragment, useEffect, useState } from 'react';
import { Button, Input, Form, Typography, Steps } from 'antd'; import {
Button,
Row,
Input,
Form,
message,
Typography,
Steps,
Select,
} from 'antd';
import config from '@/utils/config'; import config from '@/utils/config';
import { history } from '@umijs/max';
import styles from './index.less'; import styles from './index.less';
import { request } from '@/utils/http'; import { request } from '@/utils/http';
const FormItem = Form.Item;
const { Step } = Steps; const { Step } = Steps;
const { Option } = Select;
const { Link } = Typography; const { Link } = Typography;
const Initialization = () => { const Initialization = () => {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [current, setCurrent] = React.useState(0); const [current, setCurrent] = React.useState(0);
const [fields, setFields] = useState<any[]>([]);
const next = () => { const next = () => {
setCurrent(current + 1); setCurrent(current + 1);
}; };
const prev = () => {
setCurrent(current - 1);
};
const submitAccountSetting = (values: any) => { const submitAccountSetting = (values: any) => {
setLoading(true); setLoading(true);
request request
@@ -31,6 +48,23 @@ const Initialization = () => {
.finally(() => setLoading(false)); .finally(() => setLoading(false));
}; };
const submitNotification = (values: any) => {
setLoading(true);
request
.put(`${config.apiPrefix}user/notification/init`, values)
.then(({ code, data }) => {
if (code === 200) {
next();
}
})
.finally(() => setLoading(false));
};
const notificationModeChange = (value: string) => {
const _fields = (config.notificationModeMap as any)[value];
setFields(_fields || []);
};
useEffect(() => { useEffect(() => {
localStorage.removeItem(config.authKey); localStorage.removeItem(config.authKey);
}, []); }, []);
@@ -61,6 +95,53 @@ const Initialization = () => {
</div> </div>
), ),
}, },
{
title: intl.get('通知设置'),
content: (
<Form onFinish={submitNotification} layout="vertical">
<Form.Item
label={intl.get('通知方式')}
name="type"
rules={[{ required: true, message: intl.get('请选择通知方式') }]}
style={{ maxWidth: 350 }}
>
<Select
onChange={notificationModeChange}
placeholder={intl.get('请选择通知方式')}
>
{config.notificationModes
.filter((x) => x.value !== 'closed')
.map((x) => (
<Option key={x.value} value={x.value}>
{x.label}
</Option>
))}
</Select>
</Form.Item>
{fields.map((x) => (
<Form.Item
key={x.label}
label={x.label}
name={x.label}
extra={x.tip}
rules={[{ required: x.required }]}
style={{ maxWidth: 400 }}
>
<Input.TextArea
autoSize={{ minRows: 1, maxRows: 5 }}
placeholder={`${intl.get('请输入')} ${x.label}`}
/>
</Form.Item>
))}
<Button type="primary" htmlType="submit" loading={loading}>
{intl.get('保存')}
</Button>
<Button type="link" htmlType="button" onClick={() => next()}>
{intl.get('跳过')}
</Button>
</Form>
),
},
{ {
title: intl.get('账户设置'), title: intl.get('账户设置'),
content: ( content: (
+1
View File
@@ -90,6 +90,7 @@ const apiWhiteList = [
`${config.baseUrl}api/user/two-factor/login`, `${config.baseUrl}api/user/two-factor/login`,
`${config.baseUrl}api/system`, `${config.baseUrl}api/system`,
`${config.baseUrl}api/user/init`, `${config.baseUrl}api/user/init`,
`${config.baseUrl}api/user/notification/init`,
]; ];
_request.interceptors.request.use((_config) => { _request.interceptors.request.use((_config) => {
-1
View File
@@ -13,7 +13,6 @@ test('unknown API requests return JSON 404 while env.js and SPA deep links work'
const app = express(); const app = express();
load('back/loaders/express.ts', { load('back/loaders/express.ts', {
'../api': () => express.Router(), '../api': () => express.Router(),
'./logger': { error() {} },
'../config': { '../config': {
rootPath: dir, rootPath: dir,
uploadPath: dir, uploadPath: dir,
-52
View File
@@ -3,7 +3,6 @@ const test = require('node:test');
const fs = require('node:fs'); const fs = require('node:fs');
const os = require('node:os'); const os = require('node:os');
const path = require('node:path'); const path = require('node:path');
const util = require('node:util');
const express = require('express'); const express = require('express');
const jwt = require('jsonwebtoken'); const jwt = require('jsonwebtoken');
const load = require('../helpers/load-security-module.cjs'); const load = require('../helpers/load-security-module.cjs');
@@ -106,8 +105,6 @@ test('HTTP authentication protects init, scopes, expired sessions and config sec
let envWriteCalls = 0; let envWriteCalls = 0;
let scopedMutationCalls = 0; let scopedMutationCalls = 0;
let initialized = 0; let initialized = 0;
let notificationCalls = 0;
const loggedErrors = [];
const User = class {}; const User = class {};
const Script = class { const Script = class {
getFile(folder, filename) { getFile(folder, filename) {
@@ -124,10 +121,6 @@ test('HTTP authentication protects init, scopes, expired sessions and config sec
return { code: 200 }; return { code: 200 };
}, },
getAuthInfo: async () => auth, getAuthInfo: async () => auth,
updateNotificationMode: async () => {
notificationCalls++;
return { code: 200 };
},
}; };
const mocks = { const mocks = {
'../config': config, '../config': config,
@@ -143,7 +136,6 @@ test('HTTP authentication protects init, scopes, expired sessions and config sec
shareStore: { getAuthInfo: async () => auth, getApps: async () => apps }, shareStore: { getAuthInfo: async () => auth, getApps: async () => apps },
}, },
'../config/serverEnv': { serveEnv: (_req, res) => res.end() }, '../config/serverEnv': { serveEnv: (_req, res) => res.end() },
'./logger': { error: (...args) => loggedErrors.push(util.format(...args)) },
'../services/user': User, '../services/user': User,
'../services/script': Script, '../services/script': Script,
'../data/open': {}, '../data/open': {},
@@ -217,17 +209,6 @@ test('HTTP authentication protects init, scopes, expired sessions and config sec
commandCalls++; commandCalls++;
res.json({ code: 200 }); res.json({ code: 200 });
}); });
router.get('/security-test/error', (_req, _res, next) =>
next(new Error('sensitive server detail')),
);
router.get('/security-test/db-error', (_req, _res, next) => {
const error = new Error('sensitive database detail');
error.name = 'SequelizeDatabaseError';
error.errors = [{ message: 'sensitive row value' }];
error.sql = "SELECT * FROM users WHERE password = 'sensitive password'";
error.parameters = ['sensitive parameter'];
next(error);
});
return router; return router;
}; };
const app = express(); const app = express();
@@ -257,39 +238,6 @@ test('HTTP authentication protects init, scopes, expired sessions and config sec
); );
return { status: response.status, body: await response.json() }; return { status: response.status, body: await response.json() };
}; };
auth.username = 'admin';
auth.password = 'admin';
for (const prefix of ['/api', '/open', '/panel/api', '/panel/open']) {
const response = await request(
`${prefix}/user/notification/init`,
undefined,
'PUT',
{ type: 'webhook', webhookUrl: 'http://127.0.0.1/?title=$title' },
);
assert.equal(response.status, 401, prefix);
}
assert.equal(notificationCalls, 0);
auth.username = 'owner';
auth.password = 'configured';
assert.equal(
(await request('/api/user/notification', valid, 'PUT', {})).body.code,
200,
);
assert.equal(notificationCalls, 1);
for (const route of ['/security-test/error', '/security-test/db-error']) {
const response = await request(`/api${route}`, valid);
assert.equal(response.status, 500);
assert.deepEqual(response.body, { code: 500, message: '未知错误' });
}
assert.equal(loggedErrors.length, 2);
assert.match(loggedErrors[1], /type=SequelizeDatabaseError/);
assert.ok(loggedErrors.every((line) => !line.includes('sensitive')));
const malformedToken = await request('/api/envs', 'not-a-jwt');
assert.equal(malformedToken.status, 401);
assert.deepEqual(malformedToken.body, {
code: 401,
message: 'Token 已失效',
});
for (const url of [ for (const url of [
'/api/user/init', '/api/user/init',
'/open/user/init', '/open/user/init',
-3
View File
@@ -66,9 +66,6 @@ case 'network': console.log('upstream unavailable'); process.exit(1);
encoding: 'utf8', encoding: 'utf8',
env: { env: {
...process.env, ...process.env,
GITHUB_EVENT_NAME: 'push',
GITHUB_REF: 'refs/heads/master',
NPM_RC_VERSION: '',
PATH: `${bin}${path.delimiter}${process.env.PATH}`, PATH: `${bin}${path.delimiter}${process.env.PATH}`,
RUNNER_TEMP: root, RUNNER_TEMP: root,
QL_PUBLISH_SCENARIO: scenario, QL_PUBLISH_SCENARIO: scenario,
+1 -1
View File
@@ -19,7 +19,7 @@ for (const [name, rows, delay, succeeds] of [
setTimeout(()=>cb(delay<=budget ? null : Object.assign(Error('deadline'),{code:grpc.status.DEADLINE_EXCEEDED}), {}), Math.min(delay,budget)); setTimeout(()=>cb(delay<=budget ? null : Object.assign(Error('deadline'),{code:grpc.status.DEADLINE_EXCEEDED}), {}), Math.min(delay,budget));
}}; }};
const client=load('back/schedule/client.ts', { const client=load('back/schedule/client.ts', {
'../protos/cron':{...require('../../back/protos/cron'),CronClient:class{constructor(){return fake}}}, '../protos/cron':{CronClient:class{constructor(){return fake}}},
'../config':{grpcPort:5500}, '../config':{grpcPort:5500},
'../config/grpcCerts':{getGrpcCerts:()=>({caCert:'ca',clientKey:'key',clientCert:'cert'})}, '../config/grpcCerts':{getGrpcCerts:()=>({caCert:'ca',clientKey:'key',clientCert:'cert'})},
'@grpc/grpc-js':{...grpc,credentials:{createSsl:()=>({})}}, '@grpc/grpc-js':{...grpc,credentials:{createSsl:()=>({})}},
+1 -14
View File
@@ -52,19 +52,6 @@ test('health uses actual readiness and returns HTTP 503 until recovery',async(t)
assert.equal(r.status,expected);assert.equal(b.code,expected);assert.equal(b.data.services.grpc,ready); assert.equal(r.status,expected);assert.equal(b.code,expected);assert.equal(b.data.services.grpc,ready);
} }
}); });
test('health failure does not reveal internal error details',async(t)=>{
const express=require('express');
const HealthService=class{};
const app=express();load('back/api/health.ts',{
typedi:{get:()=>({check:async()=>{throw Error('sensitive health detail');}})},
'../services/health':{HealthService},'../loaders/logger':{error(){}},
}).default(app);
const server=app.listen(0,'127.0.0.1');await new Promise(r=>server.once('listening',r));
t.after(()=>new Promise(r=>{server.close(r);server.closeAllConnections();}));
const response=await fetch(`http://127.0.0.1:${server.address().port}/health`);
assert.equal(response.status,500);
assert.deepEqual(await response.json(),{code:500,message:'Health check failed'});
});
test('recovery registration errors propagate while ordinary autosave retains file synchronization',async()=>{ test('recovery registration errors propagate while ordinary autosave retains file synchronization',async()=>{
const source=fs.readFileSync('back/services/cron.ts','utf8');const a=source.indexOf(' public async autosave_crontab('),z=source.indexOf(' public async bootTask',a); const source=fs.readFileSync('back/services/cron.ts','utf8');const a=source.indexOf(' public async autosave_crontab('),z=source.indexOf(' public async bootTask',a);
const js=ts.transpileModule('class Fixture {\n'+source.slice(a,z)+'}\nmodule.exports=Fixture;', {compilerOptions:{target:ts.ScriptTarget.ES2020}}).outputText; const js=ts.transpileModule('class Fixture {\n'+source.slice(a,z)+'}\nmodule.exports=Fixture;', {compilerOptions:{target:ts.ScriptTarget.ES2020}}).outputText;
@@ -81,7 +68,7 @@ test('scheduler probe uses the cron channel and failed writes are not replayed',
addCron(request,metadata,options,cb){calls.push(['add',request,options]);cb(Object.assign(Error('invalid'),{code:3}));}, addCron(request,metadata,options,cb){calls.push(['add',request,options]);cb(Object.assign(Error('invalid'),{code:3}));},
}; };
const client=load('back/schedule/client.ts',{ const client=load('back/schedule/client.ts',{
'../protos/cron':{...require('../../back/protos/cron'),CronClient:class{constructor(){return fake;}}}, '../protos/cron':{CronClient:class{constructor(){return fake;}}},
'../config':{grpcPort:5500},'../config/grpcCerts':{getGrpcCerts:()=>({caCert:'ca',clientKey:'key',clientCert:'cert'})}, '../config':{grpcPort:5500},'../config/grpcCerts':{getGrpcCerts:()=>({caCert:'ca',clientKey:'key',clientCert:'cert'})},
'@grpc/grpc-js':{...require('@grpc/grpc-js'),credentials:{createSsl:()=>({})},status:{UNAVAILABLE:14},Metadata:class{}}, '@grpc/grpc-js':{...require('@grpc/grpc-js'),credentials:{createSsl:()=>({})},status:{UNAVAILABLE:14},Metadata:class{}},
}).default; }).default;
-24
View File
@@ -20,7 +20,6 @@ for (const method of ['addCron', 'delCron']) {
}; };
const client = load('back/schedule/client.ts', { const client = load('back/schedule/client.ts', {
'../protos/cron': { '../protos/cron': {
...require('../../back/protos/cron'),
CronClient: class { CronClient: class {
constructor() { constructor() {
return fake; return fake;
@@ -48,26 +47,3 @@ for (const method of ['addCron', 'delCron']) {
assert.equal(writes, 1, 'do not replay an uncertain mutation'); assert.equal(writes, 1, 'do not replay an uncertain mutation');
}); });
} }
test('registration serializes nullable SQLite scheduling fields as absent', async () => {
const { AddCronRequest, ICron } = require('../../back/protos/cron');
const client = load('back/schedule/client.ts', {}).default;
let received;
client._client = {
waitForReady: (_deadline, callback) => callback(),
addCron(request, _metadata, _options, callback) {
received = AddCronRequest.decode(AddCronRequest.encode(request).finish());
callback(null, {});
},
};
const legacy = {
id: '1', extra_schedules: null, max_queue_wait: null, catchup_seconds: null, recovery_from: null,
};
const configured = {
id: '2', schedule: '* * * * *', extra_schedules: [{ schedule: '0 1 * * *' }],
max_queue_wait: 0, catchup_seconds: 60, recovery_from: 1700000000000,
};
await client.addCron([legacy, configured], true);
assert.equal(received.replace, true);
assert.deepEqual(received.crons, [ICron.create({ id: '1' }), ICron.create(configured)]);
});
+11 -9
View File
@@ -1,10 +1,12 @@
version: 2.25.0-rc.0 version: 2.24.0
changeLogLink: https://github.com/whyour/qinglong/blob/develop/docs/releases/2.25.0-rc.0.md changeLogLink: https://github.com/whyour/qinglong/blob/v2.24.0/docs/releases/2.24.0.md
publishTime: "2026-11-10 01:16:12" publishTime: "2026-10-29 02:14:58"
changeLog: | changeLog: |
1. 收紧应用权限、首次通知配置与任务环境变量边界;启动前修复不安全的环境变量标签 1. Alpine 与 Debian 默认镜像统一使用 Node.js 24,SQLite 依赖升级至 1.1.4
2. 依赖管理改为按需复查状态,配置与脚本编辑器新增自动换行开关 2. 新增 Node.js 原生部署的 Python venv 隔离支持,以及 Python Git URL、requirements、pyproject 依赖源
3. 通知请求及线程等待增加超时,避免无响应渠道阻塞任务 3. 新增通知审计日志,完善通知失败记录与配置提示
4. 修复挂载空数据卷后 Python 通知缺少 requests 依赖的问题 4. 升级包按平台构建并校验;支持在线暂存、离线安装、失败回退及保留数据迁移
5. 独立远程 CLI 候选版本为 0.1.5-rc.1,改善跨平台配置与 OpenAPI 命令 5. 修复任务调度、额外规则、依赖安装、脚本发现和订阅同步等问题
6. 此版本为开发候选;升级前备份数据并在目标设备验证任务、依赖、通知和应用权限 6. 独立远程 CLI 更新至 0.1.3,最低 Node.js 版本为 22.12.0
7. Alpine 保留 arm/v6 和 arm/v7;Debian 暂不提供 arm/v7,Python 3.10 兼容镜像停止更新
8. 升级前备份完整数据,并在目标设备验证脚本、依赖、订阅和通知