@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
|
@@ -27,53 +27,78 @@ const schedule_1 = __importDefault(require("./schedule"));
|
|
|
27
27
|
const sock_1 = __importDefault(require("./sock"));
|
|
28
28
|
const dayjs_1 = __importDefault(require("dayjs"));
|
|
29
29
|
const ip2region_1 = __importDefault(require("ip2region"));
|
|
30
|
-
const request_ip_1 = __importDefault(require("request-ip"));
|
|
31
30
|
const uniq_1 = __importDefault(require("lodash/uniq"));
|
|
32
31
|
const pickBy_1 = __importDefault(require("lodash/pickBy"));
|
|
33
32
|
const isNil_1 = __importDefault(require("lodash/isNil"));
|
|
34
33
|
const store_1 = require("../shared/store");
|
|
35
34
|
const i18n_1 = require("../shared/i18n");
|
|
35
|
+
const clientIp_1 = require("../shared/clientIp");
|
|
36
|
+
const auth_1 = require("../shared/auth");
|
|
37
|
+
const password_1 = require("../shared/password");
|
|
38
|
+
const authMutation_1 = require("../shared/authMutation");
|
|
39
|
+
const loginThrottle_1 = require("../shared/loginThrottle");
|
|
36
40
|
let UserService = class UserService {
|
|
37
41
|
constructor(logger, scheduleService, sockService) {
|
|
38
42
|
this.logger = logger;
|
|
39
43
|
this.scheduleService = scheduleService;
|
|
40
44
|
this.sockService = sockService;
|
|
45
|
+
this.loginThrottle = new loginThrottle_1.LoginThrottle();
|
|
41
46
|
}
|
|
42
|
-
async login(payloads, req
|
|
47
|
+
async login(payloads, req) {
|
|
48
|
+
return this.authenticate(payloads, req);
|
|
49
|
+
}
|
|
50
|
+
async authenticate(payloads, req, needTwoFactor = true) {
|
|
43
51
|
let { username, password } = payloads;
|
|
44
52
|
const content = await this.getAuthInfo();
|
|
53
|
+
if ((0, auth_1.isDefaultAuthInfo)(content)) {
|
|
54
|
+
return { code: 450, message: (0, i18n_1.t)('请先初始化') };
|
|
55
|
+
}
|
|
45
56
|
const timestamp = Date.now();
|
|
46
|
-
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
57
|
+
const ip = (0, clientIp_1.getClientIp)(req);
|
|
58
|
+
const query = new ip2region_1.default();
|
|
59
|
+
const ipAddress = query.search(ip);
|
|
60
|
+
let address = '';
|
|
61
|
+
if (ipAddress) {
|
|
62
|
+
const { country, province, city, isp } = ipAddress;
|
|
63
|
+
address = (0, uniq_1.default)([country, province, city, isp]).filter(Boolean).join(' ');
|
|
64
|
+
}
|
|
65
|
+
let { username: cUsername, password: cPassword, retries = 0, lastlogon, lastip, lastaddr, twoFactorActivated, tokens = {}, platform, blockedIps = [], } = content;
|
|
66
|
+
if (ip &&
|
|
67
|
+
blockedIps.some((blockedIp) => (0, clientIp_1.normalizeClientIp)(blockedIp) === ip)) {
|
|
68
|
+
await this.insertDb({
|
|
69
|
+
type: system_1.AuthDataType.loginLog,
|
|
70
|
+
info: {
|
|
71
|
+
timestamp,
|
|
72
|
+
address,
|
|
73
|
+
ip,
|
|
74
|
+
platform: req.platform,
|
|
75
|
+
status: system_1.LoginStatus.fail,
|
|
76
|
+
},
|
|
77
|
+
});
|
|
78
|
+
this.getLoginLog();
|
|
79
|
+
return { code: 403, message: (0, i18n_1.t)('该 IP 已被列入黑名单') };
|
|
80
|
+
}
|
|
81
|
+
const waitTime = this.loginThrottle.retryAfter(ip, timestamp);
|
|
82
|
+
if (waitTime > 0) {
|
|
50
83
|
return {
|
|
51
84
|
code: 410,
|
|
52
|
-
message:
|
|
85
|
+
message: (0, i18n_1.tf)('失败次数过多,请%s秒后重试', waitTime),
|
|
53
86
|
data: waitTime,
|
|
54
87
|
};
|
|
55
88
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
twoFactorActivated &&
|
|
59
|
-
needTwoFactor) {
|
|
89
|
+
const passwordMatches = username === cUsername && (await (0, password_1.verifyPassword)(password, cPassword));
|
|
90
|
+
if (passwordMatches && twoFactorActivated && needTwoFactor) {
|
|
60
91
|
await this.updateAuthInfo(content, {
|
|
61
92
|
isTwoFactorChecking: true,
|
|
93
|
+
twoFactorExpiresAt: timestamp + 5 * 60 * 1000,
|
|
62
94
|
});
|
|
63
95
|
return {
|
|
64
96
|
code: 420,
|
|
65
97
|
message: '',
|
|
66
98
|
};
|
|
67
99
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
const ipAddress = query.search(ip);
|
|
71
|
-
let address = '';
|
|
72
|
-
if (ipAddress) {
|
|
73
|
-
const { country, province, city, isp } = ipAddress;
|
|
74
|
-
address = (0, uniq_1.default)([country, province, city, isp]).filter(Boolean).join(' ');
|
|
75
|
-
}
|
|
76
|
-
if (username === cUsername && password === cPassword) {
|
|
100
|
+
if (passwordMatches) {
|
|
101
|
+
this.loginThrottle.reset(ip);
|
|
77
102
|
const data = (0, util_1.createRandomString)(50, 100);
|
|
78
103
|
const expiration = twoFactorActivated ? '60d' : '20d';
|
|
79
104
|
let token = jsonwebtoken_1.default.sign({ data }, config_1.default.jwt.secret, {
|
|
@@ -89,6 +114,9 @@ let UserService = class UserService {
|
|
|
89
114
|
};
|
|
90
115
|
const updatedTokens = this.addTokenToList(tokens, req.platform, tokenInfo);
|
|
91
116
|
await this.updateAuthInfo(content, {
|
|
117
|
+
password: (0, password_1.isPasswordHash)(cPassword)
|
|
118
|
+
? cPassword
|
|
119
|
+
: await (0, password_1.hashPassword)(password),
|
|
92
120
|
token,
|
|
93
121
|
tokens: updatedTokens,
|
|
94
122
|
lastlogon: timestamp,
|
|
@@ -97,8 +125,20 @@ let UserService = class UserService {
|
|
|
97
125
|
lastaddr: address,
|
|
98
126
|
platform: req.platform,
|
|
99
127
|
isTwoFactorChecking: false,
|
|
128
|
+
twoFactorExpiresAt: 0,
|
|
100
129
|
});
|
|
101
|
-
this.notificationService.notify('登录通知',
|
|
130
|
+
this.notificationService.notify((0, i18n_1.t)('登录通知'), (0, i18n_1.t)('你于') +
|
|
131
|
+
(0, dayjs_1.default)(timestamp).format('YYYY-MM-DD HH:mm:ss') +
|
|
132
|
+
(0, i18n_1.t)('在') +
|
|
133
|
+
address +
|
|
134
|
+
' ' +
|
|
135
|
+
req.platform +
|
|
136
|
+
(0, i18n_1.t)('端') +
|
|
137
|
+
' ' +
|
|
138
|
+
(0, i18n_1.t)('登录成功') +
|
|
139
|
+
(0, i18n_1.t)(',ip地址') +
|
|
140
|
+
' ' +
|
|
141
|
+
ip);
|
|
102
142
|
await this.insertDb({
|
|
103
143
|
type: system_1.AuthDataType.loginLog,
|
|
104
144
|
info: {
|
|
@@ -123,14 +163,26 @@ let UserService = class UserService {
|
|
|
123
163
|
};
|
|
124
164
|
}
|
|
125
165
|
else {
|
|
166
|
+
const failures = this.loginThrottle.fail(ip, timestamp);
|
|
126
167
|
await this.updateAuthInfo(content, {
|
|
127
|
-
retries:
|
|
168
|
+
retries: failures,
|
|
128
169
|
lastlogon: timestamp,
|
|
129
170
|
lastip: ip,
|
|
130
171
|
lastaddr: address,
|
|
131
172
|
platform: req.platform,
|
|
132
173
|
});
|
|
133
|
-
this.notificationService.notify('登录通知',
|
|
174
|
+
this.notificationService.notify((0, i18n_1.t)('登录通知'), (0, i18n_1.t)('你于') +
|
|
175
|
+
(0, dayjs_1.default)(timestamp).format('YYYY-MM-DD HH:mm:ss') +
|
|
176
|
+
(0, i18n_1.t)('在') +
|
|
177
|
+
address +
|
|
178
|
+
' ' +
|
|
179
|
+
req.platform +
|
|
180
|
+
(0, i18n_1.t)('端') +
|
|
181
|
+
' ' +
|
|
182
|
+
(0, i18n_1.t)('登录失败') +
|
|
183
|
+
(0, i18n_1.t)(',ip地址') +
|
|
184
|
+
' ' +
|
|
185
|
+
ip);
|
|
134
186
|
await this.insertDb({
|
|
135
187
|
type: system_1.AuthDataType.loginLog,
|
|
136
188
|
info: {
|
|
@@ -142,16 +194,16 @@ let UserService = class UserService {
|
|
|
142
194
|
},
|
|
143
195
|
});
|
|
144
196
|
this.getLoginLog();
|
|
145
|
-
if (
|
|
146
|
-
const waitTime =
|
|
197
|
+
if (failures > 3) {
|
|
198
|
+
const waitTime = this.loginThrottle.retryAfter(ip, timestamp);
|
|
147
199
|
return {
|
|
148
200
|
code: 410,
|
|
149
|
-
message:
|
|
201
|
+
message: (0, i18n_1.tf)('失败次数过多,请%s秒后重试', waitTime),
|
|
150
202
|
data: waitTime,
|
|
151
203
|
};
|
|
152
204
|
}
|
|
153
205
|
else {
|
|
154
|
-
return { code: 400, message:
|
|
206
|
+
return { code: 400, message: (0, i18n_1.t)('错误的用户名密码,请重试') };
|
|
155
207
|
}
|
|
156
208
|
}
|
|
157
209
|
}
|
|
@@ -190,16 +242,63 @@ let UserService = class UserService {
|
|
|
190
242
|
}
|
|
191
243
|
return [];
|
|
192
244
|
}
|
|
245
|
+
async getIpBlacklist() {
|
|
246
|
+
const authInfo = await this.getAuthInfo();
|
|
247
|
+
return (0, uniq_1.default)((authInfo.blockedIps || []).map(clientIp_1.normalizeClientIp)).filter(Boolean);
|
|
248
|
+
}
|
|
249
|
+
async blockIp(ip) {
|
|
250
|
+
const authInfo = await this.getAuthInfo();
|
|
251
|
+
const blockedIps = (0, uniq_1.default)([
|
|
252
|
+
...(authInfo.blockedIps || []).map(clientIp_1.normalizeClientIp),
|
|
253
|
+
(0, clientIp_1.normalizeClientIp)(ip),
|
|
254
|
+
]).filter(Boolean);
|
|
255
|
+
await this.updateAuthInfo(authInfo, { blockedIps });
|
|
256
|
+
return blockedIps;
|
|
257
|
+
}
|
|
258
|
+
async unblockIp(ip) {
|
|
259
|
+
const authInfo = await this.getAuthInfo();
|
|
260
|
+
const normalizedIp = (0, clientIp_1.normalizeClientIp)(ip);
|
|
261
|
+
const blockedIps = (authInfo.blockedIps || [])
|
|
262
|
+
.map(clientIp_1.normalizeClientIp)
|
|
263
|
+
.filter((blockedIp) => blockedIp && blockedIp !== normalizedIp);
|
|
264
|
+
await this.updateAuthInfo(authInfo, { blockedIps });
|
|
265
|
+
return blockedIps;
|
|
266
|
+
}
|
|
193
267
|
async insertDb(payload) {
|
|
194
268
|
const doc = await system_1.SystemModel.create(Object.assign({}, payload), { returning: true });
|
|
195
269
|
return doc;
|
|
196
270
|
}
|
|
271
|
+
async initializeUser({ username, password, }) {
|
|
272
|
+
const authInfo = await this.getAuthInfo();
|
|
273
|
+
if (!(0, auth_1.isDefaultAuthInfo)(authInfo)) {
|
|
274
|
+
return { code: 450, message: (0, i18n_1.t)('未知错误') };
|
|
275
|
+
}
|
|
276
|
+
if (password === 'admin') {
|
|
277
|
+
return { code: 400, message: (0, i18n_1.t)('密码不能设置为admin') };
|
|
278
|
+
}
|
|
279
|
+
await this.updateAuthInfo(authInfo, {
|
|
280
|
+
username,
|
|
281
|
+
password: await (0, password_1.hashPassword)(password),
|
|
282
|
+
token: '',
|
|
283
|
+
tokens: {},
|
|
284
|
+
isTwoFactorChecking: false,
|
|
285
|
+
twoFactorExpiresAt: 0,
|
|
286
|
+
});
|
|
287
|
+
return { code: 200, message: (0, i18n_1.t)('更新成功') };
|
|
288
|
+
}
|
|
197
289
|
async updateUsernameAndPassword({ username, password, }) {
|
|
198
290
|
if (password === 'admin') {
|
|
199
291
|
return { code: 400, message: (0, i18n_1.t)('密码不能设置为admin') };
|
|
200
292
|
}
|
|
201
293
|
const authInfo = await this.getAuthInfo();
|
|
202
|
-
await this.updateAuthInfo(authInfo, {
|
|
294
|
+
await this.updateAuthInfo(authInfo, {
|
|
295
|
+
username,
|
|
296
|
+
password: await (0, password_1.hashPassword)(password),
|
|
297
|
+
token: '',
|
|
298
|
+
tokens: {},
|
|
299
|
+
isTwoFactorChecking: false,
|
|
300
|
+
twoFactorExpiresAt: 0,
|
|
301
|
+
});
|
|
203
302
|
return { code: 200, message: (0, i18n_1.t)('更新成功') };
|
|
204
303
|
}
|
|
205
304
|
async updateAvatar(avatar) {
|
|
@@ -210,6 +309,9 @@ let UserService = class UserService {
|
|
|
210
309
|
async initTwoFactor() {
|
|
211
310
|
const secret = preset_default_1.authenticator.generateSecret();
|
|
212
311
|
const authInfo = await this.getAuthInfo();
|
|
312
|
+
if (authInfo.twoFactorActivated) {
|
|
313
|
+
throw new Error((0, i18n_1.t)('请先关闭两步验证'));
|
|
314
|
+
}
|
|
213
315
|
const otpauth = preset_default_1.authenticator.keyuri(authInfo.username, 'qinglong', secret);
|
|
214
316
|
await this.updateAuthInfo(authInfo, { twoFactorSecret: secret });
|
|
215
317
|
return { secret, url: otpauth };
|
|
@@ -221,25 +323,41 @@ let UserService = class UserService {
|
|
|
221
323
|
secret: authInfo.twoFactorSecret,
|
|
222
324
|
});
|
|
223
325
|
if (isValid) {
|
|
224
|
-
await this.updateAuthInfo(authInfo, {
|
|
326
|
+
await this.updateAuthInfo(authInfo, {
|
|
327
|
+
twoFactorActivated: true,
|
|
328
|
+
token: '',
|
|
329
|
+
tokens: {},
|
|
330
|
+
isTwoFactorChecking: false,
|
|
331
|
+
twoFactorExpiresAt: 0,
|
|
332
|
+
});
|
|
225
333
|
}
|
|
226
334
|
return isValid;
|
|
227
335
|
}
|
|
228
336
|
async twoFactorLogin({ username, password, code, }, req) {
|
|
229
337
|
const authInfo = await this.getAuthInfo();
|
|
230
338
|
const { isTwoFactorChecking, twoFactorSecret } = authInfo;
|
|
231
|
-
|
|
339
|
+
const now = Date.now();
|
|
340
|
+
const source = (0, clientIp_1.getClientIp)(req);
|
|
341
|
+
if (this.loginThrottle.retryAfter(source, now) > 0) {
|
|
342
|
+
return { code: 410, message: (0, i18n_1.t)('失败次数过多,请稍后重试') };
|
|
343
|
+
}
|
|
344
|
+
if (!isTwoFactorChecking ||
|
|
345
|
+
!authInfo.twoFactorActivated ||
|
|
346
|
+
!authInfo.twoFactorExpiresAt ||
|
|
347
|
+
authInfo.twoFactorExpiresAt <= now) {
|
|
232
348
|
return { code: 450, message: (0, i18n_1.t)('未知错误') };
|
|
233
349
|
}
|
|
234
|
-
const
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
350
|
+
const step = Math.floor(now / 30000);
|
|
351
|
+
const isValid = username === authInfo.username &&
|
|
352
|
+
(await (0, password_1.verifyPassword)(password, authInfo.password)) &&
|
|
353
|
+
authInfo.lastTwoFactorStep !== step &&
|
|
354
|
+
preset_default_1.authenticator.verify({ token: code, secret: twoFactorSecret });
|
|
238
355
|
if (isValid) {
|
|
239
|
-
|
|
356
|
+
await this.updateAuthInfo(authInfo, { lastTwoFactorStep: step });
|
|
357
|
+
return this.authenticate({ username, password }, req, false);
|
|
240
358
|
}
|
|
241
359
|
else {
|
|
242
|
-
const ip =
|
|
360
|
+
const ip = (0, clientIp_1.getClientIp)(req);
|
|
243
361
|
const query = new ip2region_1.default();
|
|
244
362
|
const ipAddress = query.search(ip);
|
|
245
363
|
let address = '';
|
|
@@ -250,6 +368,8 @@ let UserService = class UserService {
|
|
|
250
368
|
.join(' ');
|
|
251
369
|
}
|
|
252
370
|
await this.updateAuthInfo(authInfo, {
|
|
371
|
+
retries: this.loginThrottle.fail(source, now),
|
|
372
|
+
lastlogon: now,
|
|
253
373
|
lastip: ip,
|
|
254
374
|
lastaddr: address,
|
|
255
375
|
platform: req.platform,
|
|
@@ -262,6 +382,10 @@ let UserService = class UserService {
|
|
|
262
382
|
await this.updateAuthInfo(authInfo, {
|
|
263
383
|
twoFactorActivated: false,
|
|
264
384
|
twoFactorSecret: '',
|
|
385
|
+
token: '',
|
|
386
|
+
tokens: {},
|
|
387
|
+
isTwoFactorChecking: false,
|
|
388
|
+
twoFactorExpiresAt: 0,
|
|
265
389
|
});
|
|
266
390
|
return true;
|
|
267
391
|
}
|
|
@@ -280,6 +404,9 @@ let UserService = class UserService {
|
|
|
280
404
|
type: system_1.AuthDataType.authConfig,
|
|
281
405
|
info: result,
|
|
282
406
|
});
|
|
407
|
+
if (info.tokens && Object.keys(info.tokens).length === 0) {
|
|
408
|
+
this.sockService.getClients().forEach((conn) => conn.close('401'));
|
|
409
|
+
}
|
|
283
410
|
}
|
|
284
411
|
async getNotificationMode() {
|
|
285
412
|
const doc = await this.getDb({ type: system_1.AuthDataType.notification });
|
|
@@ -308,7 +435,7 @@ let UserService = class UserService {
|
|
|
308
435
|
}
|
|
309
436
|
async updateNotificationMode(notificationInfo) {
|
|
310
437
|
const code = Math.random().toString().slice(-6);
|
|
311
|
-
const isSuccess = await this.notificationService.testNotify(notificationInfo, '青龙',
|
|
438
|
+
const isSuccess = await this.notificationService.testNotify(notificationInfo, (0, i18n_1.t)('青龙'), (0, i18n_1.t)('【蛟龙】测试通知 https://t.me/jiao_long'));
|
|
312
439
|
if (isSuccess) {
|
|
313
440
|
const result = await this.updateAuthDb({
|
|
314
441
|
type: system_1.AuthDataType.notification,
|
|
@@ -381,6 +508,9 @@ let UserService = class UserService {
|
|
|
381
508
|
}
|
|
382
509
|
async resetAuthInfo(info) {
|
|
383
510
|
const { retries, twoFactorActivated, password, username } = info;
|
|
511
|
+
if (password === 'admin') {
|
|
512
|
+
return { code: 400, message: (0, i18n_1.t)('密码不能设置为admin') };
|
|
513
|
+
}
|
|
384
514
|
const authInfo = await this.getAuthInfo();
|
|
385
515
|
const payload = (0, pickBy_1.default)({
|
|
386
516
|
retries,
|
|
@@ -388,13 +518,101 @@ let UserService = class UserService {
|
|
|
388
518
|
password,
|
|
389
519
|
username,
|
|
390
520
|
}, (x) => !(0, isNil_1.default)(x));
|
|
521
|
+
if (password !== undefined) {
|
|
522
|
+
payload.password = await (0, password_1.hashPassword)(password);
|
|
523
|
+
}
|
|
524
|
+
if (password !== undefined ||
|
|
525
|
+
username !== undefined ||
|
|
526
|
+
twoFactorActivated !== undefined) {
|
|
527
|
+
Object.assign(payload, {
|
|
528
|
+
token: '',
|
|
529
|
+
tokens: {},
|
|
530
|
+
isTwoFactorChecking: false,
|
|
531
|
+
twoFactorExpiresAt: 0,
|
|
532
|
+
});
|
|
533
|
+
}
|
|
391
534
|
await this.updateAuthInfo(authInfo, payload);
|
|
535
|
+
if (retries === 0 || password !== undefined || username !== undefined) {
|
|
536
|
+
this.loginThrottle.clear();
|
|
537
|
+
}
|
|
392
538
|
}
|
|
393
539
|
};
|
|
394
540
|
__decorate([
|
|
395
541
|
(0, typedi_1.Inject)((type) => notify_1.default),
|
|
396
542
|
__metadata("design:type", notify_1.default)
|
|
397
543
|
], UserService.prototype, "notificationService", void 0);
|
|
544
|
+
__decorate([
|
|
545
|
+
authMutation_1.serializeAuthMutation,
|
|
546
|
+
__metadata("design:type", Function),
|
|
547
|
+
__metadata("design:paramtypes", [Object, Object]),
|
|
548
|
+
__metadata("design:returntype", Promise)
|
|
549
|
+
], UserService.prototype, "login", null);
|
|
550
|
+
__decorate([
|
|
551
|
+
authMutation_1.serializeAuthMutation,
|
|
552
|
+
__metadata("design:type", Function),
|
|
553
|
+
__metadata("design:paramtypes", [String, String]),
|
|
554
|
+
__metadata("design:returntype", Promise)
|
|
555
|
+
], UserService.prototype, "logout", null);
|
|
556
|
+
__decorate([
|
|
557
|
+
authMutation_1.serializeAuthMutation,
|
|
558
|
+
__metadata("design:type", Function),
|
|
559
|
+
__metadata("design:paramtypes", [String]),
|
|
560
|
+
__metadata("design:returntype", Promise)
|
|
561
|
+
], UserService.prototype, "blockIp", null);
|
|
562
|
+
__decorate([
|
|
563
|
+
authMutation_1.serializeAuthMutation,
|
|
564
|
+
__metadata("design:type", Function),
|
|
565
|
+
__metadata("design:paramtypes", [String]),
|
|
566
|
+
__metadata("design:returntype", Promise)
|
|
567
|
+
], UserService.prototype, "unblockIp", null);
|
|
568
|
+
__decorate([
|
|
569
|
+
authMutation_1.serializeAuthMutation,
|
|
570
|
+
__metadata("design:type", Function),
|
|
571
|
+
__metadata("design:paramtypes", [Object]),
|
|
572
|
+
__metadata("design:returntype", Promise)
|
|
573
|
+
], UserService.prototype, "initializeUser", null);
|
|
574
|
+
__decorate([
|
|
575
|
+
authMutation_1.serializeAuthMutation,
|
|
576
|
+
__metadata("design:type", Function),
|
|
577
|
+
__metadata("design:paramtypes", [Object]),
|
|
578
|
+
__metadata("design:returntype", Promise)
|
|
579
|
+
], UserService.prototype, "updateUsernameAndPassword", null);
|
|
580
|
+
__decorate([
|
|
581
|
+
authMutation_1.serializeAuthMutation,
|
|
582
|
+
__metadata("design:type", Function),
|
|
583
|
+
__metadata("design:paramtypes", [String]),
|
|
584
|
+
__metadata("design:returntype", Promise)
|
|
585
|
+
], UserService.prototype, "updateAvatar", null);
|
|
586
|
+
__decorate([
|
|
587
|
+
authMutation_1.serializeAuthMutation,
|
|
588
|
+
__metadata("design:type", Function),
|
|
589
|
+
__metadata("design:paramtypes", []),
|
|
590
|
+
__metadata("design:returntype", Promise)
|
|
591
|
+
], UserService.prototype, "initTwoFactor", null);
|
|
592
|
+
__decorate([
|
|
593
|
+
authMutation_1.serializeAuthMutation,
|
|
594
|
+
__metadata("design:type", Function),
|
|
595
|
+
__metadata("design:paramtypes", [String]),
|
|
596
|
+
__metadata("design:returntype", Promise)
|
|
597
|
+
], UserService.prototype, "activeTwoFactor", null);
|
|
598
|
+
__decorate([
|
|
599
|
+
authMutation_1.serializeAuthMutation,
|
|
600
|
+
__metadata("design:type", Function),
|
|
601
|
+
__metadata("design:paramtypes", [Object, Object]),
|
|
602
|
+
__metadata("design:returntype", Promise)
|
|
603
|
+
], UserService.prototype, "twoFactorLogin", null);
|
|
604
|
+
__decorate([
|
|
605
|
+
authMutation_1.serializeAuthMutation,
|
|
606
|
+
__metadata("design:type", Function),
|
|
607
|
+
__metadata("design:paramtypes", []),
|
|
608
|
+
__metadata("design:returntype", Promise)
|
|
609
|
+
], UserService.prototype, "deactivateTwoFactor", null);
|
|
610
|
+
__decorate([
|
|
611
|
+
authMutation_1.serializeAuthMutation,
|
|
612
|
+
__metadata("design:type", Function),
|
|
613
|
+
__metadata("design:paramtypes", [Object]),
|
|
614
|
+
__metadata("design:returntype", Promise)
|
|
615
|
+
], UserService.prototype, "resetAuthInfo", null);
|
|
398
616
|
UserService = __decorate([
|
|
399
617
|
(0, typedi_1.Service)(),
|
|
400
618
|
__param(0, (0, typedi_1.Inject)('logger')),
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isValidToken = void 0;
|
|
6
|
+
exports.isValidToken = exports.isDefaultAuthInfo = void 0;
|
|
7
|
+
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
8
|
+
function isDefaultAuthInfo(authInfo) {
|
|
9
|
+
return authInfo.username === 'admin' && authInfo.password === 'admin';
|
|
10
|
+
}
|
|
11
|
+
exports.isDefaultAuthInfo = isDefaultAuthInfo;
|
|
4
12
|
/**
|
|
5
13
|
* Validates if a token exists in the authentication info.
|
|
6
14
|
* Supports both legacy string tokens and new TokenInfo array format.
|
|
@@ -10,10 +18,19 @@ exports.isValidToken = void 0;
|
|
|
10
18
|
* @param platform - The platform (desktop, mobile)
|
|
11
19
|
* @returns true if the token is valid, false otherwise
|
|
12
20
|
*/
|
|
13
|
-
function isValidToken(authInfo, headerToken, platform) {
|
|
21
|
+
function isValidToken(authInfo, headerToken, platform, secret) {
|
|
14
22
|
if (!authInfo || !headerToken) {
|
|
15
23
|
return false;
|
|
16
24
|
}
|
|
25
|
+
try {
|
|
26
|
+
const claims = jsonwebtoken_1.default.verify(headerToken, secret, { algorithms: ['HS384'] });
|
|
27
|
+
if (typeof claims === 'string' || typeof claims.exp !== 'number') {
|
|
28
|
+
return false;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
catch (_a) {
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
17
34
|
const { token = '', tokens = {} } = authInfo;
|
|
18
35
|
// Check legacy token field
|
|
19
36
|
if (headerToken === token) {
|
|
@@ -31,7 +48,9 @@ function isValidToken(authInfo, headerToken, platform) {
|
|
|
31
48
|
}
|
|
32
49
|
else if (Array.isArray(platformTokens)) {
|
|
33
50
|
// New format: array of TokenInfo objects
|
|
34
|
-
return platformTokens.some((t) => t &&
|
|
51
|
+
return platformTokens.some((t) => t &&
|
|
52
|
+
t.value === headerToken &&
|
|
53
|
+
(t.expiration === undefined || t.expiration > Date.now() / 1000));
|
|
35
54
|
}
|
|
36
55
|
// Unexpected type - log warning and reject
|
|
37
56
|
return false;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.serializeAuthMutation = void 0;
|
|
4
|
+
// All account mutations in the HTTP service share one queue. In particular,
|
|
5
|
+
// a login that read old credentials must finish before a password reset revokes
|
|
6
|
+
// its session, and two initialization requests must not both claim the account.
|
|
7
|
+
let pending = Promise.resolve();
|
|
8
|
+
function serializeAuthMutation(_target, _key, descriptor) {
|
|
9
|
+
const method = descriptor.value;
|
|
10
|
+
descriptor.value = function (...args) {
|
|
11
|
+
const result = pending.then(() => method.apply(this, args));
|
|
12
|
+
pending = result.catch(() => undefined);
|
|
13
|
+
return result;
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
exports.serializeAuthMutation = serializeAuthMutation;
|
|
17
|
+
//# sourceMappingURL=authMutation.js.map
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
3
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
4
|
+
var m = o[Symbol.asyncIterator], i;
|
|
5
|
+
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
6
|
+
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
7
|
+
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
8
|
+
};
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.observeChildProcess = exports.asError = void 0;
|
|
11
|
+
function asError(error) {
|
|
12
|
+
return error instanceof Error ? error : new Error(String(error));
|
|
13
|
+
}
|
|
14
|
+
exports.asError = asError;
|
|
15
|
+
/** Attach immediately after spawn, before awaiting database or user callbacks. */
|
|
16
|
+
function observeChildProcess(child, callbacks = {}) {
|
|
17
|
+
let failure;
|
|
18
|
+
const recordError = (error) => {
|
|
19
|
+
failure !== null && failure !== void 0 ? failure : (failure = asError(error));
|
|
20
|
+
};
|
|
21
|
+
const spawned = new Promise((resolve, reject) => {
|
|
22
|
+
child.once('spawn', resolve);
|
|
23
|
+
// Keep the listener through close: errors can occur after a successful spawn.
|
|
24
|
+
child.on('error', (error) => {
|
|
25
|
+
recordError(error);
|
|
26
|
+
reject(error);
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
const closed = new Promise((resolve) => {
|
|
30
|
+
child.once('close', (code, signal) => resolve({ code, signal }));
|
|
31
|
+
});
|
|
32
|
+
const started = spawned.then(async () => {
|
|
33
|
+
var _a;
|
|
34
|
+
await ((_a = callbacks.onStart) === null || _a === void 0 ? void 0 : _a.call(callbacks));
|
|
35
|
+
return child.pid;
|
|
36
|
+
});
|
|
37
|
+
// The caller can ask only for completion, without an unhandled start rejection.
|
|
38
|
+
const ready = started.catch(recordError);
|
|
39
|
+
const consume = async (stream, callback) => {
|
|
40
|
+
var _a, e_1, _b, _c;
|
|
41
|
+
// StringDecoder in Readable preserves UTF-8 characters split across chunks.
|
|
42
|
+
stream.setEncoding('utf8');
|
|
43
|
+
let callbackFailed = false;
|
|
44
|
+
try {
|
|
45
|
+
try {
|
|
46
|
+
for (var _d = true, stream_1 = __asyncValues(stream), stream_1_1; stream_1_1 = await stream_1.next(), _a = stream_1_1.done, !_a; _d = true) {
|
|
47
|
+
_c = stream_1_1.value;
|
|
48
|
+
_d = false;
|
|
49
|
+
const chunk = _c;
|
|
50
|
+
await ready;
|
|
51
|
+
if (!callbackFailed && callback) {
|
|
52
|
+
try {
|
|
53
|
+
await callback(String(chunk));
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
recordError(error);
|
|
57
|
+
callbackFailed = true;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
63
|
+
finally {
|
|
64
|
+
try {
|
|
65
|
+
if (!_d && !_a && (_b = stream_1.return)) await _b.call(stream_1);
|
|
66
|
+
}
|
|
67
|
+
finally { if (e_1) throw e_1.error; }
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
catch (error) {
|
|
71
|
+
recordError(error);
|
|
72
|
+
}
|
|
73
|
+
};
|
|
74
|
+
const output = Promise.all([
|
|
75
|
+
consume(child.stdout, callbacks.onStdout),
|
|
76
|
+
consume(child.stderr, callbacks.onStderr),
|
|
77
|
+
]);
|
|
78
|
+
const completed = Promise.all([closed, ready, output]).then(([result]) => (Object.assign(Object.assign({}, result), { error: failure })));
|
|
79
|
+
return { started, completed };
|
|
80
|
+
}
|
|
81
|
+
exports.observeChildProcess = observeChildProcess;
|
|
82
|
+
//# sourceMappingURL=childProcess.js.map
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getClientIp = exports.normalizeClientIp = void 0;
|
|
4
|
+
const IPV4_MAPPED_PREFIX = '::ffff:';
|
|
5
|
+
function normalizeClientIp(value) {
|
|
6
|
+
let ip = (value || '').trim().toLowerCase();
|
|
7
|
+
if (!ip) {
|
|
8
|
+
return '';
|
|
9
|
+
}
|
|
10
|
+
if (ip.startsWith('[') && ip.endsWith(']')) {
|
|
11
|
+
ip = ip.slice(1, -1);
|
|
12
|
+
}
|
|
13
|
+
const zoneIndex = ip.indexOf('%');
|
|
14
|
+
if (zoneIndex !== -1) {
|
|
15
|
+
ip = ip.slice(0, zoneIndex);
|
|
16
|
+
}
|
|
17
|
+
if (ip.startsWith(IPV4_MAPPED_PREFIX)) {
|
|
18
|
+
return ip.slice(IPV4_MAPPED_PREFIX.length);
|
|
19
|
+
}
|
|
20
|
+
return ip;
|
|
21
|
+
}
|
|
22
|
+
exports.normalizeClientIp = normalizeClientIp;
|
|
23
|
+
function getClientIp(req) {
|
|
24
|
+
return normalizeClientIp(req.ip || req.socket.remoteAddress);
|
|
25
|
+
}
|
|
26
|
+
exports.getClientIp = getClientIp;
|
|
27
|
+
//# sourceMappingURL=clientIp.js.map
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.findCronId = void 0;
|
|
4
|
+
// Match command text literally: looking up a task must never execute its input.
|
|
5
|
+
function findCronId(crontab, command) {
|
|
6
|
+
if (!command)
|
|
7
|
+
return '';
|
|
8
|
+
for (const line of crontab.split('\n')) {
|
|
9
|
+
const id = /\bID=(\d+)\s/.exec(line);
|
|
10
|
+
if (id && line.includes(command, id.index + id[0].length)) {
|
|
11
|
+
return id[1];
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
return '';
|
|
15
|
+
}
|
|
16
|
+
exports.findCronId = findCronId;
|
|
17
|
+
//# sourceMappingURL=cronCommand.js.map
|