@whyour/qinglong 2.21.0 → 2.23.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.dockerignore +13 -0
- package/.env.example +7 -0
- package/AGENTS.md +2 -2
- package/README-en.md +24 -0
- package/README.md +24 -0
- package/back/protos/api.proto +9 -1
- package/back/protos/cron.proto +8 -1
- package/deploy/kubernetes/README.md +81 -0
- package/deploy/kubernetes/base/kustomization.yaml +5 -0
- package/deploy/kubernetes/base/qinglong.yaml +95 -0
- package/deploy/kubernetes/overlays/example/kustomization.yaml +10 -0
- package/docker/Dockerfile +31 -12
- package/docker/Dockerfile.310 +31 -12
- package/docker/Dockerfile.debian +22 -14
- package/docker/Dockerfile.debian310 +24 -14
- package/docker/build-manifest.cjs +28 -0
- package/docker/verify-build.cjs +49 -0
- package/docs/development/node-cron-migration.md +49 -0
- package/docs/development/task-startup.md +78 -0
- package/docs/releases/2.22.0-validation.md +49 -0
- package/docs/releases/2.22.0.md +62 -0
- package/docs/releases/2.23.0.md +33 -0
- package/docs/script-history.md +53 -0
- package/ecosystem.config.js +10 -1
- package/package.json +19 -13
- package/sample/config.sample.sh +17 -2
- package/sample/notify.js +118 -0
- package/sample/notify.py +93 -0
- package/scripts/benchmark-execution.cjs +96 -0
- package/scripts/benchmark-script-history.cjs +39 -0
- package/scripts/publish-static.sh +34 -0
- package/scripts/sync-static.sh +20 -0
- package/scripts/wait-for-mirror.sh +214 -0
- package/scripts/write-build-info.cjs +27 -0
- package/shell/api.sh +96 -83
- package/shell/check.sh +59 -19
- package/shell/lang/en.sh +6 -0
- package/shell/lang/zh.sh +6 -0
- package/shell/node_path_cache.sh +136 -0
- package/shell/otask.sh +17 -10
- package/shell/preload/sitecustomize.js +11 -3
- package/shell/preload/sitecustomize.py +4 -2
- package/shell/share.sh +27 -10
- package/shell/start.sh +6 -3
- package/shell/task-timeout.sh +63 -0
- package/shell/task.sh +21 -9
- package/shell/update.sh +104 -98
- package/shell/upgrade.cjs +8 -0
- package/static/build/api/clientIp.js +42 -0
- package/static/build/api/config.js +9 -21
- package/static/build/api/cron.js +39 -3
- package/static/build/api/dashboard.js +50 -6
- package/static/build/api/env.js +17 -16
- package/static/build/api/health.js +2 -2
- package/static/build/api/index.js +4 -0
- package/static/build/api/log.js +39 -19
- package/static/build/api/open.js +2 -1
- package/static/build/api/retention.js +63 -0
- package/static/build/api/script.js +172 -25
- package/static/build/api/subscription.js +19 -8
- package/static/build/api/system.js +66 -12
- package/static/build/api/user.js +75 -15
- package/static/build/app.js +63 -54
- package/static/build/bootstrap/database.js +51 -0
- package/static/build/config/const.js +2 -0
- package/static/build/config/grpcCerts.js +93 -44
- package/static/build/config/index.js +0 -4
- package/static/build/config/share.js +5 -4
- package/static/build/config/subscription.js +19 -11
- package/static/build/config/util.js +142 -45
- package/static/build/data/cron.js +1 -0
- package/static/build/data/notify.js +18 -1
- package/static/build/data/sock.js +1 -0
- package/static/build/loaders/app.js +8 -6
- package/static/build/loaders/db.js +5 -35
- package/static/build/loaders/deps.js +30 -22
- package/static/build/loaders/express.js +46 -32
- package/static/build/loaders/initData.js +26 -33
- package/static/build/loaders/initFile.js +1 -1
- package/static/build/loaders/initTask.js +14 -3
- package/static/build/loaders/server.js +1 -1
- package/static/build/loaders/sock.js +72 -6
- package/static/build/middlewares/monitoring.js +12 -33
- package/static/build/middlewares/protectedPathCase.js +17 -0
- package/static/build/middlewares/uniqueConstraintError.js +15 -0
- package/static/build/protos/api.js +78 -2
- package/static/build/protos/cron.js +83 -5
- package/static/build/protos/health.js +1 -1
- package/static/build/schedule/addCron.js +67 -19
- package/static/build/schedule/api.js +5 -2
- package/static/build/schedule/client.js +56 -6
- package/static/build/schedule/delCron.js +11 -1
- package/static/build/schedule/health.js +72 -7
- package/static/build/schedule/setConcurrency.js +27 -0
- package/static/build/services/config.js +5 -43
- package/static/build/services/cron.js +389 -174
- package/static/build/services/dependence.js +66 -18
- package/static/build/services/env.js +1 -1
- package/static/build/services/grpc.js +4 -3
- package/static/build/services/health.js +4 -7
- package/static/build/services/http.js +9 -3
- package/static/build/services/log.js +2 -3
- package/static/build/services/metrics.js +46 -14
- package/static/build/services/notify.js +73 -5
- package/static/build/services/open.js +106 -31
- package/static/build/services/retention.js +123 -0
- package/static/build/services/schedule.js +77 -43
- package/static/build/services/script.js +4 -5
- package/static/build/services/scriptHistory.js +30 -0
- package/static/build/services/sshKey.js +39 -14
- package/static/build/services/subscription.js +161 -87
- package/static/build/services/system.js +116 -43
- package/static/build/services/user.js +255 -37
- package/static/build/shared/auth.js +22 -3
- package/static/build/shared/authMutation.js +17 -0
- package/static/build/shared/childProcess.js +82 -0
- package/static/build/shared/clientIp.js +27 -0
- package/static/build/shared/cronCommand.js +17 -0
- package/static/build/shared/cronSchedule.js +101 -0
- package/static/build/shared/cronScheduler.js +73 -0
- package/static/build/shared/errors.js +9 -0
- package/static/build/shared/fileAccess.js +60 -0
- package/static/build/shared/i18n.js +63 -4
- package/static/build/shared/logPath.js +15 -0
- package/static/build/shared/logReader.js +85 -0
- package/static/build/shared/logStreamManager.js +80 -60
- package/static/build/shared/loginThrottle.js +45 -0
- package/static/build/shared/pLimit.js +22 -8
- package/static/build/shared/password.js +30 -0
- package/static/build/shared/retention.js +58 -0
- package/static/build/shared/runCron.js +39 -17
- package/static/build/shared/schedulerMutationLock.js +44 -0
- package/static/build/shared/schedulerReadiness.js +82 -0
- package/static/build/shared/schemaMigrations.js +58 -0
- package/static/build/shared/scriptHistory.js +445 -0
- package/static/build/shared/shellQuote.js +11 -0
- package/static/build/shared/startupProcess.js +48 -0
- package/static/build/shared/store.js +7 -0
- package/static/build/shared/subscriptionMutationLock.js +34 -0
- package/static/build/shared/subscriptionPath.js +41 -0
- package/static/build/shared/subscriptionStorage.js +98 -0
- package/static/build/shared/trustProxy.js +119 -0
- package/static/build/shared/utils.js +2 -1
- package/static/build/token.js +3 -14
- package/static/build/validation/schedule.js +6 -12
- package/static/dist/{1885.e1ea09f6.async.js → 1885.b8f427bf.async.js} +1 -1
- package/static/dist/2031.6af40025.async.js +1 -0
- package/static/dist/2693.51c2636b.async.js +1 -0
- package/static/dist/{2890.9e373f5b.async.js → 2890.add55e85.async.js} +1 -1
- package/static/dist/2901.2ca95295.async.js +1 -0
- package/static/dist/292.264757f0.async.js +1 -0
- package/static/dist/3512.95e41255.async.js +1 -0
- package/static/dist/445.a65ff63b.async.js +1 -0
- package/static/dist/4736.1d2b5cb6.async.js +1 -0
- package/static/dist/{6013.4e38de36.async.js → 6013.db535339.async.js} +1 -1
- package/static/dist/6212.9e6d9913.async.js +1 -0
- package/static/dist/{6339.ab305e96.async.js → 6431.4603ad0e.async.js} +1 -1
- package/static/dist/{6872.42f939f1.async.js → 6872.a503ef55.async.js} +1 -1
- package/static/dist/7231.f7e5b668.async.js +1 -0
- package/static/dist/{7355.f9f263d8.async.js → 7355.fca746f5.async.js} +1 -1
- package/static/dist/{7508.7dcee91c.async.js → 7508.d90eac63.async.js} +1 -1
- package/static/dist/{7984.594296a5.async.js → 7984.eaac7402.async.js} +1 -1
- package/static/dist/8844.a0fef08e.async.js +1 -0
- package/static/dist/index.html +2 -2
- package/static/dist/layouts__index.633d3553.async.js +1 -0
- package/static/dist/preload_helper.01fcd534.js +1 -0
- package/static/dist/{src__pages__config__index.a22ff7dc.async.js → src__pages__config__index.9aba4054.async.js} +1 -1
- package/static/dist/src__pages__crontab__detail.86b2eebb.async.js +1 -0
- package/static/dist/src__pages__crontab__index.ae4e06f2.async.js +1 -0
- package/static/dist/{src__pages__crontab__logModal.0b8cce8c.async.js → src__pages__crontab__logModal.930535e2.async.js} +1 -1
- package/static/dist/src__pages__crontab__modal.a2c8fdcc.async.js +1 -0
- package/static/dist/src__pages__crontab__viewCreateModal.7b4f9cbe.async.js +1 -0
- package/static/dist/src__pages__crontab__viewManageModal.cd454ea0.async.js +1 -0
- package/static/dist/src__pages__dashboard__index.243c5a35.async.js +1 -0
- package/static/dist/src__pages__dashboard__taskResultModal.7795d6e1.async.js +1 -0
- package/static/dist/src__pages__dependence__index.874d501f.async.js +1 -0
- package/static/dist/src__pages__dependence__logModal.154efe7a.async.js +1 -0
- package/static/dist/src__pages__dependence__modal.0fa8b421.async.js +1 -0
- package/static/dist/src__pages__diff__index.b94e5dc5.async.js +1 -0
- package/static/dist/src__pages__env__editNameModal.c13d47d2.async.js +1 -0
- package/static/dist/src__pages__env__index.fd6fd2b0.async.js +1 -0
- package/static/dist/src__pages__env__modal.4d71adb3.async.js +1 -0
- package/static/dist/src__pages__error__index.aae50c94.async.js +1 -0
- package/static/dist/src__pages__initialization__index.82a2e967.async.js +1 -0
- package/static/dist/src__pages__log__index.71250e0d.async.js +1 -0
- package/static/dist/{src__pages__login__index.8c813eb1.async.js → src__pages__login__index.a0fd5ed8.async.js} +1 -1
- package/static/dist/src__pages__script__editModal.afabf073.async.js +1 -0
- package/static/dist/src__pages__script__editNameModal.789ad87b.async.js +1 -0
- package/static/dist/src__pages__script__historyDrawer.8c58d958.async.js +1 -0
- package/static/dist/src__pages__script__historyDrawer.a449193a.chunk.css +1 -0
- package/static/dist/src__pages__script__index.ab360776.chunk.css +1 -0
- package/static/dist/src__pages__script__index.fc575945.async.js +1 -0
- package/static/dist/src__pages__script__renameModal.0ab029e7.async.js +1 -0
- package/static/dist/src__pages__script__saveModal.8fca1a22.async.js +1 -0
- package/static/dist/src__pages__script__saveWithHistory.99ece830.async.js +1 -0
- package/static/dist/src__pages__script__setting.35ad4f02.async.js +1 -0
- package/static/dist/src__pages__setting__appModal.7eaeb9d3.async.js +1 -0
- package/static/dist/src__pages__setting__checkUpdate.d175b154.async.js +1 -0
- package/static/dist/src__pages__setting__clientIp.3a8711ed.async.js +1 -0
- package/static/dist/src__pages__setting__dependence.9c0f749b.async.js +1 -0
- package/static/dist/src__pages__setting__index.cb397741.async.js +1 -0
- package/static/dist/src__pages__setting__loginLog.e0a1f54d.async.js +1 -0
- package/static/dist/src__pages__setting__notification.2ffe4e5a.async.js +1 -0
- package/static/dist/src__pages__setting__other.3d0b8492.async.js +1 -0
- package/static/dist/{src__pages__setting__progress.8823ac90.async.js → src__pages__setting__progress.2ccae3d7.async.js} +1 -1
- package/static/dist/src__pages__setting__security.e2d71ebb.async.js +1 -0
- package/static/dist/src__pages__setting__systemLog.b3046955.async.js +1 -0
- package/static/dist/src__pages__subscription__index.43086a06.async.js +1 -0
- package/static/dist/src__pages__subscription__logModal.cdba5139.async.js +1 -0
- package/static/dist/src__pages__subscription__modal.30868ba8.async.js +1 -0
- package/static/dist/{umi.ca04a019.js → umi.3a24a9fa.js} +1 -1
- package/test/back/advisory-input-security.test.cjs +416 -0
- package/test/back/auth-security.test.cjs +74 -0
- package/test/back/build-provenance.test.cjs +150 -0
- package/test/back/code-scanning-security.test.cjs +189 -0
- package/test/back/cron-log-name.test.cjs +110 -0
- package/test/back/cron-macros.test.cjs +51 -0
- package/test/back/cron-schedule-compatibility.test.cjs +69 -0
- package/test/back/cron-scheduler-routing.test.cjs +59 -0
- package/test/back/cron-validation.test.cjs +45 -0
- package/test/back/dashboard-failures.test.cjs +173 -0
- package/test/back/database-bootstrap.test.cjs +193 -0
- package/test/back/dependence-cache-status.test.cjs +125 -0
- package/test/back/deprecated-file-routes.test.cjs +82 -0
- package/test/back/draft-path-security.test.cjs +235 -0
- package/test/back/ecosystem.test.cjs +28 -0
- package/test/back/env-import-security.test.cjs +91 -0
- package/test/back/env-name-parsing.test.cjs +96 -0
- package/test/back/execution-lifecycle.test.cjs +236 -0
- package/test/back/file-access-scope.test.cjs +180 -0
- package/test/back/file-access-security.test.cjs +47 -0
- package/test/back/fileTreeListing.test.cjs +57 -0
- package/test/back/grpc-cron-response.test.cjs +60 -0
- package/test/back/grpc-mtls-security.test.cjs +136 -0
- package/test/back/http-exclusive-listen.test.cjs +31 -0
- package/test/back/http-security.test.cjs +313 -0
- package/test/back/legacy-cron-recovery.test.cjs +76 -0
- package/test/back/linux-mirror-result.test.cjs +176 -0
- package/test/back/listen-security.test.cjs +68 -0
- package/test/back/log-path-security.test.cjs +158 -0
- package/test/back/logReader.test.cjs +72 -0
- package/test/back/manual-execution.test.cjs +85 -0
- package/test/back/manual-stop-claim.test.cjs +220 -0
- package/test/back/metrics.test.cjs +34 -0
- package/test/back/mirror-status.test.cjs +257 -0
- package/test/back/monitoring.test.cjs +73 -0
- package/test/back/node-cron-migration.test.cjs +65 -0
- package/test/back/node-path-cache.test.cjs +202 -0
- package/test/back/node-path-lock.test.cjs +182 -0
- package/test/back/npm-publication.test.cjs +70 -0
- package/test/back/preload-lazy-notify.test.cjs +168 -0
- package/test/back/primary-apm.test.cjs +24 -0
- package/test/back/process-exit-state.test.cjs +81 -0
- package/test/back/process-stop-signal.test.cjs +77 -0
- package/test/back/protected-path-case.test.cjs +58 -0
- package/test/back/qlServiceLogCommand.test.cjs +128 -0
- package/test/back/queued-cron-invalidation.test.cjs +98 -0
- package/test/back/restart-instance-recovery.test.cjs +116 -0
- package/test/back/retention.test.cjs +131 -0
- package/test/back/role-loading.test.cjs +118 -0
- package/test/back/schedule-health.test.cjs +86 -0
- package/test/back/scheduler-bulk-recovery.test.cjs +40 -0
- package/test/back/scheduler-concurrency.test.cjs +411 -0
- package/test/back/scheduler-file-lock.test.cjs +51 -0
- package/test/back/scheduler-mutation.test.cjs +312 -0
- package/test/back/scheduler-readiness.test.cjs +85 -0
- package/test/back/scheduler-reconciliation.test.cjs +206 -0
- package/test/back/scheduler-rpc-timeout.test.cjs +49 -0
- package/test/back/schema-migrations.test.cjs +127 -0
- package/test/back/script-file-access.test.cjs +210 -0
- package/test/back/script-history-api.test.cjs +551 -0
- package/test/back/script-history.test.cjs +383 -0
- package/test/back/shell-api-parsing.test.cjs +184 -0
- package/test/back/shell-translation-output.test.cjs +16 -0
- package/test/back/shell-upgrade.test.cjs +312 -0
- package/test/back/shellApiToken.test.cjs +151 -0
- package/test/back/sock-polling.test.cjs +297 -0
- package/test/back/sock-security.test.cjs +72 -0
- package/test/back/ssh-config-home.test.cjs +113 -0
- package/test/back/start-env-preservation.test.cjs +53 -0
- package/test/back/static-mirror-trigger.test.cjs +441 -0
- package/test/back/static-mirror.test.cjs +179 -0
- package/test/back/stop-failure-feedback.test.cjs +158 -0
- package/test/back/stop-race.test.cjs +171 -0
- package/test/back/subscription-cleanup.test.cjs +53 -0
- package/test/back/subscription-mutation-lock.test.cjs +83 -0
- package/test/back/subscription-review-regression.test.cjs +607 -0
- package/test/back/subscription-stop-state.test.cjs +66 -0
- package/test/back/subscription-storage-regression.test.cjs +553 -0
- package/test/back/system-dependence-cache.test.cjs +127 -0
- package/test/back/system-export-history.test.cjs +119 -0
- package/test/back/systemTokenRenewal.test.cjs +497 -0
- package/test/back/task-shell-lifecycle.test.cjs +194 -0
- package/test/back/task-time.test.cjs +116 -0
- package/test/back/unique-constraint-error.test.cjs +72 -0
- package/test/back/upgrade-guards.test.cjs +285 -0
- package/test/back/upgrade-lifecycle.test.cjs +288 -0
- package/test/back/upgrade-transaction.test.cjs +133 -0
- package/test/back/user-api.test.cjs +99 -0
- package/test/back/user-security.test.cjs +349 -0
- package/test/back/worker-apm.test.cjs +84 -0
- package/test/back/wpush-grpc.test.cjs +116 -0
- package/test/fixtures/legacy-cron.json +1371 -0
- package/test/front/cron-log-pagination.test.cjs +214 -0
- package/test/front/diff-file-routing.test.cjs +126 -0
- package/test/front/http-auth.test.cjs +152 -0
- package/test/front/http-error.test.cjs +29 -0
- package/test/front/script-history-save.test.cjs +121 -0
- package/test/helpers/load-security-module.cjs +42 -0
- package/test/helpers/upgrade-fixture.cjs +30 -0
- package/version.yaml +14 -34
- package/CLAUDE.md +0 -43
- package/static/dist/1147.c420132e.async.js +0 -1
- package/static/dist/134.54df9e38.async.js +0 -1
- package/static/dist/2096.6d98fd12.async.js +0 -1
- package/static/dist/2208.f7ba3dfa.async.js +0 -1
- package/static/dist/2286.164bb089.async.js +0 -1
- package/static/dist/3191.63263871.async.js +0 -1
- package/static/dist/4859.6592cebb.async.js +0 -1
- package/static/dist/4902.555f92ab.async.js +0 -1
- package/static/dist/5520.ff2cfd6b.async.js +0 -1
- package/static/dist/6431.c50479be.async.js +0 -1
- package/static/dist/6707.801b886b.async.js +0 -1
- package/static/dist/8826.2447a104.async.js +0 -1
- package/static/dist/layouts__index.a7a2bfe0.async.js +0 -1
- package/static/dist/preload_helper.0431c0f3.js +0 -1
- package/static/dist/src__pages__crontab__detail.b9c36808.async.js +0 -1
- package/static/dist/src__pages__crontab__index.fed99fd0.async.js +0 -1
- package/static/dist/src__pages__crontab__modal.f7041c7c.async.js +0 -1
- package/static/dist/src__pages__crontab__viewCreateModal.4d589f66.async.js +0 -1
- package/static/dist/src__pages__crontab__viewManageModal.0e317746.async.js +0 -1
- package/static/dist/src__pages__dashboard__index.b30f2f47.async.js +0 -1
- package/static/dist/src__pages__dependence__index.3d87ceac.async.js +0 -1
- package/static/dist/src__pages__dependence__logModal.0681830b.async.js +0 -1
- package/static/dist/src__pages__dependence__modal.11124896.async.js +0 -1
- package/static/dist/src__pages__diff__index.013b7c75.async.js +0 -1
- package/static/dist/src__pages__env__editNameModal.5d264b25.async.js +0 -1
- package/static/dist/src__pages__env__index.baa27d4e.async.js +0 -1
- package/static/dist/src__pages__env__modal.7f2ef1bc.async.js +0 -1
- package/static/dist/src__pages__error__index.f156b45e.async.js +0 -1
- package/static/dist/src__pages__initialization__index.e96d4ba8.async.js +0 -1
- package/static/dist/src__pages__log__index.e0978bae.async.js +0 -1
- package/static/dist/src__pages__script__editModal.cbf4ec0e.async.js +0 -1
- package/static/dist/src__pages__script__editNameModal.3e7e100d.async.js +0 -1
- package/static/dist/src__pages__script__index.2765d1b8.async.js +0 -1
- package/static/dist/src__pages__script__index.60b6f827.chunk.css +0 -1
- package/static/dist/src__pages__script__renameModal.5e987ef5.async.js +0 -1
- package/static/dist/src__pages__script__saveModal.3f9d23d6.async.js +0 -1
- package/static/dist/src__pages__script__setting.a535793a.async.js +0 -1
- package/static/dist/src__pages__setting__appModal.251cd14f.async.js +0 -1
- package/static/dist/src__pages__setting__checkUpdate.46efe057.async.js +0 -1
- package/static/dist/src__pages__setting__dependence.8a7a9529.async.js +0 -1
- package/static/dist/src__pages__setting__index.cc85fdfb.async.js +0 -1
- package/static/dist/src__pages__setting__loginLog.cea6056c.async.js +0 -1
- package/static/dist/src__pages__setting__notification.390fc905.async.js +0 -1
- package/static/dist/src__pages__setting__other.b22d2165.async.js +0 -1
- package/static/dist/src__pages__setting__security.598720a8.async.js +0 -1
- package/static/dist/src__pages__setting__systemLog.67406721.async.js +0 -1
- package/static/dist/src__pages__subscription__index.d0ab2abc.async.js +0 -1
- package/static/dist/src__pages__subscription__logModal.3864b37f.async.js +0 -1
- package/static/dist/src__pages__subscription__modal.3562c670.async.js +0 -1
- /package/static/dist/{4859.1b962b29.chunk.css → 292.1b962b29.chunk.css} +0 -0
|
@@ -26,6 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
const crypto_1 = require("crypto");
|
|
30
|
+
const fileAccess_1 = require("../shared/fileAccess");
|
|
29
31
|
const util_1 = require("../config/util");
|
|
30
32
|
const express_1 = require("express");
|
|
31
33
|
const typedi_1 = require("typedi");
|
|
@@ -34,20 +36,48 @@ const fs = __importStar(require("fs/promises"));
|
|
|
34
36
|
const celebrate_1 = require("celebrate");
|
|
35
37
|
const path_1 = __importStar(require("path"));
|
|
36
38
|
const script_1 = __importDefault(require("../services/script"));
|
|
39
|
+
const scriptHistory_1 = __importDefault(require("../services/scriptHistory"));
|
|
37
40
|
const i18n_1 = require("../shared/i18n");
|
|
38
41
|
const multer_1 = __importDefault(require("multer"));
|
|
39
42
|
const utils_1 = require("../shared/utils");
|
|
43
|
+
const scriptHistory_2 = require("../shared/scriptHistory");
|
|
40
44
|
const route = (0, express_1.Router)();
|
|
41
45
|
function isPathAllowed(targetPath) {
|
|
42
46
|
const resolved = path_1.default.resolve(targetPath);
|
|
43
|
-
return config_1.default.writePathList.some((x) =>
|
|
47
|
+
return config_1.default.writePathList.some((x) => Boolean((0, fileAccess_1.resolveFileAccess)(x, [resolved],
|
|
48
|
+
// Panel configuration secrets must not restrict user script filenames.
|
|
49
|
+
path_1.default.resolve(x) === path_1.default.resolve(config_1.default.configPath)
|
|
50
|
+
? config_1.default.blackFileList
|
|
51
|
+
: [])));
|
|
52
|
+
}
|
|
53
|
+
async function existingWritableRealPath(targetPath) {
|
|
54
|
+
if (!isPathAllowed(targetPath)) {
|
|
55
|
+
throw new scriptHistory_2.ScriptHistoryError(403, '暂无权限');
|
|
56
|
+
}
|
|
57
|
+
const resolved = (0, path_1.resolve)(targetPath);
|
|
58
|
+
for (const writableRoot of config_1.default.writePathList) {
|
|
59
|
+
const root = (0, path_1.resolve)(writableRoot);
|
|
60
|
+
const rootPrefix = root.endsWith(path_1.sep) ? root : root + path_1.sep;
|
|
61
|
+
// Keep an explicit normalized boundary check at the filesystem operation.
|
|
62
|
+
if (!resolved.startsWith(rootPrefix))
|
|
63
|
+
continue;
|
|
64
|
+
const realPath = await fs.realpath(resolved);
|
|
65
|
+
const realRoot = await fs.realpath(root);
|
|
66
|
+
const realRootPrefix = realRoot.endsWith(path_1.sep) ? realRoot : realRoot + path_1.sep;
|
|
67
|
+
if (!realPath.startsWith(realRootPrefix) ||
|
|
68
|
+
!(0, fileAccess_1.resolveFileAccess)(realRoot, [realPath], root === (0, path_1.resolve)(config_1.default.configPath) ? config_1.default.blackFileList : [])) {
|
|
69
|
+
throw new scriptHistory_2.ScriptHistoryError(403, '暂无权限');
|
|
70
|
+
}
|
|
71
|
+
return realPath;
|
|
72
|
+
}
|
|
73
|
+
throw new scriptHistory_2.ScriptHistoryError(403, '暂无权限');
|
|
44
74
|
}
|
|
45
75
|
const storage = multer_1.default.diskStorage({
|
|
46
76
|
destination: function (req, file, cb) {
|
|
47
|
-
cb(null, config_1.default.
|
|
77
|
+
cb(null, config_1.default.tmpPath);
|
|
48
78
|
},
|
|
49
79
|
filename: function (req, file, cb) {
|
|
50
|
-
cb(null,
|
|
80
|
+
cb(null, (0, crypto_1.randomUUID)());
|
|
51
81
|
},
|
|
52
82
|
});
|
|
53
83
|
const upload = (0, multer_1.default)({ storage: storage });
|
|
@@ -70,6 +100,9 @@ exports.default = (app) => {
|
|
|
70
100
|
'package-lock.json',
|
|
71
101
|
];
|
|
72
102
|
if (req.query.path) {
|
|
103
|
+
if (!(0, fileAccess_1.resolveFileAccess)(config_1.default.scriptPath, [req.query.path])) {
|
|
104
|
+
return res.send({ code: 403, message: (0, i18n_1.t)('暂无权限') });
|
|
105
|
+
}
|
|
73
106
|
result = await (0, util_1.readDir)(req.query.path, config_1.default.scriptPath, blacklist);
|
|
74
107
|
}
|
|
75
108
|
else {
|
|
@@ -108,29 +141,76 @@ exports.default = (app) => {
|
|
|
108
141
|
return next(e);
|
|
109
142
|
}
|
|
110
143
|
});
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
144
|
+
const historyError = (error, res, next) => {
|
|
145
|
+
if (error instanceof scriptHistory_2.ScriptHistoryError) {
|
|
146
|
+
return res.status(error.status).send(Object.assign({ code: error.status, message: (0, i18n_1.t)(error.message) }, (error instanceof scriptHistory_2.HistoryUnavailableError
|
|
147
|
+
? { historyUnavailable: true, currentHash: error.currentHash }
|
|
148
|
+
: {})));
|
|
149
|
+
}
|
|
150
|
+
return next(error);
|
|
151
|
+
};
|
|
152
|
+
const historyQuery = {
|
|
153
|
+
filename: celebrate_1.Joi.string().required(),
|
|
154
|
+
path: celebrate_1.Joi.string().optional().allow(''),
|
|
155
|
+
};
|
|
156
|
+
route.get('/history', (0, celebrate_1.celebrate)({ query: celebrate_1.Joi.object(historyQuery).unknown(true) }), async (req, res, next) => {
|
|
157
|
+
try {
|
|
158
|
+
const service = typedi_1.Container.get(scriptHistory_1.default);
|
|
159
|
+
const data = await service.list(req.query.path || '', req.query.filename);
|
|
160
|
+
res.send({ code: 200, data });
|
|
161
|
+
}
|
|
162
|
+
catch (error) {
|
|
163
|
+
historyError(error, res, next);
|
|
164
|
+
}
|
|
165
|
+
});
|
|
166
|
+
route.get('/history/detail', (0, celebrate_1.celebrate)({
|
|
167
|
+
query: celebrate_1.Joi.object(Object.assign(Object.assign({}, historyQuery), { id: celebrate_1.Joi.string().uuid().required() })).unknown(true),
|
|
118
168
|
}), async (req, res, next) => {
|
|
119
|
-
var _a;
|
|
120
169
|
try {
|
|
121
|
-
const
|
|
122
|
-
const
|
|
123
|
-
res.send({ code: 200, data
|
|
170
|
+
const service = typedi_1.Container.get(scriptHistory_1.default);
|
|
171
|
+
const data = await service.detail(req.query.path || '', req.query.filename, req.query.id);
|
|
172
|
+
res.send({ code: 200, data });
|
|
124
173
|
}
|
|
125
|
-
catch (
|
|
126
|
-
|
|
174
|
+
catch (error) {
|
|
175
|
+
historyError(error, res, next);
|
|
176
|
+
}
|
|
177
|
+
});
|
|
178
|
+
route.put('/history/restore', (0, celebrate_1.celebrate)({
|
|
179
|
+
body: celebrate_1.Joi.object(Object.assign(Object.assign({}, historyQuery), { id: celebrate_1.Joi.string().uuid().required(), expectedHash: celebrate_1.Joi.string().hex().length(64).required() })),
|
|
180
|
+
}), async (req, res, next) => {
|
|
181
|
+
try {
|
|
182
|
+
const { path = '', filename, id, expectedHash } = req.body;
|
|
183
|
+
const service = typedi_1.Container.get(scriptHistory_1.default);
|
|
184
|
+
const data = await service.restore(path, filename, id, expectedHash);
|
|
185
|
+
res.send({ code: 200, data });
|
|
186
|
+
}
|
|
187
|
+
catch (error) {
|
|
188
|
+
historyError(error, res, next);
|
|
127
189
|
}
|
|
128
190
|
});
|
|
129
|
-
route.
|
|
191
|
+
route.get('/:file', (req, res) => {
|
|
192
|
+
return res.send({
|
|
193
|
+
code: 410,
|
|
194
|
+
message: (0, i18n_1.t)('接口已下线,请使用 /scripts/detail 接口'),
|
|
195
|
+
});
|
|
196
|
+
});
|
|
197
|
+
route.post('/', (req, res, next) => {
|
|
198
|
+
res.on('finish', () => {
|
|
199
|
+
var _a;
|
|
200
|
+
if ((_a = req.file) === null || _a === void 0 ? void 0 : _a.path)
|
|
201
|
+
fs.unlink(req.file.path).catch(() => undefined);
|
|
202
|
+
});
|
|
203
|
+
next();
|
|
204
|
+
}, upload.single('file'), (0, celebrate_1.celebrate)({
|
|
130
205
|
body: celebrate_1.Joi.object({
|
|
131
206
|
filename: celebrate_1.Joi.string().required(),
|
|
132
207
|
path: celebrate_1.Joi.string().optional().allow(''),
|
|
133
208
|
content: celebrate_1.Joi.string().optional().allow(''),
|
|
209
|
+
skipHistory: celebrate_1.Joi.boolean().optional(),
|
|
210
|
+
expectedHash: celebrate_1.Joi.string()
|
|
211
|
+
.hex()
|
|
212
|
+
.length(64)
|
|
213
|
+
.when('skipHistory', { is: true, then: celebrate_1.Joi.required() }),
|
|
134
214
|
originFilename: celebrate_1.Joi.string().optional().allow(''),
|
|
135
215
|
directory: celebrate_1.Joi.string().optional().allow(''),
|
|
136
216
|
file: celebrate_1.Joi.string().optional().allow(''),
|
|
@@ -158,7 +238,8 @@ exports.default = (app) => {
|
|
|
158
238
|
if (!isPathAllowed(uploadPath)) {
|
|
159
239
|
return res.send({ code: 403, message: (0, i18n_1.t)('暂无权限') });
|
|
160
240
|
}
|
|
161
|
-
await fs.
|
|
241
|
+
await fs.copyFile(req.file.path, uploadPath);
|
|
242
|
+
await fs.unlink(req.file.path);
|
|
162
243
|
return res.send({ code: 200 });
|
|
163
244
|
}
|
|
164
245
|
if (directory) {
|
|
@@ -177,8 +258,56 @@ exports.default = (app) => {
|
|
|
177
258
|
if (!isPathAllowed(filePath) || !isPathAllowed(originFilePath)) {
|
|
178
259
|
return res.send({ code: 403, message: (0, i18n_1.t)('暂无权限') });
|
|
179
260
|
}
|
|
180
|
-
|
|
261
|
+
// Check the canonical parent directly at the directory creation boundary.
|
|
262
|
+
const parentPath = (0, path_1.resolve)((0, path_1.dirname)(filePath));
|
|
263
|
+
let parentCreated = false;
|
|
264
|
+
for (const writableRoot of config_1.default.writePathList) {
|
|
265
|
+
const root = (0, path_1.resolve)(writableRoot);
|
|
266
|
+
const rootPrefix = root.endsWith(path_1.sep) ? root : root + path_1.sep;
|
|
267
|
+
if (parentPath === root) {
|
|
268
|
+
await fs.mkdir(root, { recursive: true });
|
|
269
|
+
}
|
|
270
|
+
else if (parentPath.startsWith(rootPrefix)) {
|
|
271
|
+
await fs.mkdir(parentPath, { recursive: true });
|
|
272
|
+
}
|
|
273
|
+
else {
|
|
274
|
+
continue;
|
|
275
|
+
}
|
|
276
|
+
parentCreated = true;
|
|
277
|
+
break;
|
|
278
|
+
}
|
|
279
|
+
if (!parentCreated) {
|
|
280
|
+
return res.send({ code: 403, message: (0, i18n_1.t)('暂无权限') });
|
|
281
|
+
}
|
|
181
282
|
const fileExists = await (0, util_1.fileExist)(filePath);
|
|
283
|
+
if (fileExists && (0, fileAccess_1.resolveFileAccess)(config_1.default.scriptPath, [filePath])) {
|
|
284
|
+
let removeSource = filename !== originFilename;
|
|
285
|
+
let backupSource = '';
|
|
286
|
+
if (removeSource) {
|
|
287
|
+
const [originRealPath, targetRealPath] = await Promise.all([
|
|
288
|
+
existingWritableRealPath(originFilePath),
|
|
289
|
+
existingWritableRealPath(filePath),
|
|
290
|
+
]);
|
|
291
|
+
// Aliases of one script are an in-place save. Removing the source
|
|
292
|
+
// would also remove the destination behind a target symlink.
|
|
293
|
+
removeSource = originRealPath !== targetRealPath;
|
|
294
|
+
backupSource = originRealPath;
|
|
295
|
+
}
|
|
296
|
+
// Save-as removes the source after committing the destination. Keep
|
|
297
|
+
// its original content too: destination history only protects the
|
|
298
|
+
// file being overwritten, not the source being deleted.
|
|
299
|
+
if (removeSource) {
|
|
300
|
+
await fs.copyFile(backupSource, (0, path_1.join)(config_1.default.bakPath, originFilename.replace(/\//g, '')));
|
|
301
|
+
}
|
|
302
|
+
const service = typedi_1.Container.get(scriptHistory_1.default);
|
|
303
|
+
const data = await service.save(path, filename, content, {
|
|
304
|
+
skipHistory: req.body.skipHistory,
|
|
305
|
+
expectedHash: req.body.expectedHash,
|
|
306
|
+
});
|
|
307
|
+
if (removeSource)
|
|
308
|
+
await (0, util_1.rmPath)(originFilePath);
|
|
309
|
+
return res.send({ code: 200, data });
|
|
310
|
+
}
|
|
182
311
|
if (fileExists) {
|
|
183
312
|
await fs.copyFile(originFilePath, (0, path_1.join)(config_1.default.bakPath, originFilename.replace(/\//g, '')));
|
|
184
313
|
if (filename !== originFilename) {
|
|
@@ -189,7 +318,7 @@ exports.default = (app) => {
|
|
|
189
318
|
return res.send({ code: 200 });
|
|
190
319
|
}
|
|
191
320
|
catch (e) {
|
|
192
|
-
return
|
|
321
|
+
return historyError(e, res, next);
|
|
193
322
|
}
|
|
194
323
|
});
|
|
195
324
|
route.put('/', (0, celebrate_1.celebrate)({
|
|
@@ -197,6 +326,11 @@ exports.default = (app) => {
|
|
|
197
326
|
filename: celebrate_1.Joi.string().required(),
|
|
198
327
|
path: celebrate_1.Joi.string().optional().allow(''),
|
|
199
328
|
content: celebrate_1.Joi.string().required().allow(''),
|
|
329
|
+
skipHistory: celebrate_1.Joi.boolean().optional(),
|
|
330
|
+
expectedHash: celebrate_1.Joi.string()
|
|
331
|
+
.hex()
|
|
332
|
+
.length(64)
|
|
333
|
+
.when('skipHistory', { is: true, then: celebrate_1.Joi.required() }),
|
|
200
334
|
}),
|
|
201
335
|
}), async (req, res, next) => {
|
|
202
336
|
try {
|
|
@@ -209,11 +343,15 @@ exports.default = (app) => {
|
|
|
209
343
|
message: (0, i18n_1.t)('暂无权限'),
|
|
210
344
|
});
|
|
211
345
|
}
|
|
212
|
-
|
|
213
|
-
|
|
346
|
+
const service = typedi_1.Container.get(scriptHistory_1.default);
|
|
347
|
+
const data = await service.save(path || '', filename, content, {
|
|
348
|
+
skipHistory: req.body.skipHistory,
|
|
349
|
+
expectedHash: req.body.expectedHash,
|
|
350
|
+
});
|
|
351
|
+
return res.send({ code: 200, data });
|
|
214
352
|
}
|
|
215
353
|
catch (e) {
|
|
216
|
-
return
|
|
354
|
+
return historyError(e, res, next);
|
|
217
355
|
}
|
|
218
356
|
});
|
|
219
357
|
route.delete('/', (0, celebrate_1.celebrate)({
|
|
@@ -316,11 +454,20 @@ exports.default = (app) => {
|
|
|
316
454
|
if (!isPathAllowed(filePath)) {
|
|
317
455
|
return res.send({ code: 403, message: (0, i18n_1.t)('暂无权限') });
|
|
318
456
|
}
|
|
319
|
-
const logPath = (0,
|
|
457
|
+
const logPath = (0, fileAccess_1.resolveFileAccess)(config_1.default.logPath, [
|
|
458
|
+
path,
|
|
459
|
+
`${name}.swap`,
|
|
460
|
+
]);
|
|
461
|
+
if (!logPath) {
|
|
462
|
+
return res.send({ code: 403, message: (0, i18n_1.t)('暂无权限') });
|
|
463
|
+
}
|
|
320
464
|
const scriptService = typedi_1.Container.get(script_1.default);
|
|
321
465
|
const result = await scriptService.stopScript(filePath, pid);
|
|
322
466
|
setTimeout(() => {
|
|
323
|
-
(0,
|
|
467
|
+
const cleanupPath = (0, fileAccess_1.resolveFileAccess)(config_1.default.logPath, [logPath]);
|
|
468
|
+
if (cleanupPath) {
|
|
469
|
+
void (0, util_1.rmPath)(cleanupPath);
|
|
470
|
+
}
|
|
324
471
|
}, 3000);
|
|
325
472
|
res.send(result);
|
|
326
473
|
}
|
|
@@ -7,7 +7,7 @@ const express_1 = require("express");
|
|
|
7
7
|
const typedi_1 = require("typedi");
|
|
8
8
|
const subscription_1 = __importDefault(require("../services/subscription"));
|
|
9
9
|
const celebrate_1 = require("celebrate");
|
|
10
|
-
const
|
|
10
|
+
const cronSchedule_1 = require("../shared/cronSchedule");
|
|
11
11
|
const route = (0, express_1.Router)();
|
|
12
12
|
exports.default = (app) => {
|
|
13
13
|
app.use('/subscriptions', route);
|
|
@@ -54,8 +54,7 @@ exports.default = (app) => {
|
|
|
54
54
|
}), async (req, res, next) => {
|
|
55
55
|
const logger = typedi_1.Container.get('logger');
|
|
56
56
|
try {
|
|
57
|
-
if (!req.body.schedule ||
|
|
58
|
-
cron_parser_1.default.parse(req.body.schedule).hasNext()) {
|
|
57
|
+
if (!req.body.schedule || (0, cronSchedule_1.isValidCronSchedule)(req.body.schedule)) {
|
|
59
58
|
const subscriptionService = typedi_1.Container.get(subscription_1.default);
|
|
60
59
|
const data = await subscriptionService.create(req.body);
|
|
61
60
|
return res.send({ code: 200, data });
|
|
@@ -124,12 +123,26 @@ exports.default = (app) => {
|
|
|
124
123
|
params: celebrate_1.Joi.object({
|
|
125
124
|
id: celebrate_1.Joi.number().required(),
|
|
126
125
|
}),
|
|
126
|
+
query: celebrate_1.Joi.object({
|
|
127
|
+
offset: celebrate_1.Joi.number().integer().min(0).optional(),
|
|
128
|
+
limit: celebrate_1.Joi.number()
|
|
129
|
+
.integer()
|
|
130
|
+
.min(1)
|
|
131
|
+
.max(1024 * 1024)
|
|
132
|
+
.optional(),
|
|
133
|
+
tail: celebrate_1.Joi.boolean().optional(),
|
|
134
|
+
t: celebrate_1.Joi.string().optional(),
|
|
135
|
+
}).unknown(true),
|
|
127
136
|
}), async (req, res, next) => {
|
|
128
137
|
const logger = typedi_1.Container.get('logger');
|
|
129
138
|
try {
|
|
130
139
|
const subscriptionService = typedi_1.Container.get(subscription_1.default);
|
|
131
|
-
const
|
|
132
|
-
|
|
140
|
+
const result = await subscriptionService.log(req.params.id, {
|
|
141
|
+
offset: req.query.offset,
|
|
142
|
+
limit: req.query.limit,
|
|
143
|
+
tail: req.query.tail,
|
|
144
|
+
});
|
|
145
|
+
return res.send(Object.assign({ code: 200, data: result.content }, result));
|
|
133
146
|
}
|
|
134
147
|
catch (e) {
|
|
135
148
|
return next(e);
|
|
@@ -161,9 +174,7 @@ exports.default = (app) => {
|
|
|
161
174
|
}), async (req, res, next) => {
|
|
162
175
|
const logger = typedi_1.Container.get('logger');
|
|
163
176
|
try {
|
|
164
|
-
if (!req.body.schedule ||
|
|
165
|
-
typeof req.body.schedule === 'object' ||
|
|
166
|
-
cron_parser_1.default.parse(req.body.schedule).hasNext()) {
|
|
177
|
+
if (!req.body.schedule || (0, cronSchedule_1.isValidCronSchedule)(req.body.schedule)) {
|
|
167
178
|
const subscriptionService = typedi_1.Container.get(subscription_1.default);
|
|
168
179
|
const data = await subscriptionService.update(req.body);
|
|
169
180
|
return res.send({ code: 200, data });
|
|
@@ -1,19 +1,46 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
5
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
29
|
const express_1 = require("express");
|
|
7
30
|
const typedi_1 = require("typedi");
|
|
31
|
+
const fs = __importStar(require("fs/promises"));
|
|
8
32
|
const config_1 = __importDefault(require("../config"));
|
|
9
33
|
const system_1 = __importDefault(require("../services/system"));
|
|
10
34
|
const celebrate_1 = require("celebrate");
|
|
11
35
|
const user_1 = __importDefault(require("../services/user"));
|
|
12
36
|
const i18n_1 = require("../shared/i18n");
|
|
37
|
+
const auth_1 = require("../shared/auth");
|
|
13
38
|
const util_1 = require("../config/util");
|
|
39
|
+
const cronCommand_1 = require("../shared/cronCommand");
|
|
14
40
|
const dayjs_1 = __importDefault(require("dayjs"));
|
|
15
41
|
const multer_1 = __importDefault(require("multer"));
|
|
16
42
|
const logStreamManager_1 = require("../shared/logStreamManager");
|
|
43
|
+
const express_rate_limit_1 = require("express-rate-limit");
|
|
17
44
|
const route = (0, express_1.Router)();
|
|
18
45
|
const storage = multer_1.default.diskStorage({
|
|
19
46
|
destination: function (req, file, cb) {
|
|
@@ -32,12 +59,7 @@ exports.default = (app) => {
|
|
|
32
59
|
const userService = typedi_1.Container.get(user_1.default);
|
|
33
60
|
const authInfo = await userService.getAuthInfo();
|
|
34
61
|
const { version, changeLog, changeLogLink, publishTime } = await (0, util_1.parseVersion)(config_1.default.versionFile);
|
|
35
|
-
|
|
36
|
-
if (Object.keys(authInfo).length === 2 &&
|
|
37
|
-
authInfo.username === 'admin' &&
|
|
38
|
-
authInfo.password === 'admin') {
|
|
39
|
-
isInitialized = false;
|
|
40
|
-
}
|
|
62
|
+
const isInitialized = !(0, auth_1.isDefaultAuthInfo)(authInfo);
|
|
41
63
|
res.send({
|
|
42
64
|
code: 200,
|
|
43
65
|
data: {
|
|
@@ -203,7 +225,7 @@ exports.default = (app) => {
|
|
|
203
225
|
return next(e);
|
|
204
226
|
}
|
|
205
227
|
});
|
|
206
|
-
route.put('/command-run', (0, celebrate_1.celebrate)({
|
|
228
|
+
route.put('/command-run', (0, express_rate_limit_1.rateLimit)({ windowMs: 60 * 1000, limit: 60 }), (0, celebrate_1.celebrate)({
|
|
207
229
|
body: celebrate_1.Joi.object({
|
|
208
230
|
command: celebrate_1.Joi.string().required(),
|
|
209
231
|
}),
|
|
@@ -211,8 +233,14 @@ exports.default = (app) => {
|
|
|
211
233
|
try {
|
|
212
234
|
const systemService = typedi_1.Container.get(system_1.default);
|
|
213
235
|
const command = req.body.command;
|
|
214
|
-
const
|
|
215
|
-
|
|
236
|
+
const crontab = await fs
|
|
237
|
+
.readFile(config_1.default.crontabFile, 'utf8')
|
|
238
|
+
.catch((e) => {
|
|
239
|
+
if (e.code === 'ENOENT')
|
|
240
|
+
return '';
|
|
241
|
+
throw e;
|
|
242
|
+
});
|
|
243
|
+
const id = (0, cronCommand_1.findCronId)(crontab, command);
|
|
216
244
|
const uniqPath = await (0, util_1.getUniqPath)(command, id);
|
|
217
245
|
const logTime = (0, dayjs_1.default)().format('YYYY-MM-DD-HH-mm-ss-SSS');
|
|
218
246
|
const logPath = `${uniqPath}/${logTime}.log`;
|
|
@@ -224,8 +252,12 @@ exports.default = (app) => {
|
|
|
224
252
|
},
|
|
225
253
|
onEnd: async (cp, endTime, diff) => {
|
|
226
254
|
// Close the stream after task completion
|
|
227
|
-
|
|
228
|
-
|
|
255
|
+
try {
|
|
256
|
+
await logStreamManager_1.logStreamManager.closeStream(await (0, util_1.handleLogPath)(logPath));
|
|
257
|
+
}
|
|
258
|
+
finally {
|
|
259
|
+
res.end();
|
|
260
|
+
}
|
|
229
261
|
},
|
|
230
262
|
onError: async (message) => {
|
|
231
263
|
res.write(message);
|
|
@@ -285,6 +317,11 @@ exports.default = (app) => {
|
|
|
285
317
|
query: {
|
|
286
318
|
startTime: celebrate_1.Joi.string().allow('').optional(),
|
|
287
319
|
endTime: celebrate_1.Joi.string().allow('').optional(),
|
|
320
|
+
limit: celebrate_1.Joi.number()
|
|
321
|
+
.integer()
|
|
322
|
+
.min(1)
|
|
323
|
+
.max(1024 * 1024)
|
|
324
|
+
.optional(),
|
|
288
325
|
t: celebrate_1.Joi.string().optional(),
|
|
289
326
|
},
|
|
290
327
|
}), async (req, res, next) => {
|
|
@@ -316,7 +353,10 @@ exports.default = (app) => {
|
|
|
316
353
|
}), async (req, res, next) => {
|
|
317
354
|
try {
|
|
318
355
|
const userService = typedi_1.Container.get(user_1.default);
|
|
319
|
-
await userService.resetAuthInfo(req.body);
|
|
356
|
+
const result = await userService.resetAuthInfo(req.body);
|
|
357
|
+
if (result) {
|
|
358
|
+
return res.send(result);
|
|
359
|
+
}
|
|
320
360
|
res.send({ code: 200, message: (0, i18n_1.t)('更新成功') });
|
|
321
361
|
}
|
|
322
362
|
catch (e) {
|
|
@@ -351,6 +391,20 @@ exports.default = (app) => {
|
|
|
351
391
|
return next(e);
|
|
352
392
|
}
|
|
353
393
|
});
|
|
394
|
+
route.put('/config/panel-title', (0, celebrate_1.celebrate)({
|
|
395
|
+
body: celebrate_1.Joi.object({
|
|
396
|
+
panelTitle: celebrate_1.Joi.string().max(100).allow('').allow(null),
|
|
397
|
+
}),
|
|
398
|
+
}), async (req, res, next) => {
|
|
399
|
+
try {
|
|
400
|
+
const systemService = typedi_1.Container.get(system_1.default);
|
|
401
|
+
const result = await systemService.updatePanelTitle(req.body);
|
|
402
|
+
res.send(result);
|
|
403
|
+
}
|
|
404
|
+
catch (e) {
|
|
405
|
+
return next(e);
|
|
406
|
+
}
|
|
407
|
+
});
|
|
354
408
|
route.put('/config/global-ssh-key', (0, celebrate_1.celebrate)({
|
|
355
409
|
body: celebrate_1.Joi.object({
|
|
356
410
|
globalSshKey: celebrate_1.Joi.string().allow('').allow(null),
|
package/static/build/api/user.js
CHANGED
|
@@ -25,7 +25,25 @@ const storage = multer_1.default.diskStorage({
|
|
|
25
25
|
cb(null, key + ext);
|
|
26
26
|
},
|
|
27
27
|
});
|
|
28
|
-
const upload = (0, multer_1.default)({
|
|
28
|
+
const upload = (0, multer_1.default)({
|
|
29
|
+
storage,
|
|
30
|
+
limits: { fileSize: 5 * 1024 * 1024, files: 1 },
|
|
31
|
+
fileFilter: (_req, file, cb) => {
|
|
32
|
+
const ext = path_1.default.extname(file.originalname).toLowerCase();
|
|
33
|
+
const imageTypes = {
|
|
34
|
+
'.png': 'image/png',
|
|
35
|
+
'.jpg': 'image/jpeg',
|
|
36
|
+
'.jpeg': 'image/jpeg',
|
|
37
|
+
'.gif': 'image/gif',
|
|
38
|
+
'.webp': 'image/webp',
|
|
39
|
+
'.avif': 'image/avif',
|
|
40
|
+
};
|
|
41
|
+
if (imageTypes[ext] !== file.mimetype) {
|
|
42
|
+
return cb(new Error((0, i18n_1.t)('仅支持 PNG、JPEG、GIF、WebP、AVIF 图片')));
|
|
43
|
+
}
|
|
44
|
+
cb(null, true);
|
|
45
|
+
},
|
|
46
|
+
});
|
|
29
47
|
exports.default = (app) => {
|
|
30
48
|
app.use('/user', route);
|
|
31
49
|
route.post('/login', (0, express_rate_limit_1.default)({
|
|
@@ -33,8 +51,8 @@ exports.default = (app) => {
|
|
|
33
51
|
max: 100,
|
|
34
52
|
}), (0, celebrate_1.celebrate)({
|
|
35
53
|
body: celebrate_1.Joi.object({
|
|
36
|
-
username: celebrate_1.Joi.string().required(),
|
|
37
|
-
password: celebrate_1.Joi.string().required(),
|
|
54
|
+
username: celebrate_1.Joi.string().max(1024).required(),
|
|
55
|
+
password: celebrate_1.Joi.string().max(1024).required(),
|
|
38
56
|
}),
|
|
39
57
|
}), async (req, res, next) => {
|
|
40
58
|
const logger = typedi_1.Container.get('logger');
|
|
@@ -61,8 +79,8 @@ exports.default = (app) => {
|
|
|
61
79
|
});
|
|
62
80
|
route.put('/', (0, celebrate_1.celebrate)({
|
|
63
81
|
body: celebrate_1.Joi.object({
|
|
64
|
-
username: celebrate_1.Joi.string().required(),
|
|
65
|
-
password: celebrate_1.Joi.string().required(),
|
|
82
|
+
username: celebrate_1.Joi.string().max(1024).required(),
|
|
83
|
+
password: celebrate_1.Joi.string().max(1024).required(),
|
|
66
84
|
}),
|
|
67
85
|
}), async (req, res, next) => {
|
|
68
86
|
try {
|
|
@@ -70,8 +88,8 @@ exports.default = (app) => {
|
|
|
70
88
|
return res.send({ code: 450, message: (0, i18n_1.t)('未知错误') });
|
|
71
89
|
}
|
|
72
90
|
const userService = typedi_1.Container.get(user_1.default);
|
|
73
|
-
await userService.updateUsernameAndPassword(req.body);
|
|
74
|
-
res.send(
|
|
91
|
+
const result = await userService.updateUsernameAndPassword(req.body);
|
|
92
|
+
res.send(result);
|
|
75
93
|
}
|
|
76
94
|
catch (e) {
|
|
77
95
|
return next(e);
|
|
@@ -133,11 +151,11 @@ exports.default = (app) => {
|
|
|
133
151
|
return next(e);
|
|
134
152
|
}
|
|
135
153
|
});
|
|
136
|
-
route.put('/two-factor/login', (0, celebrate_1.celebrate)({
|
|
154
|
+
route.put('/two-factor/login', (0, express_rate_limit_1.default)({ windowMs: 15 * 60 * 1000, max: 20 }), (0, celebrate_1.celebrate)({
|
|
137
155
|
body: celebrate_1.Joi.object({
|
|
138
156
|
code: celebrate_1.Joi.string().required(),
|
|
139
|
-
username: celebrate_1.Joi.string().required(),
|
|
140
|
-
password: celebrate_1.Joi.string().required(),
|
|
157
|
+
username: celebrate_1.Joi.string().max(1024).required(),
|
|
158
|
+
password: celebrate_1.Joi.string().max(1024).required(),
|
|
141
159
|
}),
|
|
142
160
|
}), async (req, res, next) => {
|
|
143
161
|
const logger = typedi_1.Container.get('logger');
|
|
@@ -161,6 +179,48 @@ exports.default = (app) => {
|
|
|
161
179
|
return next(e);
|
|
162
180
|
}
|
|
163
181
|
});
|
|
182
|
+
route.get('/ip-blacklist', async (req, res, next) => {
|
|
183
|
+
try {
|
|
184
|
+
const userService = typedi_1.Container.get(user_1.default);
|
|
185
|
+
const data = await userService.getIpBlacklist();
|
|
186
|
+
res.send({ code: 200, data });
|
|
187
|
+
}
|
|
188
|
+
catch (e) {
|
|
189
|
+
return next(e);
|
|
190
|
+
}
|
|
191
|
+
});
|
|
192
|
+
route.put('/ip-blacklist', (0, celebrate_1.celebrate)({
|
|
193
|
+
body: celebrate_1.Joi.object({
|
|
194
|
+
ip: celebrate_1.Joi.string()
|
|
195
|
+
.ip({ version: ['ipv4', 'ipv6'], cidr: 'forbidden' })
|
|
196
|
+
.required(),
|
|
197
|
+
}),
|
|
198
|
+
}), async (req, res, next) => {
|
|
199
|
+
try {
|
|
200
|
+
const userService = typedi_1.Container.get(user_1.default);
|
|
201
|
+
const data = await userService.blockIp(req.body.ip);
|
|
202
|
+
res.send({ code: 200, data, message: (0, i18n_1.t)('已加入 IP 黑名单') });
|
|
203
|
+
}
|
|
204
|
+
catch (e) {
|
|
205
|
+
return next(e);
|
|
206
|
+
}
|
|
207
|
+
});
|
|
208
|
+
route.delete('/ip-blacklist', (0, celebrate_1.celebrate)({
|
|
209
|
+
body: celebrate_1.Joi.object({
|
|
210
|
+
ip: celebrate_1.Joi.string()
|
|
211
|
+
.ip({ version: ['ipv4', 'ipv6'], cidr: 'forbidden' })
|
|
212
|
+
.required(),
|
|
213
|
+
}),
|
|
214
|
+
}), async (req, res, next) => {
|
|
215
|
+
try {
|
|
216
|
+
const userService = typedi_1.Container.get(user_1.default);
|
|
217
|
+
const data = await userService.unblockIp(req.body.ip);
|
|
218
|
+
res.send({ code: 200, data, message: (0, i18n_1.t)('已移出 IP 黑名单') });
|
|
219
|
+
}
|
|
220
|
+
catch (e) {
|
|
221
|
+
return next(e);
|
|
222
|
+
}
|
|
223
|
+
});
|
|
164
224
|
route.get('/notification', async (req, res, next) => {
|
|
165
225
|
const logger = typedi_1.Container.get('logger');
|
|
166
226
|
try {
|
|
@@ -183,17 +243,17 @@ exports.default = (app) => {
|
|
|
183
243
|
return next(e);
|
|
184
244
|
}
|
|
185
245
|
});
|
|
186
|
-
route.put('/init', (0, celebrate_1.celebrate)({
|
|
246
|
+
route.put('/init', (0, express_rate_limit_1.default)({ windowMs: 15 * 60 * 1000, max: 20 }), (0, celebrate_1.celebrate)({
|
|
187
247
|
body: celebrate_1.Joi.object({
|
|
188
|
-
username: celebrate_1.Joi.string().required(),
|
|
189
|
-
password: celebrate_1.Joi.string().required(),
|
|
248
|
+
username: celebrate_1.Joi.string().max(1024).required(),
|
|
249
|
+
password: celebrate_1.Joi.string().max(1024).required(),
|
|
190
250
|
}),
|
|
191
251
|
}), async (req, res, next) => {
|
|
192
252
|
const logger = typedi_1.Container.get('logger');
|
|
193
253
|
try {
|
|
194
254
|
const userService = typedi_1.Container.get(user_1.default);
|
|
195
|
-
await userService.
|
|
196
|
-
res.send(
|
|
255
|
+
const result = await userService.initializeUser(req.body);
|
|
256
|
+
res.send(result);
|
|
197
257
|
}
|
|
198
258
|
catch (e) {
|
|
199
259
|
return next(e);
|