BREAKING CHANGE(smartproxy/configuration): Migrate SmartProxy to a fully unified route‐based configuration by removing legacy domain-based settings and conversion code. CertProvisioner, NetworkProxyBridge, and RouteManager now use IRouteConfig exclusively, and related legacy interfaces and files have been removed.
This commit is contained in:
@@ -2,6 +2,7 @@ import { tap, expect } from '@push.rocks/tapbundle';
|
||||
import * as plugins from '../ts/plugins.js';
|
||||
import { CertProvisioner } from '../ts/certificate/providers/cert-provisioner.js';
|
||||
import type { IDomainConfig } from '../ts/forwarding/config/domain-config.js';
|
||||
import type { IRouteConfig } from '../ts/proxies/smart-proxy/models/route-types.js';
|
||||
import type { ICertificateData } from '../ts/certificate/models/certificate-types.js';
|
||||
// Import SmartProxyCertProvisionObject type alias
|
||||
import type { TSmartProxyCertProvisionObject } from '../ts/certificate/providers/cert-provisioner.js';
|
||||
@@ -28,11 +29,19 @@ class FakeNetworkProxyBridge {
|
||||
|
||||
tap.test('CertProvisioner handles static provisioning', async () => {
|
||||
const domain = 'static.com';
|
||||
const domainConfigs: IDomainConfig[] = [{
|
||||
domains: [domain],
|
||||
forwarding: {
|
||||
type: 'https-terminate-to-https',
|
||||
target: { host: 'localhost', port: 443 }
|
||||
// Create route-based configuration for testing
|
||||
const routeConfigs: IRouteConfig[] = [{
|
||||
match: {
|
||||
ports: 443,
|
||||
domains: [domain]
|
||||
},
|
||||
action: {
|
||||
type: 'forward',
|
||||
target: { host: 'localhost', port: 443 },
|
||||
tls: {
|
||||
mode: 'terminate-and-reencrypt',
|
||||
certificate: 'auto'
|
||||
}
|
||||
}
|
||||
}];
|
||||
const fakePort80 = new FakePort80Handler();
|
||||
@@ -51,7 +60,7 @@ tap.test('CertProvisioner handles static provisioning', async () => {
|
||||
};
|
||||
};
|
||||
const prov = new CertProvisioner(
|
||||
domainConfigs,
|
||||
routeConfigs,
|
||||
fakePort80 as any,
|
||||
fakeBridge as any,
|
||||
certProvider,
|
||||
@@ -76,11 +85,19 @@ tap.test('CertProvisioner handles static provisioning', async () => {
|
||||
|
||||
tap.test('CertProvisioner handles http01 provisioning', async () => {
|
||||
const domain = 'http01.com';
|
||||
const domainConfigs: IDomainConfig[] = [{
|
||||
domains: [domain],
|
||||
forwarding: {
|
||||
type: 'https-terminate-to-http',
|
||||
target: { host: 'localhost', port: 80 }
|
||||
// Create route-based configuration for testing
|
||||
const routeConfigs: IRouteConfig[] = [{
|
||||
match: {
|
||||
ports: 443,
|
||||
domains: [domain]
|
||||
},
|
||||
action: {
|
||||
type: 'forward',
|
||||
target: { host: 'localhost', port: 80 },
|
||||
tls: {
|
||||
mode: 'terminate',
|
||||
certificate: 'auto'
|
||||
}
|
||||
}
|
||||
}];
|
||||
const fakePort80 = new FakePort80Handler();
|
||||
@@ -88,7 +105,7 @@ tap.test('CertProvisioner handles http01 provisioning', async () => {
|
||||
// certProvider returns http01 directive
|
||||
const certProvider = async (): Promise<TSmartProxyCertProvisionObject> => 'http01';
|
||||
const prov = new CertProvisioner(
|
||||
domainConfigs,
|
||||
routeConfigs,
|
||||
fakePort80 as any,
|
||||
fakeBridge as any,
|
||||
certProvider,
|
||||
@@ -107,18 +124,26 @@ tap.test('CertProvisioner handles http01 provisioning', async () => {
|
||||
|
||||
tap.test('CertProvisioner on-demand http01 renewal', async () => {
|
||||
const domain = 'renew.com';
|
||||
const domainConfigs: IDomainConfig[] = [{
|
||||
domains: [domain],
|
||||
forwarding: {
|
||||
type: 'https-terminate-to-http',
|
||||
target: { host: 'localhost', port: 80 }
|
||||
// Create route-based configuration for testing
|
||||
const routeConfigs: IRouteConfig[] = [{
|
||||
match: {
|
||||
ports: 443,
|
||||
domains: [domain]
|
||||
},
|
||||
action: {
|
||||
type: 'forward',
|
||||
target: { host: 'localhost', port: 80 },
|
||||
tls: {
|
||||
mode: 'terminate',
|
||||
certificate: 'auto'
|
||||
}
|
||||
}
|
||||
}];
|
||||
const fakePort80 = new FakePort80Handler();
|
||||
const fakeBridge = new FakeNetworkProxyBridge();
|
||||
const certProvider = async (): Promise<TSmartProxyCertProvisionObject> => 'http01';
|
||||
const prov = new CertProvisioner(
|
||||
domainConfigs,
|
||||
routeConfigs,
|
||||
fakePort80 as any,
|
||||
fakeBridge as any,
|
||||
certProvider,
|
||||
@@ -133,11 +158,19 @@ tap.test('CertProvisioner on-demand http01 renewal', async () => {
|
||||
|
||||
tap.test('CertProvisioner on-demand static provisioning', async () => {
|
||||
const domain = 'ondemand.com';
|
||||
const domainConfigs: IDomainConfig[] = [{
|
||||
domains: [domain],
|
||||
forwarding: {
|
||||
type: 'https-terminate-to-https',
|
||||
target: { host: 'localhost', port: 443 }
|
||||
// Create route-based configuration for testing
|
||||
const routeConfigs: IRouteConfig[] = [{
|
||||
match: {
|
||||
ports: 443,
|
||||
domains: [domain]
|
||||
},
|
||||
action: {
|
||||
type: 'forward',
|
||||
target: { host: 'localhost', port: 443 },
|
||||
tls: {
|
||||
mode: 'terminate-and-reencrypt',
|
||||
certificate: 'auto'
|
||||
}
|
||||
}
|
||||
}];
|
||||
const fakePort80 = new FakePort80Handler();
|
||||
@@ -152,7 +185,7 @@ tap.test('CertProvisioner on-demand static provisioning', async () => {
|
||||
id: 'ID',
|
||||
});
|
||||
const prov = new CertProvisioner(
|
||||
domainConfigs,
|
||||
routeConfigs,
|
||||
fakePort80 as any,
|
||||
fakeBridge as any,
|
||||
certProvider,
|
||||
|
||||
Reference in New Issue
Block a user