ysk-server-core 1.0.0 → 1.1.9
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/README.md +23 -6
- package/dist/agents/probe.d.ts +2 -0
- package/dist/agents/probe.d.ts.map +1 -1
- package/dist/agents/probe.js +58 -1
- package/dist/agents/probe.js.map +1 -1
- package/dist/db/database.d.ts +1 -1
- package/dist/db/database.js +1 -1
- package/dist/db/document-store.d.ts +6 -2
- package/dist/db/document-store.d.ts.map +1 -1
- package/dist/db/document-store.js +5 -5
- package/dist/db/document-store.js.map +1 -1
- package/dist/db/store.d.ts +31 -2
- package/dist/db/store.d.ts.map +1 -1
- package/dist/db/store.js +286 -40
- package/dist/db/store.js.map +1 -1
- package/dist/email/autodiscover.d.ts +3 -0
- package/dist/email/autodiscover.d.ts.map +1 -1
- package/dist/email/autodiscover.js +57 -17
- package/dist/email/autodiscover.js.map +1 -1
- package/dist/email/dns-records.d.ts.map +1 -1
- package/dist/email/dns-records.js +3 -1
- package/dist/email/dns-records.js.map +1 -1
- package/dist/email/live-checks.d.ts.map +1 -1
- package/dist/email/live-checks.js +13 -4
- package/dist/email/live-checks.js.map +1 -1
- package/dist/email/mail-queue.d.ts +13 -4
- package/dist/email/mail-queue.d.ts.map +1 -1
- package/dist/email/mail-queue.js +69 -14
- package/dist/email/mail-queue.js.map +1 -1
- package/dist/email/mail-tls-apply.d.ts.map +1 -1
- package/dist/email/mail-tls-apply.js +22 -0
- package/dist/email/mail-tls-apply.js.map +1 -1
- package/dist/files/index.d.ts +1 -0
- package/dist/files/index.d.ts.map +1 -1
- package/dist/files/index.js +1 -0
- package/dist/files/index.js.map +1 -1
- package/dist/files/manager.d.ts +25 -6
- package/dist/files/manager.d.ts.map +1 -1
- package/dist/files/manager.js +166 -33
- package/dist/files/manager.js.map +1 -1
- package/dist/files/name-conflict.d.ts +9 -0
- package/dist/files/name-conflict.d.ts.map +1 -0
- package/dist/files/name-conflict.js +36 -0
- package/dist/files/name-conflict.js.map +1 -0
- package/dist/files/shares.d.ts.map +1 -1
- package/dist/files/shares.js +17 -1
- package/dist/files/shares.js.map +1 -1
- package/dist/host/executor.d.ts +3 -0
- package/dist/host/executor.d.ts.map +1 -1
- package/dist/host/executor.js +169 -7
- package/dist/host/executor.js.map +1 -1
- package/dist/host-browse/browser-engine.d.ts.map +1 -1
- package/dist/host-browse/browser-engine.js +2 -1
- package/dist/host-browse/browser-engine.js.map +1 -1
- package/dist/host-browse/chrome-as-user.d.ts.map +1 -1
- package/dist/host-browse/chrome-as-user.js +2 -1
- package/dist/host-browse/chrome-as-user.js.map +1 -1
- package/dist/host-browse/chrome-path.d.ts +13 -0
- package/dist/host-browse/chrome-path.d.ts.map +1 -0
- package/dist/host-browse/chrome-path.js +76 -0
- package/dist/host-browse/chrome-path.js.map +1 -0
- package/dist/host-browse/chrome-probe.d.ts.map +1 -1
- package/dist/host-browse/chrome-probe.js +3 -2
- package/dist/host-browse/chrome-probe.js.map +1 -1
- package/dist/host-browse/index.d.ts +1 -0
- package/dist/host-browse/index.d.ts.map +1 -1
- package/dist/host-browse/index.js +1 -0
- package/dist/host-browse/index.js.map +1 -1
- package/dist/host-browse/ssrf.d.ts.map +1 -1
- package/dist/host-browse/ssrf.js +2 -2
- package/dist/host-browse/ssrf.js.map +1 -1
- package/dist/host-browse/types.d.ts.map +1 -1
- package/dist/host-browse/types.js +4 -3
- package/dist/host-browse/types.js.map +1 -1
- package/dist/hosting/apache/render-site.d.ts.map +1 -1
- package/dist/hosting/apache/render-site.js +2 -1
- package/dist/hosting/apache/render-site.js.map +1 -1
- package/dist/hosting/apache/sync.d.ts +2 -0
- package/dist/hosting/apache/sync.d.ts.map +1 -1
- package/dist/hosting/apache/sync.js +25 -0
- package/dist/hosting/apache/sync.js.map +1 -1
- package/dist/hosting/app-templates.js +1 -1
- package/dist/hosting/app-templates.js.map +1 -1
- package/dist/hosting/backup-cron.d.ts +44 -1
- package/dist/hosting/backup-cron.d.ts.map +1 -1
- package/dist/hosting/backup-cron.js +432 -39
- package/dist/hosting/backup-cron.js.map +1 -1
- package/dist/hosting/backup-remote.d.ts +17 -0
- package/dist/hosting/backup-remote.d.ts.map +1 -1
- package/dist/hosting/backup-remote.js +341 -55
- package/dist/hosting/backup-remote.js.map +1 -1
- package/dist/hosting/bt-tracker/index.d.ts +3 -0
- package/dist/hosting/bt-tracker/index.d.ts.map +1 -1
- package/dist/hosting/bt-tracker/index.js +3 -0
- package/dist/hosting/bt-tracker/index.js.map +1 -1
- package/dist/hosting/bt-tracker/library-ops.d.ts +86 -0
- package/dist/hosting/bt-tracker/library-ops.d.ts.map +1 -0
- package/dist/hosting/bt-tracker/library-ops.js +481 -0
- package/dist/hosting/bt-tracker/library-ops.js.map +1 -0
- package/dist/hosting/bt-tracker/library.d.ts +12 -0
- package/dist/hosting/bt-tracker/library.d.ts.map +1 -0
- package/dist/hosting/bt-tracker/library.js +109 -0
- package/dist/hosting/bt-tracker/library.js.map +1 -0
- package/dist/hosting/bt-tracker/restore-library.d.ts +16 -0
- package/dist/hosting/bt-tracker/restore-library.d.ts.map +1 -0
- package/dist/hosting/bt-tracker/restore-library.js +67 -0
- package/dist/hosting/bt-tracker/restore-library.js.map +1 -0
- package/dist/hosting/bt-tracker/restore-shares.d.ts.map +1 -1
- package/dist/hosting/bt-tracker/restore-shares.js +8 -0
- package/dist/hosting/bt-tracker/restore-shares.js.map +1 -1
- package/dist/hosting/bt-tracker/seeder.d.ts +55 -16
- package/dist/hosting/bt-tracker/seeder.d.ts.map +1 -1
- package/dist/hosting/bt-tracker/seeder.js +103 -3
- package/dist/hosting/bt-tracker/seeder.js.map +1 -1
- package/dist/hosting/bt-tracker/service.d.ts.map +1 -1
- package/dist/hosting/bt-tracker/service.js +28 -4
- package/dist/hosting/bt-tracker/service.js.map +1 -1
- package/dist/hosting/bt-tracker/settings.d.ts +14 -1
- package/dist/hosting/bt-tracker/settings.d.ts.map +1 -1
- package/dist/hosting/bt-tracker/settings.js +102 -3
- package/dist/hosting/bt-tracker/settings.js.map +1 -1
- package/dist/hosting/cdn/fan-out.d.ts.map +1 -1
- package/dist/hosting/cdn/fan-out.js +64 -32
- package/dist/hosting/cdn/fan-out.js.map +1 -1
- package/dist/hosting/cdn/from-project.d.ts +6 -0
- package/dist/hosting/cdn/from-project.d.ts.map +1 -1
- package/dist/hosting/cdn/from-project.js +55 -1
- package/dist/hosting/cdn/from-project.js.map +1 -1
- package/dist/hosting/cdn/http-probe-error.d.ts +7 -0
- package/dist/hosting/cdn/http-probe-error.d.ts.map +1 -0
- package/dist/hosting/cdn/http-probe-error.js +44 -0
- package/dist/hosting/cdn/http-probe-error.js.map +1 -0
- package/dist/hosting/cdn/nodes.d.ts +8 -0
- package/dist/hosting/cdn/nodes.d.ts.map +1 -1
- package/dist/hosting/cdn/nodes.js +69 -1
- package/dist/hosting/cdn/nodes.js.map +1 -1
- package/dist/hosting/cdn/sites.d.ts +2 -0
- package/dist/hosting/cdn/sites.d.ts.map +1 -1
- package/dist/hosting/cdn/sites.js +5 -1
- package/dist/hosting/cdn/sites.js.map +1 -1
- package/dist/hosting/cdn/ssl.d.ts.map +1 -1
- package/dist/hosting/cdn/ssl.js +3 -25
- package/dist/hosting/cdn/ssl.js.map +1 -1
- package/dist/hosting/db-cluster/apply-local.d.ts +1 -1
- package/dist/hosting/db-cluster/apply-local.js +7 -7
- package/dist/hosting/db-cluster/apply-local.js.map +1 -1
- package/dist/hosting/db-cluster/probe.js +1 -1
- package/dist/hosting/db-cluster/probe.js.map +1 -1
- package/dist/hosting/db-cluster/push-peer.d.ts +3 -0
- package/dist/hosting/db-cluster/push-peer.d.ts.map +1 -1
- package/dist/hosting/db-cluster/push-peer.js +41 -21
- package/dist/hosting/db-cluster/push-peer.js.map +1 -1
- package/dist/hosting/db-cluster/store.d.ts +1 -0
- package/dist/hosting/db-cluster/store.d.ts.map +1 -1
- package/dist/hosting/db-cluster/store.js +11 -0
- package/dist/hosting/db-cluster/store.js.map +1 -1
- package/dist/hosting/db-cluster/types.d.ts +1 -1
- package/dist/hosting/db-cluster/types.d.ts.map +1 -1
- package/dist/hosting/db-service-config.d.ts +13 -0
- package/dist/hosting/db-service-config.d.ts.map +1 -1
- package/dist/hosting/db-service-config.js +51 -1
- package/dist/hosting/db-service-config.js.map +1 -1
- package/dist/hosting/defense/automation.js +1 -1
- package/dist/hosting/defense/automation.js.map +1 -1
- package/dist/hosting/defense/defense-service.d.ts.map +1 -1
- package/dist/hosting/defense/defense-service.js +62 -39
- package/dist/hosting/defense/defense-service.js.map +1 -1
- package/dist/hosting/defense/geoip/index.d.ts.map +1 -1
- package/dist/hosting/defense/geoip/index.js +9 -7
- package/dist/hosting/defense/geoip/index.js.map +1 -1
- package/dist/hosting/defense/presets.js +2 -2
- package/dist/hosting/defense/presets.js.map +1 -1
- package/dist/hosting/defense/signals.d.ts +5 -0
- package/dist/hosting/defense/signals.d.ts.map +1 -1
- package/dist/hosting/defense/signals.js +26 -10
- package/dist/hosting/defense/signals.js.map +1 -1
- package/dist/hosting/defense/types.d.ts +2 -0
- package/dist/hosting/defense/types.d.ts.map +1 -1
- package/dist/hosting/dns-health.d.ts.map +1 -1
- package/dist/hosting/dns-health.js +34 -26
- package/dist/hosting/dns-health.js.map +1 -1
- package/dist/hosting/dns-lookup.d.ts.map +1 -1
- package/dist/hosting/dns-lookup.js +11 -0
- package/dist/hosting/dns-lookup.js.map +1 -1
- package/dist/hosting/dns-zone.d.ts +18 -0
- package/dist/hosting/dns-zone.d.ts.map +1 -1
- package/dist/hosting/dns-zone.js +59 -0
- package/dist/hosting/dns-zone.js.map +1 -1
- package/dist/hosting/docker/argv.d.ts +10 -0
- package/dist/hosting/docker/argv.d.ts.map +1 -0
- package/dist/hosting/docker/argv.js +274 -0
- package/dist/hosting/docker/argv.js.map +1 -0
- package/dist/hosting/docker/daemon.d.ts +27 -0
- package/dist/hosting/docker/daemon.d.ts.map +1 -0
- package/dist/hosting/docker/daemon.js +125 -0
- package/dist/hosting/docker/daemon.js.map +1 -0
- package/dist/hosting/docker/honesty.d.ts +27 -0
- package/dist/hosting/docker/honesty.d.ts.map +1 -0
- package/dist/hosting/docker/honesty.js +50 -0
- package/dist/hosting/docker/honesty.js.map +1 -0
- package/dist/hosting/docker/index.d.ts +6 -0
- package/dist/hosting/docker/index.d.ts.map +1 -0
- package/dist/hosting/docker/index.js +6 -0
- package/dist/hosting/docker/index.js.map +1 -0
- package/dist/hosting/docker/manager.d.ts +131 -0
- package/dist/hosting/docker/manager.d.ts.map +1 -0
- package/dist/hosting/docker/manager.js +681 -0
- package/dist/hosting/docker/manager.js.map +1 -0
- package/dist/hosting/docker/parse.d.ts +22 -0
- package/dist/hosting/docker/parse.d.ts.map +1 -0
- package/dist/hosting/docker/parse.js +205 -0
- package/dist/hosting/docker/parse.js.map +1 -0
- package/dist/hosting/extras.d.ts.map +1 -1
- package/dist/hosting/extras.js +7 -1
- package/dist/hosting/extras.js.map +1 -1
- package/dist/hosting/fail2ban-ops.d.ts +2 -0
- package/dist/hosting/fail2ban-ops.d.ts.map +1 -1
- package/dist/hosting/fail2ban-ops.js +11 -9
- package/dist/hosting/fail2ban-ops.js.map +1 -1
- package/dist/hosting/firewall-ops.d.ts +4 -0
- package/dist/hosting/firewall-ops.d.ts.map +1 -1
- package/dist/hosting/firewall-ops.js +43 -2
- package/dist/hosting/firewall-ops.js.map +1 -1
- package/dist/hosting/ftps-service.d.ts +34 -0
- package/dist/hosting/ftps-service.d.ts.map +1 -1
- package/dist/hosting/ftps-service.js +141 -13
- package/dist/hosting/ftps-service.js.map +1 -1
- package/dist/hosting/git-auth.d.ts +77 -0
- package/dist/hosting/git-auth.d.ts.map +1 -0
- package/dist/hosting/git-auth.js +314 -0
- package/dist/hosting/git-auth.js.map +1 -0
- package/dist/hosting/git-control.d.ts +110 -0
- package/dist/hosting/git-control.d.ts.map +1 -0
- package/dist/hosting/git-control.js +333 -0
- package/dist/hosting/git-control.js.map +1 -0
- package/dist/hosting/git-deploy.d.ts +2 -0
- package/dist/hosting/git-deploy.d.ts.map +1 -1
- package/dist/hosting/git-deploy.js +50 -7
- package/dist/hosting/git-deploy.js.map +1 -1
- package/dist/hosting/git-errors.d.ts +7 -0
- package/dist/hosting/git-errors.d.ts.map +1 -0
- package/dist/hosting/git-errors.js +45 -0
- package/dist/hosting/git-errors.js.map +1 -0
- package/dist/hosting/git-hook.d.ts +33 -0
- package/dist/hosting/git-hook.d.ts.map +1 -0
- package/dist/hosting/git-hook.js +174 -0
- package/dist/hosting/git-hook.js.map +1 -0
- package/dist/hosting/global-search.d.ts.map +1 -1
- package/dist/hosting/global-search.js +22 -4
- package/dist/hosting/global-search.js.map +1 -1
- package/dist/hosting/host-migrate/bootstrap-target.d.ts +1 -1
- package/dist/hosting/host-migrate/bootstrap-target.js +6 -6
- package/dist/hosting/host-migrate/bootstrap-target.js.map +1 -1
- package/dist/hosting/host-migrate/index.d.ts +1 -0
- package/dist/hosting/host-migrate/index.d.ts.map +1 -1
- package/dist/hosting/host-migrate/index.js +1 -0
- package/dist/hosting/host-migrate/index.js.map +1 -1
- package/dist/hosting/host-migrate/inventory.d.ts.map +1 -1
- package/dist/hosting/host-migrate/inventory.js +20 -0
- package/dist/hosting/host-migrate/inventory.js.map +1 -1
- package/dist/hosting/host-migrate/orphan-homes.d.ts +19 -0
- package/dist/hosting/host-migrate/orphan-homes.d.ts.map +1 -0
- package/dist/hosting/host-migrate/orphan-homes.js +46 -0
- package/dist/hosting/host-migrate/orphan-homes.js.map +1 -0
- package/dist/hosting/host-migrate/temp-key.d.ts.map +1 -1
- package/dist/hosting/host-migrate/temp-key.js +7 -1
- package/dist/hosting/host-migrate/temp-key.js.map +1 -1
- package/dist/hosting/index.d.ts +9 -0
- package/dist/hosting/index.d.ts.map +1 -1
- package/dist/hosting/index.js +9 -0
- package/dist/hosting/index.js.map +1 -1
- package/dist/hosting/leftover-apply.d.ts +34 -0
- package/dist/hosting/leftover-apply.d.ts.map +1 -0
- package/dist/hosting/leftover-apply.js +187 -0
- package/dist/hosting/leftover-apply.js.map +1 -0
- package/dist/hosting/leftover-probe.d.ts +40 -0
- package/dist/hosting/leftover-probe.d.ts.map +1 -0
- package/dist/hosting/leftover-probe.js +181 -0
- package/dist/hosting/leftover-probe.js.map +1 -0
- package/dist/hosting/log-center/catalog.d.ts.map +1 -1
- package/dist/hosting/log-center/catalog.js +9 -0
- package/dist/hosting/log-center/catalog.js.map +1 -1
- package/dist/hosting/log-center/journal.d.ts.map +1 -1
- package/dist/hosting/log-center/journal.js +3 -0
- package/dist/hosting/log-center/journal.js.map +1 -1
- package/dist/hosting/managed-resources.d.ts.map +1 -1
- package/dist/hosting/managed-resources.js +18 -2
- package/dist/hosting/managed-resources.js.map +1 -1
- package/dist/hosting/nginx-sites-list.d.ts.map +1 -1
- package/dist/hosting/nginx-sites-list.js +39 -3
- package/dist/hosting/nginx-sites-list.js.map +1 -1
- package/dist/hosting/nginx-ssl.d.ts +4 -0
- package/dist/hosting/nginx-ssl.d.ts.map +1 -1
- package/dist/hosting/nginx-ssl.js +52 -7
- package/dist/hosting/nginx-ssl.js.map +1 -1
- package/dist/hosting/nginx-sync.d.ts +34 -0
- package/dist/hosting/nginx-sync.d.ts.map +1 -1
- package/dist/hosting/nginx-sync.js +258 -11
- package/dist/hosting/nginx-sync.js.map +1 -1
- package/dist/hosting/ops-log.d.ts +23 -0
- package/dist/hosting/ops-log.d.ts.map +1 -0
- package/dist/hosting/ops-log.js +15 -0
- package/dist/hosting/ops-log.js.map +1 -0
- package/dist/hosting/panel-tls.d.ts +9 -0
- package/dist/hosting/panel-tls.d.ts.map +1 -1
- package/dist/hosting/panel-tls.js +50 -2
- package/dist/hosting/panel-tls.js.map +1 -1
- package/dist/hosting/pm2-apply.d.ts.map +1 -1
- package/dist/hosting/pm2-apply.js +9 -2
- package/dist/hosting/pm2-apply.js.map +1 -1
- package/dist/hosting/postgres-provision.d.ts.map +1 -1
- package/dist/hosting/postgres-provision.js +43 -19
- package/dist/hosting/postgres-provision.js.map +1 -1
- package/dist/hosting/production-readiness.d.ts.map +1 -1
- package/dist/hosting/production-readiness.js +67 -10
- package/dist/hosting/production-readiness.js.map +1 -1
- package/dist/hosting/project-create-extras.d.ts +37 -0
- package/dist/hosting/project-create-extras.d.ts.map +1 -0
- package/dist/hosting/project-create-extras.js +47 -0
- package/dist/hosting/project-create-extras.js.map +1 -0
- package/dist/hosting/project-isolation-status.d.ts.map +1 -1
- package/dist/hosting/project-isolation-status.js +10 -2
- package/dist/hosting/project-isolation-status.js.map +1 -1
- package/dist/hosting/project-ops.d.ts +67 -0
- package/dist/hosting/project-ops.d.ts.map +1 -1
- package/dist/hosting/project-ops.js +377 -7
- package/dist/hosting/project-ops.js.map +1 -1
- package/dist/hosting/project-service.d.ts +3 -0
- package/dist/hosting/project-service.d.ts.map +1 -1
- package/dist/hosting/project-service.js +9 -0
- package/dist/hosting/project-service.js.map +1 -1
- package/dist/hosting/public-files.d.ts +4 -0
- package/dist/hosting/public-files.d.ts.map +1 -1
- package/dist/hosting/public-files.js +46 -7
- package/dist/hosting/public-files.js.map +1 -1
- package/dist/hosting/rebuild.d.ts +1 -0
- package/dist/hosting/rebuild.d.ts.map +1 -1
- package/dist/hosting/rebuild.js +14 -4
- package/dist/hosting/rebuild.js.map +1 -1
- package/dist/hosting/runtime-probe.d.ts +7 -0
- package/dist/hosting/runtime-probe.d.ts.map +1 -1
- package/dist/hosting/runtime-probe.js +74 -7
- package/dist/hosting/runtime-probe.js.map +1 -1
- package/dist/hosting/runtime.d.ts.map +1 -1
- package/dist/hosting/runtime.js +5 -3
- package/dist/hosting/runtime.js.map +1 -1
- package/dist/hosting/service-catalog/redis.d.ts.map +1 -1
- package/dist/hosting/service-catalog/redis.js +2 -1
- package/dist/hosting/service-catalog/redis.js.map +1 -1
- package/dist/hosting/service-console.d.ts +1 -1
- package/dist/hosting/service-console.d.ts.map +1 -1
- package/dist/hosting/service-console.js +4 -3
- package/dist/hosting/service-console.js.map +1 -1
- package/dist/hosting/service-matrix.d.ts +1 -1
- package/dist/hosting/service-matrix.d.ts.map +1 -1
- package/dist/hosting/service-matrix.js +24 -1
- package/dist/hosting/service-matrix.js.map +1 -1
- package/dist/hosting/sftp-keys.d.ts.map +1 -1
- package/dist/hosting/sftp-keys.js +2 -1
- package/dist/hosting/sftp-keys.js.map +1 -1
- package/dist/hosting/software-catalog.d.ts +2 -2
- package/dist/hosting/software-catalog.d.ts.map +1 -1
- package/dist/hosting/software-catalog.js +12 -2
- package/dist/hosting/software-catalog.js.map +1 -1
- package/dist/hosting/software-install.d.ts +4 -0
- package/dist/hosting/software-install.d.ts.map +1 -1
- package/dist/hosting/software-install.js +21 -0
- package/dist/hosting/software-install.js.map +1 -1
- package/dist/hosting/software-probe/HostSoftwareProbe.d.ts.map +1 -1
- package/dist/hosting/software-probe/HostSoftwareProbe.js +4 -0
- package/dist/hosting/software-probe/HostSoftwareProbe.js.map +1 -1
- package/dist/hosting/software-probe/registry.d.ts.map +1 -1
- package/dist/hosting/software-probe/registry.js +13 -0
- package/dist/hosting/software-probe/registry.js.map +1 -1
- package/dist/hosting/software-uninstall.d.ts.map +1 -1
- package/dist/hosting/software-uninstall.js +22 -0
- package/dist/hosting/software-uninstall.js.map +1 -1
- package/dist/hosting/sql-engine-switch/migrate.d.ts.map +1 -1
- package/dist/hosting/sql-engine-switch/migrate.js +62 -5
- package/dist/hosting/sql-engine-switch/migrate.js.map +1 -1
- package/dist/hosting/sql-engine-switch/preview.d.ts +9 -0
- package/dist/hosting/sql-engine-switch/preview.d.ts.map +1 -1
- package/dist/hosting/sql-engine-switch/preview.js +48 -0
- package/dist/hosting/sql-engine-switch/preview.js.map +1 -1
- package/dist/hosting/ssl-certs.js +1 -1
- package/dist/hosting/ssl-certs.js.map +1 -1
- package/dist/hosting/stack/definitions.js +1 -1
- package/dist/hosting/stack/definitions.js.map +1 -1
- package/dist/hosting/system-apply.d.ts.map +1 -1
- package/dist/hosting/system-apply.js +16 -6
- package/dist/hosting/system-apply.js.map +1 -1
- package/dist/hosting/temp-db-user.d.ts +10 -0
- package/dist/hosting/temp-db-user.d.ts.map +1 -1
- package/dist/hosting/temp-db-user.js +31 -0
- package/dist/hosting/temp-db-user.js.map +1 -1
- package/dist/hosting/validators/adapters/ada.d.ts +16 -0
- package/dist/hosting/validators/adapters/ada.d.ts.map +1 -0
- package/dist/hosting/validators/adapters/ada.js +72 -0
- package/dist/hosting/validators/adapters/ada.js.map +1 -0
- package/dist/hosting/validators/adapters/avax.d.ts +17 -0
- package/dist/hosting/validators/adapters/avax.d.ts.map +1 -0
- package/dist/hosting/validators/adapters/avax.js +66 -0
- package/dist/hosting/validators/adapters/avax.js.map +1 -0
- package/dist/hosting/validators/adapters/base.d.ts +61 -0
- package/dist/hosting/validators/adapters/base.d.ts.map +1 -0
- package/dist/hosting/validators/adapters/base.js +4 -0
- package/dist/hosting/validators/adapters/base.js.map +1 -0
- package/dist/hosting/validators/adapters/eth-clients.d.ts +16 -0
- package/dist/hosting/validators/adapters/eth-clients.d.ts.map +1 -0
- package/dist/hosting/validators/adapters/eth-clients.js +247 -0
- package/dist/hosting/validators/adapters/eth-clients.js.map +1 -0
- package/dist/hosting/validators/adapters/eth.d.ts +18 -0
- package/dist/hosting/validators/adapters/eth.d.ts.map +1 -0
- package/dist/hosting/validators/adapters/eth.js +102 -0
- package/dist/hosting/validators/adapters/eth.js.map +1 -0
- package/dist/hosting/validators/adapters/index.d.ts +5 -0
- package/dist/hosting/validators/adapters/index.d.ts.map +1 -0
- package/dist/hosting/validators/adapters/index.js +39 -0
- package/dist/hosting/validators/adapters/index.js.map +1 -0
- package/dist/hosting/validators/adapters/near.d.ts +15 -0
- package/dist/hosting/validators/adapters/near.d.ts.map +1 -0
- package/dist/hosting/validators/adapters/near.js +72 -0
- package/dist/hosting/validators/adapters/near.js.map +1 -0
- package/dist/hosting/validators/adapters/phase2.d.ts +33 -0
- package/dist/hosting/validators/adapters/phase2.d.ts.map +1 -0
- package/dist/hosting/validators/adapters/phase2.js +294 -0
- package/dist/hosting/validators/adapters/phase2.js.map +1 -0
- package/dist/hosting/validators/compose-runner.d.ts +88 -0
- package/dist/hosting/validators/compose-runner.d.ts.map +1 -0
- package/dist/hosting/validators/compose-runner.js +178 -0
- package/dist/hosting/validators/compose-runner.js.map +1 -0
- package/dist/hosting/validators/disk.d.ts +29 -0
- package/dist/hosting/validators/disk.d.ts.map +1 -0
- package/dist/hosting/validators/disk.js +208 -0
- package/dist/hosting/validators/disk.js.map +1 -0
- package/dist/hosting/validators/extras.d.ts +82 -0
- package/dist/hosting/validators/extras.d.ts.map +1 -0
- package/dist/hosting/validators/extras.js +391 -0
- package/dist/hosting/validators/extras.js.map +1 -0
- package/dist/hosting/validators/health.d.ts +21 -0
- package/dist/hosting/validators/health.d.ts.map +1 -0
- package/dist/hosting/validators/health.js +65 -0
- package/dist/hosting/validators/health.js.map +1 -0
- package/dist/hosting/validators/honesty.d.ts +33 -0
- package/dist/hosting/validators/honesty.d.ts.map +1 -0
- package/dist/hosting/validators/honesty.js +54 -0
- package/dist/hosting/validators/honesty.js.map +1 -0
- package/dist/hosting/validators/index.d.ts +26 -0
- package/dist/hosting/validators/index.d.ts.map +1 -0
- package/dist/hosting/validators/index.js +26 -0
- package/dist/hosting/validators/index.js.map +1 -0
- package/dist/hosting/validators/manager.d.ts +78 -0
- package/dist/hosting/validators/manager.d.ts.map +1 -0
- package/dist/hosting/validators/manager.js +455 -0
- package/dist/hosting/validators/manager.js.map +1 -0
- package/dist/hosting/validators/mithril.d.ts +30 -0
- package/dist/hosting/validators/mithril.d.ts.map +1 -0
- package/dist/hosting/validators/mithril.js +146 -0
- package/dist/hosting/validators/mithril.js.map +1 -0
- package/dist/hosting/validators/native-prune.d.ts +12 -0
- package/dist/hosting/validators/native-prune.d.ts.map +1 -0
- package/dist/hosting/validators/native-prune.js +40 -0
- package/dist/hosting/validators/native-prune.js.map +1 -0
- package/dist/hosting/validators/ports.d.ts +7 -0
- package/dist/hosting/validators/ports.d.ts.map +1 -0
- package/dist/hosting/validators/ports.js +75 -0
- package/dist/hosting/validators/ports.js.map +1 -0
- package/dist/hosting/validators/registry.d.ts +22 -0
- package/dist/hosting/validators/registry.d.ts.map +1 -0
- package/dist/hosting/validators/registry.js +311 -0
- package/dist/hosting/validators/registry.js.map +1 -0
- package/dist/hosting/validators/releases.d.ts +30 -0
- package/dist/hosting/validators/releases.d.ts.map +1 -0
- package/dist/hosting/validators/releases.js +149 -0
- package/dist/hosting/validators/releases.js.map +1 -0
- package/dist/hosting/validators/runtime-status.d.ts +13 -0
- package/dist/hosting/validators/runtime-status.d.ts.map +1 -0
- package/dist/hosting/validators/runtime-status.js +19 -0
- package/dist/hosting/validators/runtime-status.js.map +1 -0
- package/dist/hosting/validators/settings.d.ts +4 -0
- package/dist/hosting/validators/settings.d.ts.map +1 -0
- package/dist/hosting/validators/settings.js +28 -0
- package/dist/hosting/validators/settings.js.map +1 -0
- package/dist/hosting/validators/snapshots.d.ts +40 -0
- package/dist/hosting/validators/snapshots.d.ts.map +1 -0
- package/dist/hosting/validators/snapshots.js +221 -0
- package/dist/hosting/validators/snapshots.js.map +1 -0
- package/dist/hosting/validators/software-catalog.d.ts +24 -0
- package/dist/hosting/validators/software-catalog.d.ts.map +1 -0
- package/dist/hosting/validators/software-catalog.js +125 -0
- package/dist/hosting/validators/software-catalog.js.map +1 -0
- package/dist/hosting/validators/store.d.ts +29 -0
- package/dist/hosting/validators/store.d.ts.map +1 -0
- package/dist/hosting/validators/store.js +186 -0
- package/dist/hosting/validators/store.js.map +1 -0
- package/dist/hosting/validators/upgrade.d.ts +35 -0
- package/dist/hosting/validators/upgrade.d.ts.map +1 -0
- package/dist/hosting/validators/upgrade.js +251 -0
- package/dist/hosting/validators/upgrade.js.map +1 -0
- package/dist/hosting/validators/versions.d.ts +9 -0
- package/dist/hosting/validators/versions.d.ts.map +1 -0
- package/dist/hosting/validators/versions.js +20 -0
- package/dist/hosting/validators/versions.js.map +1 -0
- package/dist/hosting/version-discovery.d.ts.map +1 -1
- package/dist/hosting/version-discovery.js +15 -6
- package/dist/hosting/version-discovery.js.map +1 -1
- package/dist/hosting/vnc/client-profiles.d.ts.map +1 -1
- package/dist/hosting/vnc/client-profiles.js +12 -6
- package/dist/hosting/vnc/client-profiles.js.map +1 -1
- package/dist/hosting/vnc/hostname-hosts.d.ts +28 -0
- package/dist/hosting/vnc/hostname-hosts.d.ts.map +1 -0
- package/dist/hosting/vnc/hostname-hosts.js +177 -0
- package/dist/hosting/vnc/hostname-hosts.js.map +1 -0
- package/dist/hosting/vnc/index.d.ts +1 -0
- package/dist/hosting/vnc/index.d.ts.map +1 -1
- package/dist/hosting/vnc/index.js +1 -0
- package/dist/hosting/vnc/index.js.map +1 -1
- package/dist/hosting/vnc/passwd.d.ts.map +1 -1
- package/dist/hosting/vnc/passwd.js +14 -3
- package/dist/hosting/vnc/passwd.js.map +1 -1
- package/dist/hosting/vnc/server-session.d.ts.map +1 -1
- package/dist/hosting/vnc/server-session.js +5 -0
- package/dist/hosting/vnc/server-session.js.map +1 -1
- package/dist/hosting/vnc/service.d.ts +1 -0
- package/dist/hosting/vnc/service.d.ts.map +1 -1
- package/dist/hosting/vnc/service.js +80 -9
- package/dist/hosting/vnc/service.js.map +1 -1
- package/dist/hosting/vnc/types.d.ts +8 -0
- package/dist/hosting/vnc/types.d.ts.map +1 -1
- package/dist/hosting/vnc/types.js +22 -0
- package/dist/hosting/vnc/types.js.map +1 -1
- package/dist/hosting/vpn/client-conf-protect.d.ts +5 -0
- package/dist/hosting/vpn/client-conf-protect.d.ts.map +1 -1
- package/dist/hosting/vpn/client-conf-protect.js +15 -0
- package/dist/hosting/vpn/client-conf-protect.js.map +1 -1
- package/dist/hosting/vpn/openvpn-ops.d.ts.map +1 -1
- package/dist/hosting/vpn/openvpn-ops.js +13 -3
- package/dist/hosting/vpn/openvpn-ops.js.map +1 -1
- package/dist/hosting/vpn/outline-ops.d.ts.map +1 -1
- package/dist/hosting/vpn/outline-ops.js +7 -3
- package/dist/hosting/vpn/outline-ops.js.map +1 -1
- package/dist/hosting/vpn/ports.d.ts +3 -0
- package/dist/hosting/vpn/ports.d.ts.map +1 -1
- package/dist/hosting/vpn/ports.js +8 -0
- package/dist/hosting/vpn/ports.js.map +1 -1
- package/dist/hosting/vpn/service.d.ts +11 -0
- package/dist/hosting/vpn/service.d.ts.map +1 -1
- package/dist/hosting/vpn/service.js +102 -27
- package/dist/hosting/vpn/service.js.map +1 -1
- package/dist/hosting/web-stats.d.ts.map +1 -1
- package/dist/hosting/web-stats.js +0 -1
- package/dist/hosting/web-stats.js.map +1 -1
- package/dist/hosting/wizard.d.ts.map +1 -1
- package/dist/hosting/wizard.js +53 -63
- package/dist/hosting/wizard.js.map +1 -1
- package/dist/llm/http-transport.d.ts.map +1 -1
- package/dist/llm/http-transport.js +11 -3
- package/dist/llm/http-transport.js.map +1 -1
- package/dist/monitoring/notifications.d.ts.map +1 -1
- package/dist/monitoring/notifications.js +86 -0
- package/dist/monitoring/notifications.js.map +1 -1
- package/dist/monitoring/process-snapshot.d.ts +2 -0
- package/dist/monitoring/process-snapshot.d.ts.map +1 -1
- package/dist/monitoring/process-snapshot.js +14 -2
- package/dist/monitoring/process-snapshot.js.map +1 -1
- package/dist/net/ssrf.d.ts +6 -0
- package/dist/net/ssrf.d.ts.map +1 -1
- package/dist/net/ssrf.js +80 -15
- package/dist/net/ssrf.js.map +1 -1
- package/dist/repositories/project-repo.d.ts +1 -1
- package/dist/repositories/project-repo.d.ts.map +1 -1
- package/dist/repositories/project-repo.js +12 -0
- package/dist/repositories/project-repo.js.map +1 -1
- package/dist/repositories/settings-repo.d.ts.map +1 -1
- package/dist/repositories/settings-repo.js +6 -1
- package/dist/repositories/settings-repo.js.map +1 -1
- package/dist/security/mfa/rate-limit.d.ts +11 -0
- package/dist/security/mfa/rate-limit.d.ts.map +1 -1
- package/dist/security/mfa/rate-limit.js +18 -0
- package/dist/security/mfa/rate-limit.js.map +1 -1
- package/dist/security/mfa/webauthn.d.ts +5 -0
- package/dist/security/mfa/webauthn.d.ts.map +1 -1
- package/dist/security/mfa/webauthn.js +13 -4
- package/dist/security/mfa/webauthn.js.map +1 -1
- package/dist/security/ssh-identity/install.d.ts.map +1 -1
- package/dist/security/ssh-identity/install.js +12 -0
- package/dist/security/ssh-identity/install.js.map +1 -1
- package/dist/security/ssh-identity/ops.d.ts +16 -0
- package/dist/security/ssh-identity/ops.d.ts.map +1 -1
- package/dist/security/ssh-identity/ops.js +73 -3
- package/dist/security/ssh-identity/ops.js.map +1 -1
- package/dist/services/auth.d.ts +9 -0
- package/dist/services/auth.d.ts.map +1 -1
- package/dist/services/auth.js +27 -9
- package/dist/services/auth.js.map +1 -1
- package/dist/services/protection-probe.d.ts.map +1 -1
- package/dist/services/protection-probe.js +7 -5
- package/dist/services/protection-probe.js.map +1 -1
- package/dist/services/scheduler.d.ts +5 -0
- package/dist/services/scheduler.d.ts.map +1 -1
- package/dist/services/scheduler.js +11 -0
- package/dist/services/scheduler.js.map +1 -1
- package/dist/services/users-admin.d.ts +1 -0
- package/dist/services/users-admin.d.ts.map +1 -1
- package/dist/services/users-admin.js +42 -4
- package/dist/services/users-admin.js.map +1 -1
- package/dist/update/index.d.ts +2 -0
- package/dist/update/index.d.ts.map +1 -1
- package/dist/update/index.js +2 -0
- package/dist/update/index.js.map +1 -1
- package/dist/update/inventory.d.ts +2 -0
- package/dist/update/inventory.d.ts.map +1 -1
- package/dist/update/inventory.js +13 -5
- package/dist/update/inventory.js.map +1 -1
- package/dist/update/self-update-apply.d.ts +55 -0
- package/dist/update/self-update-apply.d.ts.map +1 -1
- package/dist/update/self-update-apply.js +238 -66
- package/dist/update/self-update-apply.js.map +1 -1
- package/dist/update/self-update-overlay.d.ts +54 -0
- package/dist/update/self-update-overlay.d.ts.map +1 -0
- package/dist/update/self-update-overlay.js +360 -0
- package/dist/update/self-update-overlay.js.map +1 -0
- package/dist/update/update-hub.d.ts +45 -0
- package/dist/update/update-hub.d.ts.map +1 -0
- package/dist/update/update-hub.js +217 -0
- package/dist/update/update-hub.js.map +1 -0
- package/package.json +10 -13
|
@@ -3,6 +3,18 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { existsSync, readFileSync } from 'node:fs';
|
|
5
5
|
import { listResources } from './managed-resources.js';
|
|
6
|
+
function serverNameFromConf(confPath) {
|
|
7
|
+
if (!confPath || !existsSync(confPath))
|
|
8
|
+
return '';
|
|
9
|
+
try {
|
|
10
|
+
const body = readFileSync(confPath, 'utf8');
|
|
11
|
+
const m = body.match(/^\s*server_name\s+([^;]+);/m);
|
|
12
|
+
return (m?.[1] ?? '').trim();
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
return '';
|
|
16
|
+
}
|
|
17
|
+
}
|
|
6
18
|
function kindFromRuntime(runtime) {
|
|
7
19
|
const r = String(runtime ?? '').toLowerCase();
|
|
8
20
|
if (r === 'static')
|
|
@@ -11,6 +23,26 @@ function kindFromRuntime(runtime) {
|
|
|
11
23
|
return 'php';
|
|
12
24
|
return 'proxy';
|
|
13
25
|
}
|
|
26
|
+
function certDomainSet(db) {
|
|
27
|
+
const set = new Set();
|
|
28
|
+
const certs = db.snapshot.certificates ?? [];
|
|
29
|
+
for (const c of certs) {
|
|
30
|
+
const d = String(c.domain ?? '').trim().toLowerCase();
|
|
31
|
+
if (d)
|
|
32
|
+
set.add(d);
|
|
33
|
+
}
|
|
34
|
+
return set;
|
|
35
|
+
}
|
|
36
|
+
function confMentionsSsl(confPath) {
|
|
37
|
+
if (!confPath || !existsSync(confPath))
|
|
38
|
+
return false;
|
|
39
|
+
try {
|
|
40
|
+
return /ssl_certificate\s+\S+/.test(readFileSync(confPath, 'utf8'));
|
|
41
|
+
}
|
|
42
|
+
catch {
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
14
46
|
function projectTarget(p) {
|
|
15
47
|
const kind = kindFromRuntime(p.runtime);
|
|
16
48
|
if (kind === 'static' || kind === 'php') {
|
|
@@ -26,6 +58,7 @@ function projectTarget(p) {
|
|
|
26
58
|
*/
|
|
27
59
|
export function listMergedNginxSites(input) {
|
|
28
60
|
const rows = [];
|
|
61
|
+
const certs = certDomainSet(input.db);
|
|
29
62
|
for (const p of input.projects) {
|
|
30
63
|
const domain = String(p.domain ?? '').trim();
|
|
31
64
|
if (!domain && !String(p.nginxConfigPath ?? p.nginx_config_path ?? '').trim()) {
|
|
@@ -35,15 +68,16 @@ export function listMergedNginxSites(input) {
|
|
|
35
68
|
if (!id)
|
|
36
69
|
continue;
|
|
37
70
|
const confPath = (p.nginxConfigPath ?? p.nginx_config_path);
|
|
71
|
+
const hasCert = Boolean(domain && certs.has(domain.toLowerCase()));
|
|
38
72
|
rows.push({
|
|
39
73
|
id: `project:${id}`,
|
|
40
74
|
source: 'project',
|
|
41
75
|
projectId: id,
|
|
42
76
|
projectName: String(p.name ?? id),
|
|
43
|
-
serverName: domain || '—',
|
|
77
|
+
serverName: domain || serverNameFromConf(confPath) || '—',
|
|
44
78
|
kind: kindFromRuntime(p.runtime),
|
|
45
79
|
target: projectTarget(p),
|
|
46
|
-
ssl: Boolean(p.ssl ?? p.force_https ?? p.forceHttps),
|
|
80
|
+
ssl: Boolean(p.ssl ?? p.force_https ?? p.forceHttps) || hasCert || confMentionsSsl(confPath),
|
|
47
81
|
forceHttps: Boolean(p.force_https ?? p.forceHttps),
|
|
48
82
|
hsts: Boolean(p.hsts),
|
|
49
83
|
confPath: confPath ?? null,
|
|
@@ -63,7 +97,9 @@ export function listMergedNginxSites(input) {
|
|
|
63
97
|
serverName: String(s.serverName ?? s.server_name ?? '—'),
|
|
64
98
|
kind: kind === 'static' || kind === 'php' ? kind : 'proxy',
|
|
65
99
|
target,
|
|
66
|
-
ssl: Boolean(s.ssl)
|
|
100
|
+
ssl: Boolean(s.ssl) ||
|
|
101
|
+
certs.has(String(s.serverName ?? s.server_name ?? '').trim().toLowerCase()) ||
|
|
102
|
+
confMentionsSsl(s.confPath ?? null),
|
|
67
103
|
forceHttps: Boolean(s.forceHttps ?? s.force_https),
|
|
68
104
|
hsts: Boolean(s.hsts),
|
|
69
105
|
confPath: s.confPath ?? null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nginx-sites-list.js","sourceRoot":"","sources":["../../src/hosting/nginx-sites-list.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAuBvD,SAAS,eAAe,CAAC,OAAuB;IAC9C,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAC9C,IAAI,CAAC,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACpC,IAAI,CAAC,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IAC9B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,aAAa,CAAC,CAA0B;IAC/C,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,OAAiB,CAAC,CAAC;IAClD,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACxC,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACpD,IAAI,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,aAAa,IAAI,EAAE,CAAC;IAC9D,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAGpC;IACC,MAAM,IAAI,GAAmB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"nginx-sites-list.js","sourceRoot":"","sources":["../../src/hosting/nginx-sites-list.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAuBvD,SAAS,kBAAkB,CAAC,QAAwB;IAClD,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,EAAE,CAAC;IAClD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC5C,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACpD,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,OAAuB;IAC9C,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAC9C,IAAI,CAAC,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACpC,IAAI,CAAC,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IAC9B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,aAAa,CAAC,EAAa;IAClC,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,MAAM,KAAK,GAAI,EAAE,CAAC,QAA8D,CAAC,YAAY,IAAI,EAAE,CAAC;IACpG,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACtD,IAAI,CAAC;YAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,eAAe,CAAC,QAAmC;IAC1D,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IACrD,IAAI,CAAC;QACH,OAAO,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACtE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,CAA0B;IAC/C,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,OAAiB,CAAC,CAAC;IAClD,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACxC,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACpD,IAAI,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,aAAa,IAAI,EAAE,CAAC;IAC9D,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAGpC;IACC,MAAM,IAAI,GAAmB,EAAE,CAAC;IAChC,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEtC,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,IAAI,CAAC,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAC9E,SAAS;QACX,CAAC;QACD,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,EAAE;YAAE,SAAS;QAClB,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,eAAe,IAAI,CAAC,CAAC,iBAAiB,CAAuB,CAAC;QAClF,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,CAAC;YACR,EAAE,EAAE,WAAW,EAAE,EAAE;YACnB,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YACjC,UAAU,EAAE,MAAM,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,GAAG;YACzD,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,OAAiB,CAAC;YAC1C,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;YACxB,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,OAAO,IAAI,eAAe,CAAC,QAAQ,CAAC;YAC5F,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,UAAU,CAAC;YAClD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YACrB,QAAQ,EAAE,QAAQ,IAAI,IAAI;YAC1B,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO;YAC5C,OAAO,EAAG,CAAC,CAAC,OAAkB,IAAI,IAAI;YACtC,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;SAC7C,CAAC,CAAC;IACL,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE,aAAa,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAkB,CAAC;QACxD,MAAM,MAAM,GACV,IAAI,KAAK,OAAO;YACd,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC;YAC3B,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC;YACR,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YAChB,MAAM,EAAE,YAAY;YACpB,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,WAAW,IAAI,GAAG,CAAC;YACxD,IAAI,EAAE,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO;YAC1D,MAAM;YACN,GAAG,EACD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;gBACd,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;gBAC3E,eAAe,CAAE,CAAC,CAAC,QAAmB,IAAI,IAAI,CAAC;YACjD,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,WAAW,CAAC;YAClD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YACrB,QAAQ,EAAG,CAAC,CAAC,QAAmB,IAAI,IAAI;YACxC,YAAY,EAAG,CAAC,CAAC,YAAuB,IAAI,IAAI;SACjD,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACjB,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAC7E,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAmC;IACnE,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,EAAE,CAAC;IAClD,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
|
|
@@ -10,6 +10,9 @@ export type NginxRealIpOpts = {
|
|
|
10
10
|
realIpProvider?: RealIpProviderId | 'inherit';
|
|
11
11
|
realIpHost?: RealIpHostConfig;
|
|
12
12
|
};
|
|
13
|
+
/** One nginx server_name token (hostname, wildcard, or `_`). */
|
|
14
|
+
export declare function sanitizeNginxServerNameToken(raw: string): string | null;
|
|
15
|
+
export declare function sanitizeNginxServerNameList(raw: string): string;
|
|
13
16
|
/** Build space-separated server_name from primary + aliases. */
|
|
14
17
|
export declare function buildServerNameList(primary?: string, aliases?: string[]): string;
|
|
15
18
|
/** listen directives with optional bind IP (dual-stack when unbound). */
|
|
@@ -20,6 +23,7 @@ export declare function nginxListenLines(opts: {
|
|
|
20
23
|
/**
|
|
21
24
|
* Render an Nginx server block for reverse proxy.
|
|
22
25
|
*/
|
|
26
|
+
export declare function requireNginxServerName(raw: string): string;
|
|
23
27
|
export declare function renderNginxProxy(config: NginxProxyConfig): string;
|
|
24
28
|
export declare function renderNginxStatic(opts: {
|
|
25
29
|
serverName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nginx-ssl.d.ts","sourceRoot":"","sources":["../../src/hosting/nginx-ssl.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEvE,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACtB,MAAM,oBAAoB,CAAC;AAE5B,kEAAkE;AAClE,MAAM,MAAM,eAAe,GAAG;IAC5B,kFAAkF;IAClF,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC9C,UAAU,CAAC,EAAE,gBAAgB,CAAC;CAC/B,CAAC;AAUF,gEAAgE;AAChE,wBAAgB,mBAAmB,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAMhF;AAuBD,yEAAyE;AACzE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IACrC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,MAAM,CAsBT;
|
|
1
|
+
{"version":3,"file":"nginx-ssl.d.ts","sourceRoot":"","sources":["../../src/hosting/nginx-ssl.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,11 +10,38 @@ function realIpSnippet(opts) {
|
|
|
10
10
|
cloudflareRealIp: opts.cloudflareRealIp,
|
|
11
11
|
});
|
|
12
12
|
}
|
|
13
|
+
/** One nginx server_name token (hostname, wildcard, or `_`). */
|
|
14
|
+
export function sanitizeNginxServerNameToken(raw) {
|
|
15
|
+
const s = String(raw ?? '').trim().toLowerCase();
|
|
16
|
+
if (!s || s.length > 253)
|
|
17
|
+
return null;
|
|
18
|
+
if (/[;{}$'"\\]/.test(s))
|
|
19
|
+
return null;
|
|
20
|
+
if (s === '_' || s === 'localhost')
|
|
21
|
+
return s;
|
|
22
|
+
const body = s.startsWith('*.') ? s.slice(2) : s;
|
|
23
|
+
if (/^(?:\d{1,3}\.){3}\d{1,3}$/.test(body))
|
|
24
|
+
return s;
|
|
25
|
+
// Require a dot so directive words (return, include, …) cannot be tokens
|
|
26
|
+
if (!body.includes('.'))
|
|
27
|
+
return null;
|
|
28
|
+
if (/^(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(body)) {
|
|
29
|
+
return s;
|
|
30
|
+
}
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
export function sanitizeNginxServerNameList(raw) {
|
|
34
|
+
const kept = String(raw ?? '')
|
|
35
|
+
.split(/\s+/)
|
|
36
|
+
.map(sanitizeNginxServerNameToken)
|
|
37
|
+
.filter((x) => Boolean(x));
|
|
38
|
+
return [...new Set(kept)].join(' ') || 'localhost';
|
|
39
|
+
}
|
|
13
40
|
/** Build space-separated server_name from primary + aliases. */
|
|
14
41
|
export function buildServerNameList(primary, aliases) {
|
|
15
42
|
const names = [primary, ...(aliases ?? [])]
|
|
16
|
-
.map((s) => (s ?? '').trim().toLowerCase())
|
|
17
|
-
.filter(Boolean);
|
|
43
|
+
.map((s) => sanitizeNginxServerNameToken((s ?? '').trim().toLowerCase()))
|
|
44
|
+
.filter((x) => Boolean(x));
|
|
18
45
|
const uniq = [...new Set(names)];
|
|
19
46
|
return uniq.join(' ') || 'localhost';
|
|
20
47
|
}
|
|
@@ -59,9 +86,10 @@ export function nginxListenLines(opts) {
|
|
|
59
86
|
}
|
|
60
87
|
function httpRedirectBlock(serverName, bindIp) {
|
|
61
88
|
const listen = nginxListenLines({ ssl: false, bindIp });
|
|
89
|
+
const name = sanitizeNginxServerNameList(serverName);
|
|
62
90
|
return `server {
|
|
63
91
|
${listen}
|
|
64
|
-
server_name ${
|
|
92
|
+
server_name ${name};
|
|
65
93
|
return 301 https://$host$request_uri;
|
|
66
94
|
}
|
|
67
95
|
`;
|
|
@@ -69,8 +97,22 @@ function httpRedirectBlock(serverName, bindIp) {
|
|
|
69
97
|
/**
|
|
70
98
|
* Render an Nginx server block for reverse proxy.
|
|
71
99
|
*/
|
|
100
|
+
export function requireNginxServerName(raw) {
|
|
101
|
+
const kept = String(raw ?? '')
|
|
102
|
+
.split(/\s+/)
|
|
103
|
+
.map(sanitizeNginxServerNameToken)
|
|
104
|
+
.filter((x) => Boolean(x));
|
|
105
|
+
const name = [...new Set(kept)].join(' ');
|
|
106
|
+
if (!name) {
|
|
107
|
+
throw new YskError(ErrorCodes.VALIDATION, tl('notes.auto.n1388'), {
|
|
108
|
+
httpStatus: 400,
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
return name;
|
|
112
|
+
}
|
|
72
113
|
export function renderNginxProxy(config) {
|
|
73
|
-
|
|
114
|
+
config = { ...config, serverName: requireNginxServerName(config.serverName) };
|
|
115
|
+
if (!config.upstream) {
|
|
74
116
|
throw new YskError(ErrorCodes.VALIDATION, tl('notes.auto.n1388'), {
|
|
75
117
|
httpStatus: 400,
|
|
76
118
|
});
|
|
@@ -156,24 +198,26 @@ function authBasicBlock(opts) {
|
|
|
156
198
|
`;
|
|
157
199
|
}
|
|
158
200
|
function siteRedirectOnly(opts) {
|
|
201
|
+
const serverName = sanitizeNginxServerNameList(opts.serverName);
|
|
159
202
|
const target = opts.siteRedirectUrl.replace(/"/g, '');
|
|
160
203
|
const listen = nginxListenLines({ ssl: opts.ssl, bindIp: opts.bindIp });
|
|
161
204
|
const sslBlock = sslLines({
|
|
162
205
|
ssl: opts.ssl,
|
|
163
206
|
sslCertificate: opts.sslCertificate,
|
|
164
207
|
sslCertificateKey: opts.sslCertificateKey,
|
|
165
|
-
serverName
|
|
208
|
+
serverName,
|
|
166
209
|
hsts: opts.hsts,
|
|
167
210
|
});
|
|
168
211
|
return `server {
|
|
169
212
|
${listen}
|
|
170
|
-
server_name ${
|
|
213
|
+
server_name ${serverName};
|
|
171
214
|
${sslBlock}
|
|
172
215
|
return 301 ${target}$request_uri;
|
|
173
216
|
}
|
|
174
217
|
`;
|
|
175
218
|
}
|
|
176
219
|
export function renderNginxStatic(opts) {
|
|
220
|
+
opts = { ...opts, serverName: sanitizeNginxServerNameList(opts.serverName) };
|
|
177
221
|
if (!opts.serverName || !opts.docRoot) {
|
|
178
222
|
throw new YskError(ErrorCodes.VALIDATION, tl('notes.auto.n1389'), {
|
|
179
223
|
httpStatus: 400,
|
|
@@ -294,9 +338,10 @@ export async function purgeNginxCache(input) {
|
|
|
294
338
|
}
|
|
295
339
|
/** Suspended site: refuse traffic with 503. */
|
|
296
340
|
export function renderNginxSuspended(serverName) {
|
|
341
|
+
const name = sanitizeNginxServerNameList(serverName);
|
|
297
342
|
return `server {
|
|
298
343
|
listen 80;
|
|
299
|
-
server_name ${
|
|
344
|
+
server_name ${name};
|
|
300
345
|
return 503;
|
|
301
346
|
}
|
|
302
347
|
`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nginx-ssl.js","sourceRoot":"","sources":["../../src/hosting/nginx-ssl.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"nginx-ssl.js","sourceRoot":"","sources":["../../src/hosting/nginx-ssl.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,12 +18,46 @@ export interface NginxSyncResult {
|
|
|
18
18
|
/**
|
|
19
19
|
* Ensure managed nginx conf dir exists; optionally copy to system sites and nginx -t.
|
|
20
20
|
*/
|
|
21
|
+
/** Managed `ysks_xxx.conf` or system `ysk-ysks_xxx.conf`. */
|
|
22
|
+
export declare function isProjectNginxConfName(name: string): boolean;
|
|
23
|
+
export declare function linuxUserFromNginxConfName(name: string): string;
|
|
24
|
+
/** Remove project vhosts whose linux user is no longer in the store. */
|
|
25
|
+
export declare function pruneOrphanProjectNginxConfs(opts: {
|
|
26
|
+
managedDir: string;
|
|
27
|
+
systemDir?: string | null;
|
|
28
|
+
keepLinuxUsers: string[];
|
|
29
|
+
}): string[];
|
|
30
|
+
export declare const YSK_DEFAULT_NGINX_BASENAME = "000-default.conf";
|
|
31
|
+
export type YskDefaultSslMode = 'reject' | 'selfsigned';
|
|
32
|
+
/** Catch-all so unknown Host / SNI does not fall into another site's vhost. */
|
|
33
|
+
export declare function renderYskDefaultNginxConf(opts?: {
|
|
34
|
+
sslMode?: YskDefaultSslMode;
|
|
35
|
+
sslCertificate?: string;
|
|
36
|
+
sslCertificateKey?: string;
|
|
37
|
+
}): string;
|
|
38
|
+
export declare function ensureYskDefaultNginxConf(managedDir: string, opts?: {
|
|
39
|
+
sslMode?: YskDefaultSslMode;
|
|
40
|
+
sslCertificate?: string;
|
|
41
|
+
sslCertificateKey?: string;
|
|
42
|
+
}): string;
|
|
43
|
+
/** Remove default_server from listen lines (keep our catch-all file). */
|
|
44
|
+
export declare function stripListenDefaultServer(body: string): string;
|
|
45
|
+
export declare function isYskManagedSystemConfName(name: string): boolean;
|
|
46
|
+
/** System copies whose managed source is gone (all ysk-*.conf, not only ysks_*). */
|
|
47
|
+
export declare function pruneStaleYskSystemNginxConfs(systemDir: string, managedBasenames: string[]): string[];
|
|
48
|
+
export declare function publicFilesConfBasename(serverName: string): string;
|
|
49
|
+
export declare function pruneStalePublicFilesNginxConfs(managedDir: string, keepBasename?: string | null): string[];
|
|
50
|
+
export declare function keepPublicFilesBasenameFromMeta(dataDir: string): string | undefined;
|
|
21
51
|
export declare function syncNginxConfigs(opts: {
|
|
22
52
|
dataDir: string;
|
|
23
53
|
/** e.g. /etc/nginx/conf.d — only used when executeEnabled + writable */
|
|
24
54
|
systemConfDir?: string;
|
|
25
55
|
host: HostExecutor;
|
|
26
56
|
dryRun?: boolean;
|
|
57
|
+
/** When set, drop ysks_* vhosts whose linux user is not live */
|
|
58
|
+
keepLinuxUsers?: string[];
|
|
59
|
+
/** Keep this public-files-*.conf; drop other public-files leftovers */
|
|
60
|
+
keepPublicFilesConf?: string;
|
|
27
61
|
}): Promise<NginxSyncResult>;
|
|
28
62
|
/**
|
|
29
63
|
* Write a single server block into managed conf.d.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nginx-sync.d.ts","sourceRoot":"","sources":["../../src/hosting/nginx-sync.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGxD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,iEAAiE;IACjE,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,wEAAwE;IACxE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"nginx-sync.d.ts","sourceRoot":"","sources":["../../src/hosting/nginx-sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,236 @@ import { injectDefenseLimitsIntoConf } from './defense/nginx-limits.js';
|
|
|
8
8
|
/**
|
|
9
9
|
* Ensure managed nginx conf dir exists; optionally copy to system sites and nginx -t.
|
|
10
10
|
*/
|
|
11
|
+
/** Managed `ysks_xxx.conf` or system `ysk-ysks_xxx.conf`. */
|
|
12
|
+
export function isProjectNginxConfName(name) {
|
|
13
|
+
return /^(ysk-)?ysks_[a-z0-9]+\.conf$/i.test(name);
|
|
14
|
+
}
|
|
15
|
+
export function linuxUserFromNginxConfName(name) {
|
|
16
|
+
return name.replace(/^ysk-/i, '').replace(/\.conf$/i, '');
|
|
17
|
+
}
|
|
18
|
+
/** Remove project vhosts whose linux user is no longer in the store. */
|
|
19
|
+
export function pruneOrphanProjectNginxConfs(opts) {
|
|
20
|
+
const keep = new Set(opts.keepLinuxUsers.map((u) => u.trim().toLowerCase()).filter(Boolean));
|
|
21
|
+
const removed = [];
|
|
22
|
+
const sweep = (dir) => {
|
|
23
|
+
if (!dir || !existsSync(dir))
|
|
24
|
+
return;
|
|
25
|
+
for (const f of readdirSync(dir)) {
|
|
26
|
+
if (!isProjectNginxConfName(f))
|
|
27
|
+
continue;
|
|
28
|
+
const user = linuxUserFromNginxConfName(f).toLowerCase();
|
|
29
|
+
if (keep.has(user))
|
|
30
|
+
continue;
|
|
31
|
+
const path = join(dir, f);
|
|
32
|
+
try {
|
|
33
|
+
unlinkSync(path);
|
|
34
|
+
removed.push(path);
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
/* leave in place */
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
sweep(opts.managedDir);
|
|
42
|
+
sweep(opts.systemDir ?? undefined);
|
|
43
|
+
return removed;
|
|
44
|
+
}
|
|
45
|
+
export const YSK_DEFAULT_NGINX_BASENAME = '000-default.conf';
|
|
46
|
+
/** Catch-all so unknown Host / SNI does not fall into another site's vhost. */
|
|
47
|
+
export function renderYskDefaultNginxConf(opts) {
|
|
48
|
+
const sslMode = opts?.sslMode ?? 'reject';
|
|
49
|
+
const http = `server {
|
|
50
|
+
listen 80 default_server;
|
|
51
|
+
listen [::]:80 default_server;
|
|
52
|
+
server_name _;
|
|
53
|
+
return 444;
|
|
54
|
+
}`;
|
|
55
|
+
if (sslMode === 'selfsigned' && opts?.sslCertificate && opts.sslCertificateKey) {
|
|
56
|
+
return `# YSK catch-all — unknown Host / SNI must not serve another site
|
|
57
|
+
${http}
|
|
58
|
+
server {
|
|
59
|
+
listen 443 ssl default_server;
|
|
60
|
+
listen [::]:443 ssl default_server;
|
|
61
|
+
server_name _;
|
|
62
|
+
ssl_certificate ${opts.sslCertificate};
|
|
63
|
+
ssl_certificate_key ${opts.sslCertificateKey};
|
|
64
|
+
return 444;
|
|
65
|
+
}
|
|
66
|
+
`;
|
|
67
|
+
}
|
|
68
|
+
return `# YSK catch-all — unknown Host / SNI must not serve another site
|
|
69
|
+
${http}
|
|
70
|
+
server {
|
|
71
|
+
listen 443 ssl default_server;
|
|
72
|
+
listen [::]:443 ssl default_server;
|
|
73
|
+
server_name _;
|
|
74
|
+
ssl_reject_handshake on;
|
|
75
|
+
}
|
|
76
|
+
`;
|
|
77
|
+
}
|
|
78
|
+
export function ensureYskDefaultNginxConf(managedDir, opts) {
|
|
79
|
+
mkdirSync(managedDir, { recursive: true });
|
|
80
|
+
const path = join(managedDir, YSK_DEFAULT_NGINX_BASENAME);
|
|
81
|
+
writeFileSync(path, renderYskDefaultNginxConf(opts), 'utf8');
|
|
82
|
+
return path;
|
|
83
|
+
}
|
|
84
|
+
/** Remove default_server from listen lines (keep our catch-all file). */
|
|
85
|
+
export function stripListenDefaultServer(body) {
|
|
86
|
+
return body.replace(/^(\s*listen\s+[^;]*?)\s+default_server(\s+[^;]*)?;/gm, (_, pre, rest) => `${pre}${rest ?? ''};`);
|
|
87
|
+
}
|
|
88
|
+
export function isYskManagedSystemConfName(name) {
|
|
89
|
+
return /^ysk-.+\.conf$/i.test(name);
|
|
90
|
+
}
|
|
91
|
+
/** System copies whose managed source is gone (all ysk-*.conf, not only ysks_*). */
|
|
92
|
+
export function pruneStaleYskSystemNginxConfs(systemDir, managedBasenames) {
|
|
93
|
+
if (!existsSync(systemDir))
|
|
94
|
+
return [];
|
|
95
|
+
const keep = new Set(managedBasenames.map((f) => (f.startsWith('ysk-') ? f : `ysk-${f}`)));
|
|
96
|
+
const removed = [];
|
|
97
|
+
for (const f of readdirSync(systemDir)) {
|
|
98
|
+
if (!isYskManagedSystemConfName(f))
|
|
99
|
+
continue;
|
|
100
|
+
if (keep.has(f))
|
|
101
|
+
continue;
|
|
102
|
+
const path = join(systemDir, f);
|
|
103
|
+
try {
|
|
104
|
+
unlinkSync(path);
|
|
105
|
+
removed.push(path);
|
|
106
|
+
}
|
|
107
|
+
catch {
|
|
108
|
+
/* leave */
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
return removed;
|
|
112
|
+
}
|
|
113
|
+
export function publicFilesConfBasename(serverName) {
|
|
114
|
+
return `public-files-${serverName.trim().toLowerCase().replace(/\./g, '-')}.conf`;
|
|
115
|
+
}
|
|
116
|
+
export function pruneStalePublicFilesNginxConfs(managedDir, keepBasename) {
|
|
117
|
+
if (!existsSync(managedDir) || !keepBasename)
|
|
118
|
+
return [];
|
|
119
|
+
const removed = [];
|
|
120
|
+
for (const f of readdirSync(managedDir)) {
|
|
121
|
+
if (!f.startsWith('public-files-') || !f.endsWith('.conf'))
|
|
122
|
+
continue;
|
|
123
|
+
if (f === keepBasename)
|
|
124
|
+
continue;
|
|
125
|
+
const path = join(managedDir, f);
|
|
126
|
+
try {
|
|
127
|
+
unlinkSync(path);
|
|
128
|
+
removed.push(path);
|
|
129
|
+
}
|
|
130
|
+
catch {
|
|
131
|
+
/* leave */
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
return removed;
|
|
135
|
+
}
|
|
136
|
+
const YSK_DEFAULT_SYSTEM_NAME = `ysk-${YSK_DEFAULT_NGINX_BASENAME}`;
|
|
137
|
+
function stripForeignDefaultServer(dir, notes) {
|
|
138
|
+
if (!existsSync(dir))
|
|
139
|
+
return;
|
|
140
|
+
for (const f of readdirSync(dir)) {
|
|
141
|
+
if (!f.endsWith('.conf'))
|
|
142
|
+
continue;
|
|
143
|
+
if (f === YSK_DEFAULT_NGINX_BASENAME || f === YSK_DEFAULT_SYSTEM_NAME)
|
|
144
|
+
continue;
|
|
145
|
+
const path = join(dir, f);
|
|
146
|
+
try {
|
|
147
|
+
const prev = readFileSync(path, 'utf8');
|
|
148
|
+
if (!/\bdefault_server\b/.test(prev))
|
|
149
|
+
continue;
|
|
150
|
+
const next = stripListenDefaultServer(prev);
|
|
151
|
+
if (next !== prev) {
|
|
152
|
+
writeFileSync(path, next, 'utf8');
|
|
153
|
+
notes.push(`stripped default_server from ${path}`);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
catch {
|
|
157
|
+
/* leave */
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
async function disableDistroNginxDefault(host, notes) {
|
|
162
|
+
const targets = [
|
|
163
|
+
'/etc/nginx/sites-enabled/default',
|
|
164
|
+
'/etc/nginx/sites-enabled/default-ssl',
|
|
165
|
+
];
|
|
166
|
+
for (const p of targets) {
|
|
167
|
+
if (!host.pathExists(p))
|
|
168
|
+
continue;
|
|
169
|
+
try {
|
|
170
|
+
unlinkSync(p);
|
|
171
|
+
notes.push(`disabled distro nginx site ${p}`);
|
|
172
|
+
}
|
|
173
|
+
catch {
|
|
174
|
+
const r = await host.runCommand(['rm', '-f', p], { timeoutMs: 5_000 });
|
|
175
|
+
if (r.exitCode === 0)
|
|
176
|
+
notes.push(`disabled distro nginx site ${p}`);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
async function ensureDefaultSelfSigned(host, dataDir) {
|
|
181
|
+
const dir = join(dataDir, 'nginx', 'default-tls');
|
|
182
|
+
const cert = join(dir, 'fullchain.pem');
|
|
183
|
+
const key = join(dir, 'privkey.pem');
|
|
184
|
+
if (existsSync(cert) && existsSync(key))
|
|
185
|
+
return { cert, key };
|
|
186
|
+
mkdirSync(dir, { recursive: true });
|
|
187
|
+
const r = await host.runCommand([
|
|
188
|
+
'openssl',
|
|
189
|
+
'req',
|
|
190
|
+
'-x509',
|
|
191
|
+
'-newkey',
|
|
192
|
+
'rsa:2048',
|
|
193
|
+
'-keyout',
|
|
194
|
+
key,
|
|
195
|
+
'-out',
|
|
196
|
+
cert,
|
|
197
|
+
'-days',
|
|
198
|
+
'3650',
|
|
199
|
+
'-nodes',
|
|
200
|
+
'-subj',
|
|
201
|
+
'/CN=_',
|
|
202
|
+
], { timeoutMs: 20_000 });
|
|
203
|
+
if (r.exitCode !== 0 || !existsSync(cert) || !existsSync(key))
|
|
204
|
+
return null;
|
|
205
|
+
return { cert, key };
|
|
206
|
+
}
|
|
207
|
+
export function keepPublicFilesBasenameFromMeta(dataDir) {
|
|
208
|
+
const metaPath = join(dataDir, 'files', 'public-files-meta.json');
|
|
209
|
+
if (!existsSync(metaPath))
|
|
210
|
+
return undefined;
|
|
211
|
+
try {
|
|
212
|
+
const meta = JSON.parse(readFileSync(metaPath, 'utf8'));
|
|
213
|
+
const sn = String(meta.serverName ?? '').trim();
|
|
214
|
+
return sn ? publicFilesConfBasename(sn) : undefined;
|
|
215
|
+
}
|
|
216
|
+
catch {
|
|
217
|
+
return undefined;
|
|
218
|
+
}
|
|
219
|
+
}
|
|
11
220
|
export async function syncNginxConfigs(opts) {
|
|
12
221
|
const sourceDir = join(opts.dataDir, 'nginx', 'conf.d');
|
|
13
222
|
mkdirSync(sourceDir, { recursive: true });
|
|
223
|
+
const pruneNotes = [];
|
|
224
|
+
if (!opts.dryRun) {
|
|
225
|
+
const keepPf = opts.keepPublicFilesConf ?? keepPublicFilesBasenameFromMeta(opts.dataDir);
|
|
226
|
+
for (const p of pruneStalePublicFilesNginxConfs(sourceDir, keepPf)) {
|
|
227
|
+
pruneNotes.push(tl('notes.nginx.removedOrphan', { path: p }));
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
ensureYskDefaultNginxConf(sourceDir);
|
|
231
|
+
if (opts.keepLinuxUsers && !opts.dryRun) {
|
|
232
|
+
const removed = pruneOrphanProjectNginxConfs({
|
|
233
|
+
managedDir: sourceDir,
|
|
234
|
+
systemDir: opts.systemConfDir,
|
|
235
|
+
keepLinuxUsers: opts.keepLinuxUsers,
|
|
236
|
+
});
|
|
237
|
+
for (const p of removed) {
|
|
238
|
+
pruneNotes.push(tl('notes.nginx.removedOrphan', { path: p }));
|
|
239
|
+
}
|
|
240
|
+
}
|
|
14
241
|
// always write a managed main include snippet for documentation
|
|
15
242
|
const managedMain = join(opts.dataDir, 'nginx', 'ysk-managed.conf');
|
|
16
243
|
writeFileSync(managedMain, `# Generated by YSK Server — include from main nginx.conf:\n# include ${sourceDir}/*.conf;\n`, 'utf8');
|
|
@@ -23,6 +250,7 @@ export async function syncNginxConfigs(opts) {
|
|
|
23
250
|
const notes = [
|
|
24
251
|
tl('notes.nginx.managedDir', { path: sourceDir }),
|
|
25
252
|
tl('notes.nginx.includeHint', { path: sourceDir }),
|
|
253
|
+
...pruneNotes,
|
|
26
254
|
];
|
|
27
255
|
const copied = [];
|
|
28
256
|
const targetDir = opts.systemConfDir ?? null;
|
|
@@ -54,24 +282,20 @@ export async function syncNginxConfigs(opts) {
|
|
|
54
282
|
copyFileSync(src, dest);
|
|
55
283
|
copied.push(dest);
|
|
56
284
|
}
|
|
57
|
-
// Drop orphan project vhosts left after delete/recreate (same server_name → 502)
|
|
58
285
|
try {
|
|
59
|
-
const
|
|
60
|
-
|
|
61
|
-
// Only project linux_user confs: ysk-ysks_xxxxxxxx.conf
|
|
62
|
-
if (!/^ysk-ysks_[a-z0-9]+\.conf$/i.test(f))
|
|
63
|
-
continue;
|
|
64
|
-
if (managedSet.has(f))
|
|
65
|
-
continue;
|
|
66
|
-
const orphan = join(targetDir, f);
|
|
67
|
-
unlinkSync(orphan);
|
|
68
|
-
notes.push(tl('notes.nginx.removedOrphan', { path: orphan }));
|
|
286
|
+
for (const p of pruneStaleYskSystemNginxConfs(targetDir, files)) {
|
|
287
|
+
notes.push(tl('notes.nginx.removedOrphan', { path: p }));
|
|
69
288
|
}
|
|
70
289
|
}
|
|
71
290
|
catch (e) {
|
|
72
291
|
const msg = e instanceof Error ? e.message : String(e);
|
|
73
292
|
notes.push(tl('notes.nginx.orphanCleanupFailed', { detail: msg.slice(0, 120) }));
|
|
74
293
|
}
|
|
294
|
+
await disableDistroNginxDefault(opts.host, notes);
|
|
295
|
+
stripForeignDefaultServer(targetDir, notes);
|
|
296
|
+
if (existsSync('/etc/nginx/sites-enabled')) {
|
|
297
|
+
stripForeignDefaultServer('/etc/nginx/sites-enabled', notes);
|
|
298
|
+
}
|
|
75
299
|
notes.push(tl('notes.auto.t0427', { v0: (copied.length) }));
|
|
76
300
|
}
|
|
77
301
|
else if (targetDir) {
|
|
@@ -84,6 +308,29 @@ export async function syncNginxConfigs(opts) {
|
|
|
84
308
|
const r = await opts.host.runCommand(['nginx', '-t'], { timeoutMs: 10_000 });
|
|
85
309
|
tested = r.exitCode === 0;
|
|
86
310
|
testOutput = `${r.stdout}\n${r.stderr}`.trim();
|
|
311
|
+
if (!tested &&
|
|
312
|
+
/ssl_reject_handshake|unknown directive/i.test(testOutput) &&
|
|
313
|
+
targetDir &&
|
|
314
|
+
opts.host.executeEnabled()) {
|
|
315
|
+
const tls = await ensureDefaultSelfSigned(opts.host, opts.dataDir);
|
|
316
|
+
if (tls) {
|
|
317
|
+
ensureYskDefaultNginxConf(sourceDir, {
|
|
318
|
+
sslMode: 'selfsigned',
|
|
319
|
+
sslCertificate: tls.cert,
|
|
320
|
+
sslCertificateKey: tls.key,
|
|
321
|
+
});
|
|
322
|
+
try {
|
|
323
|
+
copyFileSync(join(sourceDir, YSK_DEFAULT_NGINX_BASENAME), join(targetDir, YSK_DEFAULT_SYSTEM_NAME));
|
|
324
|
+
}
|
|
325
|
+
catch {
|
|
326
|
+
/* */
|
|
327
|
+
}
|
|
328
|
+
const r2 = await opts.host.runCommand(['nginx', '-t'], { timeoutMs: 10_000 });
|
|
329
|
+
tested = r2.exitCode === 0;
|
|
330
|
+
testOutput = `${r2.stdout}\n${r2.stderr}`.trim();
|
|
331
|
+
notes.push('catch-all 443 fell back to a local self-signed cert (ssl_reject_handshake unavailable)');
|
|
332
|
+
}
|
|
333
|
+
}
|
|
87
334
|
notes.push(tested ? tl('notes.nginx.configOk') : tl('notes.tpl.nginxConfigFailed', { detail: testOutput || tl('notes.tpl.unknownError') }));
|
|
88
335
|
}
|
|
89
336
|
else {
|