@serve.zone/dcrouter 13.16.0 → 13.17.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/dist_serve/bundle.js +729 -721
- package/package.json +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/monitoring/classes.metricsmanager.ts +43 -34
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/elements/network/ops-view-network-activity.ts +2 -1
- package/ts_web/elements/network/ops-view-routes.ts +24 -8
- package/dist_ts/00_commitinfo_data.d.ts +0 -8
- package/dist_ts/00_commitinfo_data.js +0 -9
- package/dist_ts/acme/index.d.ts +0 -1
- package/dist_ts/acme/index.js +0 -2
- package/dist_ts/acme/manager.acme-config.d.ts +0 -48
- package/dist_ts/acme/manager.acme-config.js +0 -156
- package/dist_ts/classes.cert-provision-scheduler.d.ts +0 -52
- package/dist_ts/classes.cert-provision-scheduler.js +0 -138
- package/dist_ts/classes.dcrouter.d.ts +0 -401
- package/dist_ts/classes.dcrouter.js +0 -1852
- package/dist_ts/classes.storage-cert-manager.d.ts +0 -15
- package/dist_ts/classes.storage-cert-manager.js +0 -53
- package/dist_ts/config/classes.api-token-manager.d.ts +0 -44
- package/dist_ts/config/classes.api-token-manager.js +0 -180
- package/dist_ts/config/classes.db-seeder.d.ts +0 -25
- package/dist_ts/config/classes.db-seeder.js +0 -69
- package/dist_ts/config/classes.reference-resolver.d.ts +0 -80
- package/dist_ts/config/classes.reference-resolver.js +0 -483
- package/dist_ts/config/classes.route-config-manager.d.ts +0 -54
- package/dist_ts/config/classes.route-config-manager.js +0 -370
- package/dist_ts/config/classes.target-profile-manager.d.ts +0 -82
- package/dist_ts/config/classes.target-profile-manager.js +0 -349
- package/dist_ts/config/index.d.ts +0 -6
- package/dist_ts/config/index.js +0 -8
- package/dist_ts/config/validator.d.ts +0 -104
- package/dist_ts/config/validator.js +0 -152
- package/dist_ts/db/classes.cache.cleaner.d.ts +0 -47
- package/dist_ts/db/classes.cache.cleaner.js +0 -130
- package/dist_ts/db/classes.cached.document.d.ts +0 -76
- package/dist_ts/db/classes.cached.document.js +0 -100
- package/dist_ts/db/classes.dcrouter-db.d.ts +0 -70
- package/dist_ts/db/classes.dcrouter-db.js +0 -146
- package/dist_ts/db/documents/classes.accounting-session.doc.d.ts +0 -32
- package/dist_ts/db/documents/classes.accounting-session.doc.js +0 -214
- package/dist_ts/db/documents/classes.acme-cert.doc.d.ts +0 -13
- package/dist_ts/db/documents/classes.acme-cert.doc.js +0 -109
- package/dist_ts/db/documents/classes.acme-config.doc.d.ts +0 -22
- package/dist_ts/db/documents/classes.acme-config.doc.js +0 -121
- package/dist_ts/db/documents/classes.api-token.doc.d.ts +0 -18
- package/dist_ts/db/documents/classes.api-token.doc.js +0 -127
- package/dist_ts/db/documents/classes.cached.email.d.ts +0 -125
- package/dist_ts/db/documents/classes.cached.email.js +0 -337
- package/dist_ts/db/documents/classes.cached.ip.reputation.d.ts +0 -119
- package/dist_ts/db/documents/classes.cached.ip.reputation.js +0 -323
- package/dist_ts/db/documents/classes.cert-backoff.doc.d.ts +0 -11
- package/dist_ts/db/documents/classes.cert-backoff.doc.js +0 -97
- package/dist_ts/db/documents/classes.dns-provider.doc.d.ts +0 -22
- package/dist_ts/db/documents/classes.dns-provider.doc.js +0 -134
- package/dist_ts/db/documents/classes.dns-record.doc.d.ts +0 -21
- package/dist_ts/db/documents/classes.dns-record.doc.js +0 -143
- package/dist_ts/db/documents/classes.domain.doc.d.ts +0 -22
- package/dist_ts/db/documents/classes.domain.doc.js +0 -146
- package/dist_ts/db/documents/classes.email-domain.doc.d.ts +0 -17
- package/dist_ts/db/documents/classes.email-domain.doc.js +0 -124
- package/dist_ts/db/documents/classes.network-target.doc.d.ts +0 -15
- package/dist_ts/db/documents/classes.network-target.doc.js +0 -118
- package/dist_ts/db/documents/classes.proxy-cert.doc.d.ts +0 -12
- package/dist_ts/db/documents/classes.proxy-cert.doc.js +0 -103
- package/dist_ts/db/documents/classes.remote-ingress-edge.doc.d.ts +0 -17
- package/dist_ts/db/documents/classes.remote-ingress-edge.doc.js +0 -130
- package/dist_ts/db/documents/classes.route.doc.d.ts +0 -18
- package/dist_ts/db/documents/classes.route.doc.js +0 -121
- package/dist_ts/db/documents/classes.source-profile.doc.d.ts +0 -15
- package/dist_ts/db/documents/classes.source-profile.doc.js +0 -115
- package/dist_ts/db/documents/classes.target-profile.doc.d.ts +0 -16
- package/dist_ts/db/documents/classes.target-profile.doc.js +0 -121
- package/dist_ts/db/documents/classes.vlan-mappings.doc.d.ts +0 -15
- package/dist_ts/db/documents/classes.vlan-mappings.doc.js +0 -77
- package/dist_ts/db/documents/classes.vpn-client.doc.d.ts +0 -23
- package/dist_ts/db/documents/classes.vpn-client.doc.js +0 -172
- package/dist_ts/db/documents/classes.vpn-server-keys.doc.d.ts +0 -10
- package/dist_ts/db/documents/classes.vpn-server-keys.doc.js +0 -94
- package/dist_ts/db/documents/index.d.ts +0 -20
- package/dist_ts/db/documents/index.js +0 -30
- package/dist_ts/db/index.d.ts +0 -4
- package/dist_ts/db/index.js +0 -9
- package/dist_ts/dns/index.d.ts +0 -2
- package/dist_ts/dns/index.js +0 -3
- package/dist_ts/dns/manager.dns.d.ts +0 -267
- package/dist_ts/dns/manager.dns.js +0 -906
- package/dist_ts/dns/providers/cloudflare.provider.d.ts +0 -21
- package/dist_ts/dns/providers/cloudflare.provider.js +0 -106
- package/dist_ts/dns/providers/factory.d.ts +0 -23
- package/dist_ts/dns/providers/factory.js +0 -47
- package/dist_ts/dns/providers/index.d.ts +0 -3
- package/dist_ts/dns/providers/index.js +0 -4
- package/dist_ts/dns/providers/interfaces.d.ts +0 -54
- package/dist_ts/dns/providers/interfaces.js +0 -2
- package/dist_ts/email/classes.email-domain.manager.d.ts +0 -46
- package/dist_ts/email/classes.email-domain.manager.js +0 -276
- package/dist_ts/email/index.d.ts +0 -1
- package/dist_ts/email/index.js +0 -2
- package/dist_ts/errors/base.errors.d.ts +0 -224
- package/dist_ts/errors/base.errors.js +0 -320
- package/dist_ts/errors/error-handler.d.ts +0 -98
- package/dist_ts/errors/error-handler.js +0 -282
- package/dist_ts/errors/error.codes.d.ts +0 -115
- package/dist_ts/errors/error.codes.js +0 -136
- package/dist_ts/errors/index.d.ts +0 -54
- package/dist_ts/errors/index.js +0 -136
- package/dist_ts/errors/reputation.errors.d.ts +0 -183
- package/dist_ts/errors/reputation.errors.js +0 -292
- package/dist_ts/http3/http3-route-augmentation.d.ts +0 -50
- package/dist_ts/http3/http3-route-augmentation.js +0 -98
- package/dist_ts/http3/index.d.ts +0 -1
- package/dist_ts/http3/index.js +0 -2
- package/dist_ts/index.d.ts +0 -8
- package/dist_ts/index.js +0 -29
- package/dist_ts/logger.d.ts +0 -21
- package/dist_ts/logger.js +0 -81
- package/dist_ts/monitoring/classes.metricscache.d.ts +0 -32
- package/dist_ts/monitoring/classes.metricscache.js +0 -63
- package/dist_ts/monitoring/classes.metricsmanager.d.ts +0 -233
- package/dist_ts/monitoring/classes.metricsmanager.js +0 -897
- package/dist_ts/monitoring/index.d.ts +0 -1
- package/dist_ts/monitoring/index.js +0 -2
- package/dist_ts/opsserver/classes.opsserver.d.ts +0 -47
- package/dist_ts/opsserver/classes.opsserver.js +0 -105
- package/dist_ts/opsserver/handlers/acme-config.handler.d.ts +0 -16
- package/dist_ts/opsserver/handlers/acme-config.handler.js +0 -77
- package/dist_ts/opsserver/handlers/admin.handler.d.ts +0 -40
- package/dist_ts/opsserver/handlers/admin.handler.js +0 -191
- package/dist_ts/opsserver/handlers/api-token.handler.d.ts +0 -6
- package/dist_ts/opsserver/handlers/api-token.handler.js +0 -62
- package/dist_ts/opsserver/handlers/certificate.handler.d.ts +0 -77
- package/dist_ts/opsserver/handlers/certificate.handler.js +0 -574
- package/dist_ts/opsserver/handlers/config.handler.d.ts +0 -7
- package/dist_ts/opsserver/handlers/config.handler.js +0 -200
- package/dist_ts/opsserver/handlers/dns-provider.handler.d.ts +0 -16
- package/dist_ts/opsserver/handlers/dns-provider.handler.js +0 -156
- package/dist_ts/opsserver/handlers/dns-record.handler.d.ts +0 -13
- package/dist_ts/opsserver/handlers/dns-record.handler.js +0 -98
- package/dist_ts/opsserver/handlers/domain.handler.d.ts +0 -13
- package/dist_ts/opsserver/handlers/domain.handler.js +0 -137
- package/dist_ts/opsserver/handlers/email-domain.handler.d.ts +0 -16
- package/dist_ts/opsserver/handlers/email-domain.handler.js +0 -150
- package/dist_ts/opsserver/handlers/email-ops.handler.d.ts +0 -30
- package/dist_ts/opsserver/handlers/email-ops.handler.js +0 -227
- package/dist_ts/opsserver/handlers/index.d.ts +0 -21
- package/dist_ts/opsserver/handlers/index.js +0 -22
- package/dist_ts/opsserver/handlers/logs.handler.d.ts +0 -25
- package/dist_ts/opsserver/handlers/logs.handler.js +0 -264
- package/dist_ts/opsserver/handlers/network-target.handler.d.ts +0 -10
- package/dist_ts/opsserver/handlers/network-target.handler.js +0 -117
- package/dist_ts/opsserver/handlers/radius.handler.d.ts +0 -6
- package/dist_ts/opsserver/handlers/radius.handler.js +0 -295
- package/dist_ts/opsserver/handlers/remoteingress.handler.d.ts +0 -6
- package/dist_ts/opsserver/handlers/remoteingress.handler.js +0 -156
- package/dist_ts/opsserver/handlers/route-management.handler.d.ts +0 -14
- package/dist_ts/opsserver/handlers/route-management.handler.js +0 -98
- package/dist_ts/opsserver/handlers/security.handler.d.ts +0 -9
- package/dist_ts/opsserver/handlers/security.handler.js +0 -237
- package/dist_ts/opsserver/handlers/source-profile.handler.d.ts +0 -10
- package/dist_ts/opsserver/handlers/source-profile.handler.js +0 -119
- package/dist_ts/opsserver/handlers/stats.handler.d.ts +0 -11
- package/dist_ts/opsserver/handlers/stats.handler.js +0 -461
- package/dist_ts/opsserver/handlers/target-profile.handler.d.ts +0 -10
- package/dist_ts/opsserver/handlers/target-profile.handler.js +0 -117
- package/dist_ts/opsserver/handlers/users.handler.d.ts +0 -12
- package/dist_ts/opsserver/handlers/users.handler.js +0 -24
- package/dist_ts/opsserver/handlers/vpn.handler.d.ts +0 -6
- package/dist_ts/opsserver/handlers/vpn.handler.js +0 -262
- package/dist_ts/opsserver/helpers/guards.d.ts +0 -27
- package/dist_ts/opsserver/helpers/guards.js +0 -43
- package/dist_ts/opsserver/index.d.ts +0 -1
- package/dist_ts/opsserver/index.js +0 -2
- package/dist_ts/paths.d.ts +0 -25
- package/dist_ts/paths.js +0 -44
- package/dist_ts/plugins.d.ts +0 -81
- package/dist_ts/plugins.js +0 -115
- package/dist_ts/radius/classes.accounting.manager.d.ts +0 -223
- package/dist_ts/radius/classes.accounting.manager.js +0 -449
- package/dist_ts/radius/classes.radius.server.d.ts +0 -169
- package/dist_ts/radius/classes.radius.server.js +0 -384
- package/dist_ts/radius/classes.vlan.manager.d.ts +0 -124
- package/dist_ts/radius/classes.vlan.manager.js +0 -272
- package/dist_ts/radius/index.d.ts +0 -13
- package/dist_ts/radius/index.js +0 -14
- package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +0 -92
- package/dist_ts/remoteingress/classes.remoteingress-manager.js +0 -291
- package/dist_ts/remoteingress/classes.tunnel-manager.d.ts +0 -59
- package/dist_ts/remoteingress/classes.tunnel-manager.js +0 -165
- package/dist_ts/remoteingress/index.d.ts +0 -2
- package/dist_ts/remoteingress/index.js +0 -3
- package/dist_ts/security/classes.contentscanner.d.ts +0 -164
- package/dist_ts/security/classes.contentscanner.js +0 -642
- package/dist_ts/security/classes.ipreputationchecker.d.ts +0 -145
- package/dist_ts/security/classes.ipreputationchecker.js +0 -458
- package/dist_ts/security/classes.securitylogger.d.ts +0 -144
- package/dist_ts/security/classes.securitylogger.js +0 -235
- package/dist_ts/security/index.d.ts +0 -3
- package/dist_ts/security/index.js +0 -4
- package/dist_ts/sms/classes.smsservice.d.ts +0 -15
- package/dist_ts/sms/classes.smsservice.js +0 -72
- package/dist_ts/sms/config/sms.config.d.ts +0 -93
- package/dist_ts/sms/config/sms.config.js +0 -2
- package/dist_ts/sms/config/sms.schema.d.ts +0 -5
- package/dist_ts/sms/config/sms.schema.js +0 -121
- package/dist_ts/sms/index.d.ts +0 -1
- package/dist_ts/sms/index.js +0 -2
- package/dist_ts/vpn/classes.vpn-manager.d.ts +0 -159
- package/dist_ts/vpn/classes.vpn-manager.js +0 -459
- package/dist_ts/vpn/index.d.ts +0 -1
- package/dist_ts/vpn/index.js +0 -2
- package/dist_ts_apiclient/classes.apitoken.d.ts +0 -41
- package/dist_ts_apiclient/classes.apitoken.js +0 -115
- package/dist_ts_apiclient/classes.certificate.d.ts +0 -57
- package/dist_ts_apiclient/classes.certificate.js +0 -69
- package/dist_ts_apiclient/classes.config.d.ts +0 -7
- package/dist_ts_apiclient/classes.config.js +0 -11
- package/dist_ts_apiclient/classes.dcrouterapiclient.d.ts +0 -41
- package/dist_ts_apiclient/classes.dcrouterapiclient.js +0 -81
- package/dist_ts_apiclient/classes.email.d.ts +0 -30
- package/dist_ts_apiclient/classes.email.js +0 -52
- package/dist_ts_apiclient/classes.logs.d.ts +0 -21
- package/dist_ts_apiclient/classes.logs.js +0 -14
- package/dist_ts_apiclient/classes.radius.d.ts +0 -59
- package/dist_ts_apiclient/classes.radius.js +0 -95
- package/dist_ts_apiclient/classes.remoteingress.d.ts +0 -54
- package/dist_ts_apiclient/classes.remoteingress.js +0 -136
- package/dist_ts_apiclient/classes.route.d.ts +0 -39
- package/dist_ts_apiclient/classes.route.js +0 -125
- package/dist_ts_apiclient/classes.stats.d.ts +0 -47
- package/dist_ts_apiclient/classes.stats.js +0 -38
- package/dist_ts_apiclient/index.d.ts +0 -10
- package/dist_ts_apiclient/index.js +0 -14
- package/dist_ts_apiclient/plugins.d.ts +0 -3
- package/dist_ts_apiclient/plugins.js +0 -5
- package/dist_ts_interfaces/data/acme-config.d.ts +0 -25
- package/dist_ts_interfaces/data/acme-config.js +0 -2
- package/dist_ts_interfaces/data/auth.d.ts +0 -8
- package/dist_ts_interfaces/data/auth.js +0 -2
- package/dist_ts_interfaces/data/dns-provider.d.ts +0 -136
- package/dist_ts_interfaces/data/dns-provider.js +0 -41
- package/dist_ts_interfaces/data/dns-record.d.ts +0 -42
- package/dist_ts_interfaces/data/dns-record.js +0 -2
- package/dist_ts_interfaces/data/domain.d.ts +0 -35
- package/dist_ts_interfaces/data/domain.js +0 -2
- package/dist_ts_interfaces/data/email-domain.d.ts +0 -70
- package/dist_ts_interfaces/data/email-domain.js +0 -2
- package/dist_ts_interfaces/data/index.d.ts +0 -11
- package/dist_ts_interfaces/data/index.js +0 -12
- package/dist_ts_interfaces/data/remoteingress.d.ts +0 -60
- package/dist_ts_interfaces/data/remoteingress.js +0 -2
- package/dist_ts_interfaces/data/route-management.d.ts +0 -110
- package/dist_ts_interfaces/data/route-management.js +0 -2
- package/dist_ts_interfaces/data/stats.d.ts +0 -238
- package/dist_ts_interfaces/data/stats.js +0 -2
- package/dist_ts_interfaces/data/target-profile.d.ts +0 -28
- package/dist_ts_interfaces/data/target-profile.js +0 -2
- package/dist_ts_interfaces/data/vpn.d.ts +0 -61
- package/dist_ts_interfaces/data/vpn.js +0 -2
- package/dist_ts_interfaces/index.d.ts +0 -5
- package/dist_ts_interfaces/index.js +0 -8
- package/dist_ts_interfaces/plugins.d.ts +0 -2
- package/dist_ts_interfaces/plugins.js +0 -4
- package/dist_ts_interfaces/requests/acme-config.d.ts +0 -42
- package/dist_ts_interfaces/requests/acme-config.js +0 -2
- package/dist_ts_interfaces/requests/admin.d.ts +0 -31
- package/dist_ts_interfaces/requests/admin.js +0 -3
- package/dist_ts_interfaces/requests/api-tokens.d.ts +0 -79
- package/dist_ts_interfaces/requests/api-tokens.js +0 -2
- package/dist_ts_interfaces/requests/certificate.d.ts +0 -111
- package/dist_ts_interfaces/requests/certificate.js +0 -3
- package/dist_ts_interfaces/requests/combined.stats.d.ts +0 -28
- package/dist_ts_interfaces/requests/combined.stats.js +0 -2
- package/dist_ts_interfaces/requests/config.d.ts +0 -90
- package/dist_ts_interfaces/requests/config.js +0 -3
- package/dist_ts_interfaces/requests/dns-providers.d.ts +0 -117
- package/dist_ts_interfaces/requests/dns-providers.js +0 -2
- package/dist_ts_interfaces/requests/dns-records.d.ts +0 -89
- package/dist_ts_interfaces/requests/dns-records.js +0 -2
- package/dist_ts_interfaces/requests/domains.d.ts +0 -142
- package/dist_ts_interfaces/requests/domains.js +0 -2
- package/dist_ts_interfaces/requests/email-domains.d.ts +0 -142
- package/dist_ts_interfaces/requests/email-domains.js +0 -2
- package/dist_ts_interfaces/requests/email-ops.d.ts +0 -82
- package/dist_ts_interfaces/requests/email-ops.js +0 -3
- package/dist_ts_interfaces/requests/index.d.ts +0 -21
- package/dist_ts_interfaces/requests/index.js +0 -22
- package/dist_ts_interfaces/requests/logs.d.ts +0 -41
- package/dist_ts_interfaces/requests/logs.js +0 -4
- package/dist_ts_interfaces/requests/network-targets.d.ts +0 -102
- package/dist_ts_interfaces/requests/network-targets.js +0 -2
- package/dist_ts_interfaces/requests/radius.d.ts +0 -268
- package/dist_ts_interfaces/requests/radius.js +0 -3
- package/dist_ts_interfaces/requests/remoteingress.d.ts +0 -108
- package/dist_ts_interfaces/requests/remoteingress.js +0 -3
- package/dist_ts_interfaces/requests/route-management.d.ts +0 -85
- package/dist_ts_interfaces/requests/route-management.js +0 -2
- package/dist_ts_interfaces/requests/source-profiles.d.ts +0 -102
- package/dist_ts_interfaces/requests/source-profiles.js +0 -2
- package/dist_ts_interfaces/requests/stats.d.ts +0 -177
- package/dist_ts_interfaces/requests/stats.js +0 -4
- package/dist_ts_interfaces/requests/target-profiles.d.ts +0 -103
- package/dist_ts_interfaces/requests/target-profiles.js +0 -2
- package/dist_ts_interfaces/requests/users.d.ts +0 -19
- package/dist_ts_interfaces/requests/users.js +0 -3
- package/dist_ts_interfaces/requests/vpn.d.ts +0 -177
- package/dist_ts_interfaces/requests/vpn.js +0 -3
- package/dist_ts_migrations/index.d.ts +0 -28
- package/dist_ts_migrations/index.js +0 -82
- package/dist_ts_oci_container/index.d.ts +0 -8
- package/dist_ts_oci_container/index.js +0 -110
- package/dist_ts_oci_container/plugins.d.ts +0 -3
- package/dist_ts_oci_container/plugins.js +0 -4
- package/dist_ts_web/00_commitinfo_data.d.ts +0 -8
- package/dist_ts_web/00_commitinfo_data.js +0 -9
- package/dist_ts_web/appstate.d.ts +0 -478
- package/dist_ts_web/appstate.js +0 -1968
- package/dist_ts_web/elements/access/index.d.ts +0 -2
- package/dist_ts_web/elements/access/index.js +0 -3
- package/dist_ts_web/elements/access/ops-view-apitokens.d.ts +0 -13
- package/dist_ts_web/elements/access/ops-view-apitokens.js +0 -372
- package/dist_ts_web/elements/access/ops-view-users.d.ts +0 -11
- package/dist_ts_web/elements/access/ops-view-users.js +0 -190
- package/dist_ts_web/elements/domains/dns-provider-form.d.ts +0 -60
- package/dist_ts_web/elements/domains/dns-provider-form.js +0 -259
- package/dist_ts_web/elements/domains/index.d.ts +0 -5
- package/dist_ts_web/elements/domains/index.js +0 -6
- package/dist_ts_web/elements/domains/ops-view-certificates.d.ts +0 -25
- package/dist_ts_web/elements/domains/ops-view-certificates.js +0 -669
- package/dist_ts_web/elements/domains/ops-view-dns.d.ts +0 -17
- package/dist_ts_web/elements/domains/ops-view-dns.js +0 -305
- package/dist_ts_web/elements/domains/ops-view-domains.d.ts +0 -19
- package/dist_ts_web/elements/domains/ops-view-domains.js +0 -456
- package/dist_ts_web/elements/domains/ops-view-providers.d.ts +0 -21
- package/dist_ts_web/elements/domains/ops-view-providers.js +0 -330
- package/dist_ts_web/elements/email/index.d.ts +0 -3
- package/dist_ts_web/elements/email/index.js +0 -4
- package/dist_ts_web/elements/email/ops-view-email-domains.d.ts +0 -19
- package/dist_ts_web/elements/email/ops-view-email-domains.js +0 -410
- package/dist_ts_web/elements/email/ops-view-email-security.d.ts +0 -14
- package/dist_ts_web/elements/email/ops-view-email-security.js +0 -178
- package/dist_ts_web/elements/email/ops-view-emails.d.ts +0 -21
- package/dist_ts_web/elements/email/ops-view-emails.js +0 -165
- package/dist_ts_web/elements/index.d.ts +0 -9
- package/dist_ts_web/elements/index.js +0 -10
- package/dist_ts_web/elements/network/index.d.ts +0 -7
- package/dist_ts_web/elements/network/index.js +0 -8
- package/dist_ts_web/elements/network/ops-view-network-activity.d.ts +0 -60
- package/dist_ts_web/elements/network/ops-view-network-activity.js +0 -753
- package/dist_ts_web/elements/network/ops-view-networktargets.d.ts +0 -17
- package/dist_ts_web/elements/network/ops-view-networktargets.js +0 -255
- package/dist_ts_web/elements/network/ops-view-remoteingress.d.ts +0 -20
- package/dist_ts_web/elements/network/ops-view-remoteingress.js +0 -497
- package/dist_ts_web/elements/network/ops-view-routes.d.ts +0 -16
- package/dist_ts_web/elements/network/ops-view-routes.js +0 -674
- package/dist_ts_web/elements/network/ops-view-sourceprofiles.d.ts +0 -17
- package/dist_ts_web/elements/network/ops-view-sourceprofiles.js +0 -278
- package/dist_ts_web/elements/network/ops-view-targetprofiles.d.ts +0 -21
- package/dist_ts_web/elements/network/ops-view-targetprofiles.js +0 -420
- package/dist_ts_web/elements/network/ops-view-vpn.d.ts +0 -31
- package/dist_ts_web/elements/network/ops-view-vpn.js +0 -873
- package/dist_ts_web/elements/ops-dashboard.d.ts +0 -31
- package/dist_ts_web/elements/ops-dashboard.js +0 -405
- package/dist_ts_web/elements/ops-view-logs.d.ts +0 -13
- package/dist_ts_web/elements/ops-view-logs.js +0 -159
- package/dist_ts_web/elements/overview/index.d.ts +0 -2
- package/dist_ts_web/elements/overview/index.js +0 -3
- package/dist_ts_web/elements/overview/ops-view-config.d.ts +0 -19
- package/dist_ts_web/elements/overview/ops-view-config.js +0 -339
- package/dist_ts_web/elements/overview/ops-view-overview.d.ts +0 -24
- package/dist_ts_web/elements/overview/ops-view-overview.js +0 -545
- package/dist_ts_web/elements/security/index.d.ts +0 -3
- package/dist_ts_web/elements/security/index.js +0 -4
- package/dist_ts_web/elements/security/ops-view-security-authentication.d.ts +0 -13
- package/dist_ts_web/elements/security/ops-view-security-authentication.js +0 -157
- package/dist_ts_web/elements/security/ops-view-security-blocked.d.ts +0 -15
- package/dist_ts_web/elements/security/ops-view-security-blocked.js +0 -153
- package/dist_ts_web/elements/security/ops-view-security-overview.d.ts +0 -16
- package/dist_ts_web/elements/security/ops-view-security-overview.js +0 -205
- package/dist_ts_web/elements/shared/css.d.ts +0 -1
- package/dist_ts_web/elements/shared/css.js +0 -10
- package/dist_ts_web/elements/shared/index.d.ts +0 -1
- package/dist_ts_web/elements/shared/index.js +0 -2
- package/dist_ts_web/index.d.ts +0 -1
- package/dist_ts_web/index.js +0 -10
- package/dist_ts_web/plugins.d.ts +0 -7
- package/dist_ts_web/plugins.js +0 -13
- package/dist_ts_web/router.d.ts +0 -21
- package/dist_ts_web/router.js +0 -151
|
@@ -1,574 +0,0 @@
|
|
|
1
|
-
import * as plugins from '../../plugins.js';
|
|
2
|
-
import * as interfaces from '../../../dist_ts_interfaces/index.js';
|
|
3
|
-
import { AcmeCertDoc, ProxyCertDoc } from '../../db/index.js';
|
|
4
|
-
import { logger } from '../../logger.js';
|
|
5
|
-
/**
|
|
6
|
-
* Mirrors `SmartacmeCertMatcher.getCertificateDomainNameByDomainName` from
|
|
7
|
-
* @push.rocks/smartacme. Inlined here because the original is `private` on
|
|
8
|
-
* SmartAcme. The cert identity ('task.vc' for both 'outline.task.vc' and
|
|
9
|
-
* '*.task.vc') is what AcmeCertDoc is keyed by, so two route domains with
|
|
10
|
-
* the same identity share the same underlying ACME cert.
|
|
11
|
-
*
|
|
12
|
-
* Returns undefined for domains with 4+ levels (matching smartacme's
|
|
13
|
-
* "deeper domains not supported" behavior) and for malformed inputs.
|
|
14
|
-
*
|
|
15
|
-
* Exported for unit testing.
|
|
16
|
-
*/
|
|
17
|
-
export function deriveCertDomainName(domain) {
|
|
18
|
-
if (domain.startsWith('*.')) {
|
|
19
|
-
return domain.slice(2);
|
|
20
|
-
}
|
|
21
|
-
const parts = domain.split('.');
|
|
22
|
-
if (parts.length < 2 || parts.length > 3)
|
|
23
|
-
return undefined;
|
|
24
|
-
return parts.slice(-2).join('.');
|
|
25
|
-
}
|
|
26
|
-
export class CertificateHandler {
|
|
27
|
-
opsServerRef;
|
|
28
|
-
constructor(opsServerRef) {
|
|
29
|
-
this.opsServerRef = opsServerRef;
|
|
30
|
-
this.registerHandlers();
|
|
31
|
-
}
|
|
32
|
-
registerHandlers() {
|
|
33
|
-
const viewRouter = this.opsServerRef.viewRouter;
|
|
34
|
-
const adminRouter = this.opsServerRef.adminRouter;
|
|
35
|
-
// ---- Read endpoints (viewRouter — valid identity required via middleware) ----
|
|
36
|
-
// Get Certificate Overview
|
|
37
|
-
viewRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getCertificateOverview', async (dataArg) => {
|
|
38
|
-
const certificates = await this.buildCertificateOverview();
|
|
39
|
-
const summary = this.buildSummary(certificates);
|
|
40
|
-
return { certificates, summary };
|
|
41
|
-
}));
|
|
42
|
-
// ---- Write endpoints (adminRouter — admin identity required via middleware) ----
|
|
43
|
-
// Legacy route-based reprovision (backward compat)
|
|
44
|
-
adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('reprovisionCertificate', async (dataArg) => {
|
|
45
|
-
return this.reprovisionCertificateByRoute(dataArg.routeName);
|
|
46
|
-
}));
|
|
47
|
-
// Domain-based reprovision (preferred)
|
|
48
|
-
adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('reprovisionCertificateDomain', async (dataArg) => {
|
|
49
|
-
return this.reprovisionCertificateDomain(dataArg.domain, dataArg.forceRenew);
|
|
50
|
-
}));
|
|
51
|
-
// Delete certificate
|
|
52
|
-
adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('deleteCertificate', async (dataArg) => {
|
|
53
|
-
return this.deleteCertificate(dataArg.domain);
|
|
54
|
-
}));
|
|
55
|
-
// Export certificate
|
|
56
|
-
adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('exportCertificate', async (dataArg) => {
|
|
57
|
-
return this.exportCertificate(dataArg.domain);
|
|
58
|
-
}));
|
|
59
|
-
// Import certificate
|
|
60
|
-
adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('importCertificate', async (dataArg) => {
|
|
61
|
-
return this.importCertificate(dataArg.cert);
|
|
62
|
-
}));
|
|
63
|
-
}
|
|
64
|
-
/**
|
|
65
|
-
* Build domain-centric certificate overview.
|
|
66
|
-
* Instead of one row per route, we produce one row per unique domain.
|
|
67
|
-
*/
|
|
68
|
-
async buildCertificateOverview() {
|
|
69
|
-
const dcRouter = this.opsServerRef.dcRouterRef;
|
|
70
|
-
const smartProxy = dcRouter.smartProxy;
|
|
71
|
-
if (!smartProxy)
|
|
72
|
-
return [];
|
|
73
|
-
const routes = smartProxy.routeManager.getRoutes();
|
|
74
|
-
// Phase 1: Collect unique domains with their associated route info
|
|
75
|
-
const domainMap = new Map();
|
|
76
|
-
for (const route of routes) {
|
|
77
|
-
if (!route.name)
|
|
78
|
-
continue;
|
|
79
|
-
const tls = route.action?.tls;
|
|
80
|
-
if (!tls)
|
|
81
|
-
continue;
|
|
82
|
-
// Skip passthrough routes - they don't manage certificates
|
|
83
|
-
if (tls.mode === 'passthrough')
|
|
84
|
-
continue;
|
|
85
|
-
const routeDomains = route.match.domains
|
|
86
|
-
? (Array.isArray(route.match.domains) ? route.match.domains : [route.match.domains])
|
|
87
|
-
: [];
|
|
88
|
-
// Determine source
|
|
89
|
-
let source = 'none';
|
|
90
|
-
if (tls.certificate === 'auto') {
|
|
91
|
-
if (smartProxy.settings.certProvisionFunction) {
|
|
92
|
-
source = 'provision-function';
|
|
93
|
-
}
|
|
94
|
-
else {
|
|
95
|
-
source = 'acme';
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
else if (tls.certificate && typeof tls.certificate === 'object') {
|
|
99
|
-
source = 'static';
|
|
100
|
-
}
|
|
101
|
-
const canReprovision = source === 'acme' || source === 'provision-function';
|
|
102
|
-
const tlsMode = tls.mode;
|
|
103
|
-
for (const domain of routeDomains) {
|
|
104
|
-
const existing = domainMap.get(domain);
|
|
105
|
-
if (existing) {
|
|
106
|
-
// Add this route name to the existing domain entry
|
|
107
|
-
if (!existing.routeNames.includes(route.name)) {
|
|
108
|
-
existing.routeNames.push(route.name);
|
|
109
|
-
}
|
|
110
|
-
// Upgrade source if more specific
|
|
111
|
-
if (existing.source === 'none' && source !== 'none') {
|
|
112
|
-
existing.source = source;
|
|
113
|
-
existing.canReprovision = canReprovision;
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
else {
|
|
117
|
-
domainMap.set(domain, {
|
|
118
|
-
routeNames: [route.name],
|
|
119
|
-
source,
|
|
120
|
-
tlsMode,
|
|
121
|
-
canReprovision,
|
|
122
|
-
});
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
// Phase 2: Resolve status for each unique domain
|
|
127
|
-
const certificates = [];
|
|
128
|
-
for (const [domain, info] of domainMap) {
|
|
129
|
-
let status = 'unknown';
|
|
130
|
-
let expiryDate;
|
|
131
|
-
let issuedAt;
|
|
132
|
-
let issuer;
|
|
133
|
-
let error;
|
|
134
|
-
// Check event-based status from certificateStatusMap (now keyed by domain)
|
|
135
|
-
const eventStatus = dcRouter.certificateStatusMap.get(domain);
|
|
136
|
-
if (eventStatus) {
|
|
137
|
-
status = eventStatus.status;
|
|
138
|
-
expiryDate = eventStatus.expiryDate;
|
|
139
|
-
issuedAt = eventStatus.issuedAt;
|
|
140
|
-
error = eventStatus.error;
|
|
141
|
-
if (eventStatus.source) {
|
|
142
|
-
issuer = eventStatus.source;
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
// Try SmartProxy certificate status if no event data
|
|
146
|
-
if (status === 'unknown' && info.routeNames.length > 0) {
|
|
147
|
-
try {
|
|
148
|
-
const rustStatus = await smartProxy.getCertificateStatus(info.routeNames[0]);
|
|
149
|
-
if (rustStatus) {
|
|
150
|
-
if (rustStatus.expiryDate)
|
|
151
|
-
expiryDate = rustStatus.expiryDate;
|
|
152
|
-
if (rustStatus.issuer)
|
|
153
|
-
issuer = rustStatus.issuer;
|
|
154
|
-
if (rustStatus.issuedAt)
|
|
155
|
-
issuedAt = rustStatus.issuedAt;
|
|
156
|
-
if (rustStatus.status === 'valid' || rustStatus.status === 'expired') {
|
|
157
|
-
status = rustStatus.status;
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
}
|
|
161
|
-
catch {
|
|
162
|
-
// Rust bridge may not support this command yet — ignore
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
// Check persisted cert data from smartdata document classes
|
|
166
|
-
if (status === 'unknown') {
|
|
167
|
-
const cleanDomain = domain.replace(/^\*\.?/, '');
|
|
168
|
-
// SmartAcme stores certs under the base domain (e.g. example.com for api.example.com)
|
|
169
|
-
const parts = cleanDomain.split('.');
|
|
170
|
-
const baseDomain = parts.length > 2 ? parts.slice(-2).join('.') : cleanDomain;
|
|
171
|
-
const acmeDoc = await AcmeCertDoc.findByDomain(baseDomain)
|
|
172
|
-
|| (baseDomain !== cleanDomain ? await AcmeCertDoc.findByDomain(cleanDomain) : null);
|
|
173
|
-
const proxyDoc = !acmeDoc ? await ProxyCertDoc.findByDomain(domain) : null;
|
|
174
|
-
if (acmeDoc?.validUntil) {
|
|
175
|
-
expiryDate = new Date(acmeDoc.validUntil).toISOString();
|
|
176
|
-
if (acmeDoc.created) {
|
|
177
|
-
issuedAt = new Date(acmeDoc.created).toISOString();
|
|
178
|
-
}
|
|
179
|
-
issuer = 'smartacme-dns-01';
|
|
180
|
-
}
|
|
181
|
-
else if (proxyDoc?.publicKey) {
|
|
182
|
-
// certStore has the cert — parse PEM for expiry
|
|
183
|
-
try {
|
|
184
|
-
const x509 = new plugins.crypto.X509Certificate(proxyDoc.publicKey);
|
|
185
|
-
expiryDate = new Date(x509.validTo).toISOString();
|
|
186
|
-
issuedAt = new Date(x509.validFrom).toISOString();
|
|
187
|
-
}
|
|
188
|
-
catch { /* PEM parsing failed */ }
|
|
189
|
-
status = 'valid';
|
|
190
|
-
issuer = 'cert-store';
|
|
191
|
-
}
|
|
192
|
-
else if (acmeDoc || proxyDoc) {
|
|
193
|
-
status = 'valid';
|
|
194
|
-
issuer = 'cert-store';
|
|
195
|
-
}
|
|
196
|
-
}
|
|
197
|
-
// Compute status from expiry date
|
|
198
|
-
if (expiryDate && (status === 'valid' || status === 'unknown')) {
|
|
199
|
-
const expiry = new Date(expiryDate);
|
|
200
|
-
const now = new Date();
|
|
201
|
-
const daysUntilExpiry = (expiry.getTime() - now.getTime()) / (1000 * 60 * 60 * 24);
|
|
202
|
-
if (daysUntilExpiry < 0) {
|
|
203
|
-
status = 'expired';
|
|
204
|
-
}
|
|
205
|
-
else if (daysUntilExpiry < 30) {
|
|
206
|
-
status = 'expiring';
|
|
207
|
-
}
|
|
208
|
-
else {
|
|
209
|
-
status = 'valid';
|
|
210
|
-
}
|
|
211
|
-
}
|
|
212
|
-
// Static certs with no other info default to 'valid'
|
|
213
|
-
if (info.source === 'static' && status === 'unknown') {
|
|
214
|
-
status = 'valid';
|
|
215
|
-
}
|
|
216
|
-
// ACME/provision-function routes with no cert data are still provisioning
|
|
217
|
-
if (status === 'unknown' && (info.source === 'acme' || info.source === 'provision-function')) {
|
|
218
|
-
status = 'provisioning';
|
|
219
|
-
}
|
|
220
|
-
// Phase 3: Attach backoff info
|
|
221
|
-
let backoffInfo;
|
|
222
|
-
if (dcRouter.certProvisionScheduler) {
|
|
223
|
-
const bi = await dcRouter.certProvisionScheduler.getBackoffInfo(domain);
|
|
224
|
-
if (bi) {
|
|
225
|
-
backoffInfo = bi;
|
|
226
|
-
}
|
|
227
|
-
}
|
|
228
|
-
certificates.push({
|
|
229
|
-
domain,
|
|
230
|
-
routeNames: info.routeNames,
|
|
231
|
-
status,
|
|
232
|
-
source: info.source,
|
|
233
|
-
tlsMode: info.tlsMode,
|
|
234
|
-
expiryDate,
|
|
235
|
-
issuer,
|
|
236
|
-
issuedAt,
|
|
237
|
-
error,
|
|
238
|
-
canReprovision: info.canReprovision,
|
|
239
|
-
backoffInfo,
|
|
240
|
-
});
|
|
241
|
-
}
|
|
242
|
-
return certificates;
|
|
243
|
-
}
|
|
244
|
-
buildSummary(certificates) {
|
|
245
|
-
const summary = { total: 0, valid: 0, expiring: 0, expired: 0, failed: 0, unknown: 0 };
|
|
246
|
-
summary.total = certificates.length;
|
|
247
|
-
for (const cert of certificates) {
|
|
248
|
-
switch (cert.status) {
|
|
249
|
-
case 'valid':
|
|
250
|
-
summary.valid++;
|
|
251
|
-
break;
|
|
252
|
-
case 'expiring':
|
|
253
|
-
summary.expiring++;
|
|
254
|
-
break;
|
|
255
|
-
case 'expired':
|
|
256
|
-
summary.expired++;
|
|
257
|
-
break;
|
|
258
|
-
case 'failed':
|
|
259
|
-
summary.failed++;
|
|
260
|
-
break;
|
|
261
|
-
case 'provisioning': // count as unknown
|
|
262
|
-
case 'unknown':
|
|
263
|
-
summary.unknown++;
|
|
264
|
-
break;
|
|
265
|
-
}
|
|
266
|
-
}
|
|
267
|
-
return summary;
|
|
268
|
-
}
|
|
269
|
-
/**
|
|
270
|
-
* Legacy route-based reprovisioning. Kept for backward compatibility with
|
|
271
|
-
* older clients that send `reprovisionCertificate` typed-requests.
|
|
272
|
-
*
|
|
273
|
-
* Like reprovisionCertificateDomain, this triggers the full route apply
|
|
274
|
-
* pipeline rather than smartProxy.provisionCertificate(routeName) — which
|
|
275
|
-
* is a no-op when certProvisionFunction is set (Rust ACME disabled).
|
|
276
|
-
*/
|
|
277
|
-
async reprovisionCertificateByRoute(routeName) {
|
|
278
|
-
const dcRouter = this.opsServerRef.dcRouterRef;
|
|
279
|
-
const smartProxy = dcRouter.smartProxy;
|
|
280
|
-
if (!smartProxy) {
|
|
281
|
-
return { success: false, message: 'SmartProxy is not running' };
|
|
282
|
-
}
|
|
283
|
-
// Clear event-based status for domains in this route so the
|
|
284
|
-
// certificate-issued event can refresh them
|
|
285
|
-
for (const [domain, entry] of dcRouter.certificateStatusMap) {
|
|
286
|
-
if (entry.routeNames.includes(routeName)) {
|
|
287
|
-
dcRouter.certificateStatusMap.delete(domain);
|
|
288
|
-
}
|
|
289
|
-
}
|
|
290
|
-
try {
|
|
291
|
-
if (dcRouter.routeConfigManager) {
|
|
292
|
-
await dcRouter.routeConfigManager.applyRoutes();
|
|
293
|
-
}
|
|
294
|
-
else {
|
|
295
|
-
await smartProxy.updateRoutes(smartProxy.routeManager.getRoutes());
|
|
296
|
-
}
|
|
297
|
-
return { success: true, message: `Certificate reprovisioning triggered for route '${routeName}'` };
|
|
298
|
-
}
|
|
299
|
-
catch (err) {
|
|
300
|
-
return { success: false, message: err.message || 'Failed to reprovision certificate' };
|
|
301
|
-
}
|
|
302
|
-
}
|
|
303
|
-
/**
|
|
304
|
-
* Domain-based reprovisioning — clears backoff first, refreshes the smartacme
|
|
305
|
-
* cert (when forceRenew is set), then re-applies routes so the running Rust
|
|
306
|
-
* proxy actually picks up the new cert.
|
|
307
|
-
*
|
|
308
|
-
* Why applyRoutes (not smartProxy.provisionCertificate)?
|
|
309
|
-
* smartProxy.provisionCertificate(routeName) routes through the Rust ACME
|
|
310
|
-
* path, which is forcibly disabled whenever certProvisionFunction is set
|
|
311
|
-
* (smart-proxy.ts:168-171). The only path that re-invokes
|
|
312
|
-
* certProvisionFunction → bridge.loadCertificate is updateRoutes(), which
|
|
313
|
-
* we trigger via routeConfigManager.applyRoutes().
|
|
314
|
-
*/
|
|
315
|
-
async reprovisionCertificateDomain(domain, forceRenew) {
|
|
316
|
-
const dcRouter = this.opsServerRef.dcRouterRef;
|
|
317
|
-
const smartProxy = dcRouter.smartProxy;
|
|
318
|
-
if (!smartProxy) {
|
|
319
|
-
return { success: false, message: 'SmartProxy is not running' };
|
|
320
|
-
}
|
|
321
|
-
// Clear backoff for this domain (user override)
|
|
322
|
-
if (dcRouter.certProvisionScheduler) {
|
|
323
|
-
await dcRouter.certProvisionScheduler.clearBackoff(domain);
|
|
324
|
-
}
|
|
325
|
-
// Find routes matching this domain — fail early if none exist
|
|
326
|
-
const routeNames = dcRouter.findRouteNamesForDomain(domain);
|
|
327
|
-
if (routeNames.length === 0) {
|
|
328
|
-
return { success: false, message: `No routes found for domain '${domain}'` };
|
|
329
|
-
}
|
|
330
|
-
// If forceRenew, order a fresh cert from ACME now so it's already in
|
|
331
|
-
// AcmeCertDoc by the time certProvisionFunction is invoked below.
|
|
332
|
-
//
|
|
333
|
-
// includeWildcard: when forcing a non-wildcard subdomain renewal, we still
|
|
334
|
-
// want the wildcard SAN in the order so the new cert keeps covering every
|
|
335
|
-
// sibling. Without this, smartacme defaults to includeWildcard: false and
|
|
336
|
-
// the re-issued cert would have only the base domain as SAN, breaking every
|
|
337
|
-
// sibling subdomain that was previously covered by the same wildcard cert.
|
|
338
|
-
if (forceRenew && dcRouter.smartAcme) {
|
|
339
|
-
let newCert;
|
|
340
|
-
try {
|
|
341
|
-
newCert = await dcRouter.smartAcme.getCertificateForDomain(domain, {
|
|
342
|
-
forceRenew: true,
|
|
343
|
-
includeWildcard: !domain.startsWith('*.'),
|
|
344
|
-
});
|
|
345
|
-
}
|
|
346
|
-
catch (err) {
|
|
347
|
-
return { success: false, message: `Failed to renew certificate for ${domain}: ${err.message}` };
|
|
348
|
-
}
|
|
349
|
-
// Propagate the freshly-issued cert PEM to every sibling route domain that
|
|
350
|
-
// shares the same cert identity. Without this, the rust hot-swap (keyed by
|
|
351
|
-
// exact domain in `loaded_certs`) only fires for the clicked route via the
|
|
352
|
-
// fire-and-forget cert provisioning path, leaving siblings serving the
|
|
353
|
-
// stale in-memory cert until the next background reload completes.
|
|
354
|
-
try {
|
|
355
|
-
await this.propagateCertToSiblings(domain, newCert);
|
|
356
|
-
}
|
|
357
|
-
catch (err) {
|
|
358
|
-
// Best-effort: failure here doesn't undo the cert issuance, just log.
|
|
359
|
-
logger.log('warn', `Failed to propagate force-renewed cert to siblings of ${domain}: ${err.message}`);
|
|
360
|
-
}
|
|
361
|
-
}
|
|
362
|
-
// Clear status map entry so it gets refreshed by the certificate-issued event
|
|
363
|
-
dcRouter.certificateStatusMap.delete(domain);
|
|
364
|
-
// Trigger the full route apply pipeline:
|
|
365
|
-
// applyRoutes → updateRoutes → provisionCertificatesViaCallback →
|
|
366
|
-
// certProvisionFunction(domain) → smartAcme.getCertificateForDomain →
|
|
367
|
-
// bridge.loadCertificate → Rust hot-swaps `loaded_certs` →
|
|
368
|
-
// certificate-issued event → certificateStatusMap updated
|
|
369
|
-
try {
|
|
370
|
-
if (dcRouter.routeConfigManager) {
|
|
371
|
-
await dcRouter.routeConfigManager.applyRoutes();
|
|
372
|
-
}
|
|
373
|
-
else {
|
|
374
|
-
// Fallback when DB is disabled and there is no RouteConfigManager
|
|
375
|
-
await smartProxy.updateRoutes(smartProxy.routeManager.getRoutes());
|
|
376
|
-
}
|
|
377
|
-
return { success: true, message: forceRenew ? `Certificate force-renewed for domain '${domain}'` : `Certificate reprovisioning triggered for domain '${domain}'` };
|
|
378
|
-
}
|
|
379
|
-
catch (err) {
|
|
380
|
-
return { success: false, message: err.message || `Failed to reprovision certificate for ${domain}` };
|
|
381
|
-
}
|
|
382
|
-
}
|
|
383
|
-
/**
|
|
384
|
-
* After a force-renew, walk every route in the smartproxy that resolves to
|
|
385
|
-
* the same cert identity as `forcedDomain` and write the freshly-issued cert
|
|
386
|
-
* PEM into ProxyCertDoc for each. This guarantees that the next applyRoutes
|
|
387
|
-
* → provisionCertificatesViaCallback iteration will hot-swap every sibling's
|
|
388
|
-
* rust loaded_certs entry with the new (correct) PEM, rather than relying on
|
|
389
|
-
* the in-memory cert returned by smartacme's per-domain cache.
|
|
390
|
-
*
|
|
391
|
-
* Why this is necessary:
|
|
392
|
-
* Rust's `loaded_certs` is a HashMap<domain, TlsCertConfig>. Each
|
|
393
|
-
* bridge.loadCertificate(domain, ...) only swaps that one entry. The
|
|
394
|
-
* fire-and-forget cert provisioning path triggered by updateRoutes does
|
|
395
|
-
* eventually iterate every auto-cert route, but it returns the cached
|
|
396
|
-
* (broken pre-fix) cert from smartacme's per-domain mutex. With this
|
|
397
|
-
* helper, ProxyCertDoc is updated synchronously to the correct PEM before
|
|
398
|
-
* applyRoutes runs, so even the transient window stays consistent.
|
|
399
|
-
*/
|
|
400
|
-
async propagateCertToSiblings(forcedDomain, newCert) {
|
|
401
|
-
const dcRouter = this.opsServerRef.dcRouterRef;
|
|
402
|
-
const smartProxy = dcRouter.smartProxy;
|
|
403
|
-
if (!smartProxy)
|
|
404
|
-
return;
|
|
405
|
-
const certIdentity = deriveCertDomainName(forcedDomain);
|
|
406
|
-
if (!certIdentity)
|
|
407
|
-
return;
|
|
408
|
-
// Collect every route domain whose cert identity matches.
|
|
409
|
-
const affected = new Set();
|
|
410
|
-
for (const route of smartProxy.routeManager.getRoutes()) {
|
|
411
|
-
if (!route.match.domains)
|
|
412
|
-
continue;
|
|
413
|
-
const routeDomains = Array.isArray(route.match.domains)
|
|
414
|
-
? route.match.domains
|
|
415
|
-
: [route.match.domains];
|
|
416
|
-
for (const routeDomain of routeDomains) {
|
|
417
|
-
if (deriveCertDomainName(routeDomain) === certIdentity) {
|
|
418
|
-
affected.add(routeDomain);
|
|
419
|
-
}
|
|
420
|
-
}
|
|
421
|
-
}
|
|
422
|
-
if (affected.size === 0)
|
|
423
|
-
return;
|
|
424
|
-
// Parse expiry from PEM (defense-in-depth — same pattern as
|
|
425
|
-
// ts/classes.dcrouter.ts:988-995 and the existing certStore.save callback).
|
|
426
|
-
let validUntil = newCert.validUntil;
|
|
427
|
-
let validFrom;
|
|
428
|
-
if (newCert.publicKey) {
|
|
429
|
-
try {
|
|
430
|
-
const x509 = new plugins.crypto.X509Certificate(newCert.publicKey);
|
|
431
|
-
validUntil = new Date(x509.validTo).getTime();
|
|
432
|
-
validFrom = new Date(x509.validFrom).getTime();
|
|
433
|
-
}
|
|
434
|
-
catch { /* fall back to smartacme's value */ }
|
|
435
|
-
}
|
|
436
|
-
// Persist new cert PEM under each affected route domain
|
|
437
|
-
for (const routeDomain of affected) {
|
|
438
|
-
let doc = await ProxyCertDoc.findByDomain(routeDomain);
|
|
439
|
-
if (!doc) {
|
|
440
|
-
doc = new ProxyCertDoc();
|
|
441
|
-
doc.domain = routeDomain;
|
|
442
|
-
}
|
|
443
|
-
doc.publicKey = newCert.publicKey;
|
|
444
|
-
doc.privateKey = newCert.privateKey;
|
|
445
|
-
doc.ca = '';
|
|
446
|
-
doc.validUntil = validUntil || 0;
|
|
447
|
-
doc.validFrom = validFrom || 0;
|
|
448
|
-
await doc.save();
|
|
449
|
-
// Clear status so the next event refresh shows the new cert
|
|
450
|
-
dcRouter.certificateStatusMap.delete(routeDomain);
|
|
451
|
-
}
|
|
452
|
-
logger.log('info', `Propagated force-renewed cert for ${forcedDomain} (cert identity '${certIdentity}') to ${affected.size} sibling route domain(s): ${[...affected].join(', ')}`);
|
|
453
|
-
}
|
|
454
|
-
/**
|
|
455
|
-
* Delete certificate data for a domain from storage
|
|
456
|
-
*/
|
|
457
|
-
async deleteCertificate(domain) {
|
|
458
|
-
const dcRouter = this.opsServerRef.dcRouterRef;
|
|
459
|
-
const cleanDomain = domain.replace(/^\*\.?/, '');
|
|
460
|
-
const parts = cleanDomain.split('.');
|
|
461
|
-
const baseDomain = parts.length > 2 ? parts.slice(-2).join('.') : cleanDomain;
|
|
462
|
-
// Delete from smartdata document classes (try base domain first, then exact)
|
|
463
|
-
const acmeDoc = await AcmeCertDoc.findByDomain(baseDomain)
|
|
464
|
-
|| (baseDomain !== cleanDomain ? await AcmeCertDoc.findByDomain(cleanDomain) : null);
|
|
465
|
-
if (acmeDoc) {
|
|
466
|
-
await acmeDoc.delete();
|
|
467
|
-
}
|
|
468
|
-
// Try both original domain and clean domain for proxy certs
|
|
469
|
-
for (const d of [domain, cleanDomain]) {
|
|
470
|
-
const proxyDoc = await ProxyCertDoc.findByDomain(d);
|
|
471
|
-
if (proxyDoc) {
|
|
472
|
-
await proxyDoc.delete();
|
|
473
|
-
}
|
|
474
|
-
}
|
|
475
|
-
// Clear from in-memory status map
|
|
476
|
-
dcRouter.certificateStatusMap.delete(domain);
|
|
477
|
-
// Clear backoff info
|
|
478
|
-
if (dcRouter.certProvisionScheduler) {
|
|
479
|
-
await dcRouter.certProvisionScheduler.clearBackoff(domain);
|
|
480
|
-
}
|
|
481
|
-
return { success: true, message: `Certificate data deleted for '${domain}'` };
|
|
482
|
-
}
|
|
483
|
-
/**
|
|
484
|
-
* Export certificate data for a domain as ICert-shaped JSON
|
|
485
|
-
*/
|
|
486
|
-
async exportCertificate(domain) {
|
|
487
|
-
const cleanDomain = domain.replace(/^\*\.?/, '');
|
|
488
|
-
// Try AcmeCertDoc first (has full ICert fields)
|
|
489
|
-
const acmeDoc = await AcmeCertDoc.findByDomain(cleanDomain);
|
|
490
|
-
if (acmeDoc && acmeDoc.publicKey && acmeDoc.privateKey) {
|
|
491
|
-
return {
|
|
492
|
-
success: true,
|
|
493
|
-
cert: {
|
|
494
|
-
id: acmeDoc.id || plugins.crypto.randomUUID(),
|
|
495
|
-
domainName: acmeDoc.domainName || domain,
|
|
496
|
-
created: acmeDoc.created || Date.now(),
|
|
497
|
-
validUntil: acmeDoc.validUntil || 0,
|
|
498
|
-
privateKey: acmeDoc.privateKey,
|
|
499
|
-
publicKey: acmeDoc.publicKey,
|
|
500
|
-
csr: acmeDoc.csr || '',
|
|
501
|
-
},
|
|
502
|
-
};
|
|
503
|
-
}
|
|
504
|
-
// Fallback: try ProxyCertDoc with original domain, then clean domain
|
|
505
|
-
let proxyDoc = await ProxyCertDoc.findByDomain(domain);
|
|
506
|
-
if (!proxyDoc || !proxyDoc.publicKey) {
|
|
507
|
-
proxyDoc = await ProxyCertDoc.findByDomain(cleanDomain);
|
|
508
|
-
}
|
|
509
|
-
if (proxyDoc && proxyDoc.publicKey && proxyDoc.privateKey) {
|
|
510
|
-
return {
|
|
511
|
-
success: true,
|
|
512
|
-
cert: {
|
|
513
|
-
id: plugins.crypto.randomUUID(),
|
|
514
|
-
domainName: domain,
|
|
515
|
-
created: proxyDoc.validFrom || Date.now(),
|
|
516
|
-
validUntil: proxyDoc.validUntil || 0,
|
|
517
|
-
privateKey: proxyDoc.privateKey,
|
|
518
|
-
publicKey: proxyDoc.publicKey,
|
|
519
|
-
csr: '',
|
|
520
|
-
},
|
|
521
|
-
};
|
|
522
|
-
}
|
|
523
|
-
return { success: false, message: `No certificate data found for '${domain}'` };
|
|
524
|
-
}
|
|
525
|
-
/**
|
|
526
|
-
* Import a certificate from ICert-shaped JSON
|
|
527
|
-
*/
|
|
528
|
-
async importCertificate(cert) {
|
|
529
|
-
// Validate PEM content
|
|
530
|
-
if (!cert.publicKey || !cert.publicKey.includes('-----BEGIN CERTIFICATE-----')) {
|
|
531
|
-
return { success: false, message: 'Invalid publicKey: must contain a PEM-encoded certificate' };
|
|
532
|
-
}
|
|
533
|
-
if (!cert.privateKey || !cert.privateKey.includes('-----BEGIN')) {
|
|
534
|
-
return { success: false, message: 'Invalid privateKey: must contain a PEM-encoded key' };
|
|
535
|
-
}
|
|
536
|
-
const dcRouter = this.opsServerRef.dcRouterRef;
|
|
537
|
-
const cleanDomain = cert.domainName.replace(/^\*\.?/, '');
|
|
538
|
-
// Save to AcmeCertDoc (SmartAcme-compatible)
|
|
539
|
-
let acmeDoc = await AcmeCertDoc.findByDomain(cleanDomain);
|
|
540
|
-
if (!acmeDoc) {
|
|
541
|
-
acmeDoc = new AcmeCertDoc();
|
|
542
|
-
acmeDoc.domainName = cleanDomain;
|
|
543
|
-
}
|
|
544
|
-
acmeDoc.id = cert.id;
|
|
545
|
-
acmeDoc.created = cert.created;
|
|
546
|
-
acmeDoc.validUntil = cert.validUntil;
|
|
547
|
-
acmeDoc.privateKey = cert.privateKey;
|
|
548
|
-
acmeDoc.publicKey = cert.publicKey;
|
|
549
|
-
acmeDoc.csr = cert.csr || '';
|
|
550
|
-
await acmeDoc.save();
|
|
551
|
-
// Also save to ProxyCertDoc (proxy-cert format)
|
|
552
|
-
let proxyDoc = await ProxyCertDoc.findByDomain(cert.domainName);
|
|
553
|
-
if (!proxyDoc) {
|
|
554
|
-
proxyDoc = new ProxyCertDoc();
|
|
555
|
-
proxyDoc.domain = cert.domainName;
|
|
556
|
-
}
|
|
557
|
-
proxyDoc.publicKey = cert.publicKey;
|
|
558
|
-
proxyDoc.privateKey = cert.privateKey;
|
|
559
|
-
proxyDoc.ca = '';
|
|
560
|
-
proxyDoc.validUntil = cert.validUntil;
|
|
561
|
-
proxyDoc.validFrom = cert.created;
|
|
562
|
-
await proxyDoc.save();
|
|
563
|
-
// Update in-memory status map
|
|
564
|
-
dcRouter.certificateStatusMap.set(cert.domainName, {
|
|
565
|
-
status: 'valid',
|
|
566
|
-
source: 'static',
|
|
567
|
-
expiryDate: cert.validUntil ? new Date(cert.validUntil).toISOString() : undefined,
|
|
568
|
-
issuedAt: cert.created ? new Date(cert.created).toISOString() : undefined,
|
|
569
|
-
routeNames: [],
|
|
570
|
-
});
|
|
571
|
-
return { success: true, message: `Certificate imported for '${cert.domainName}'` };
|
|
572
|
-
}
|
|
573
|
-
}
|
|
574
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"certificate.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/certificate.handler.ts"],"names":[],"mappings":"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"}
|