mirror of
https://github.com/fosrl/pangolin.git
synced 2026-07-28 16:25:20 +02:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0da96b06ea | |||
| 71f45b8a80 | |||
| ecf008a8d9 | |||
| 19c1c2042b | |||
| 56fcb80b23 |
@@ -62,7 +62,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
|
||||||
- name: Monitor storage space
|
- name: Monitor storage space
|
||||||
run: |
|
run: |
|
||||||
@@ -77,7 +77,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Log in to Docker Hub
|
- name: Log in to Docker Hub
|
||||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
|
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
|
||||||
with:
|
with:
|
||||||
registry: docker.io
|
registry: docker.io
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||||
@@ -134,7 +134,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
|
||||||
- name: Monitor storage space
|
- name: Monitor storage space
|
||||||
run: |
|
run: |
|
||||||
@@ -149,7 +149,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Log in to Docker Hub
|
- name: Log in to Docker Hub
|
||||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
|
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
|
||||||
with:
|
with:
|
||||||
registry: docker.io
|
registry: docker.io
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||||
@@ -201,10 +201,10 @@ jobs:
|
|||||||
timeout-minutes: 30
|
timeout-minutes: 30
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
|
||||||
- name: Log in to Docker Hub
|
- name: Log in to Docker Hub
|
||||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
|
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
|
||||||
with:
|
with:
|
||||||
registry: docker.io
|
registry: docker.io
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||||
@@ -256,7 +256,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
|
||||||
- name: Extract tag name
|
- name: Extract tag name
|
||||||
id: get-tag
|
id: get-tag
|
||||||
@@ -264,7 +264,7 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Install Go
|
- name: Install Go
|
||||||
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
|
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
|
||||||
with:
|
with:
|
||||||
go-version: 1.25
|
go-version: 1.25
|
||||||
|
|
||||||
@@ -407,7 +407,7 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry (for cosign)
|
- name: Login to GitHub Container Registry (for cosign)
|
||||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
|
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
|
|||||||
@@ -21,10 +21,10 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
|
||||||
- name: Set up Node.js
|
- name: Set up Node.js
|
||||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
|
||||||
with:
|
with:
|
||||||
node-version: '24'
|
node-version: '24'
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ jobs:
|
|||||||
stale:
|
stale:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
|
- uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
|
||||||
with:
|
with:
|
||||||
days-before-stale: 14
|
days-before-stale: 14
|
||||||
days-before-close: 14
|
days-before-close: 14
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
|
||||||
- name: Install Node
|
- name: Install Node
|
||||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
|
||||||
with:
|
with:
|
||||||
node-version: '24'
|
node-version: '24'
|
||||||
|
|
||||||
@@ -62,7 +62,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
|
||||||
- name: Build Docker image sqlite
|
- name: Build Docker image sqlite
|
||||||
run: make dev-build-sqlite
|
run: make dev-build-sqlite
|
||||||
@@ -71,7 +71,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
|
||||||
- name: Build Docker image pg
|
- name: Build Docker image pg
|
||||||
run: make dev-build-pg
|
run: make dev-build-pg
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ export async function getValidCertificatesForDomains(
|
|||||||
Array<{
|
Array<{
|
||||||
id: number;
|
id: number;
|
||||||
domain: string;
|
domain: string;
|
||||||
|
queriedDomain: string;
|
||||||
wildcard: boolean | null;
|
wildcard: boolean | null;
|
||||||
certFile: string | null;
|
certFile: string | null;
|
||||||
keyFile: string | null;
|
keyFile: string | null;
|
||||||
|
|||||||
@@ -18,3 +18,19 @@ export function canCompress(
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Whether this newt client understands `tlsCertId` references into the
|
||||||
|
// sync message's `certs` array, instead of requiring each target to carry
|
||||||
|
// its own inline `tlsCert`/`tlsKey` PEM data. Bump the version floor here to
|
||||||
|
// match whatever release first ships the newt-side support.
|
||||||
|
export function supportsCertReferences(
|
||||||
|
clientVersion: string | null | undefined
|
||||||
|
): boolean {
|
||||||
|
try {
|
||||||
|
if (!clientVersion) return false;
|
||||||
|
if (!semver.valid(clientVersion)) return false;
|
||||||
|
return semver.gte(clientVersion, "1.16.0");
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+111
-13
@@ -5,6 +5,7 @@ import config from "@server/lib/config";
|
|||||||
import z from "zod";
|
import z from "zod";
|
||||||
import logger from "@server/logger";
|
import logger from "@server/logger";
|
||||||
import semver from "semver";
|
import semver from "semver";
|
||||||
|
import { createHash } from "crypto";
|
||||||
import { getValidCertificatesForDomains } from "#dynamic/lib/certificates";
|
import { getValidCertificatesForDomains } from "#dynamic/lib/certificates";
|
||||||
import { lockManager } from "#dynamic/lib/lock";
|
import { lockManager } from "#dynamic/lib/lock";
|
||||||
|
|
||||||
@@ -648,21 +649,101 @@ export type SubnetProxyTargetV2 = {
|
|||||||
httpTargets?: HTTPTarget[];
|
httpTargets?: HTTPTarget[];
|
||||||
tlsCert?: string;
|
tlsCert?: string;
|
||||||
tlsKey?: string;
|
tlsKey?: string;
|
||||||
|
tlsCertId?: string; // references an entry in the sync message's top-level `certs` array instead of inlining tlsCert/tlsKey
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type CertRef = { id: string; cert: string; key: string };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Replaces each target's inline tlsCert/tlsKey with a tlsCertId reference
|
||||||
|
* into a deduplicated certs array, so that many targets sharing the same
|
||||||
|
* certificate (e.g. a wildcard cert used by thousands of site resources)
|
||||||
|
* only need that certificate sent once per sync message.
|
||||||
|
*/
|
||||||
|
export function dedupeCertsForTargets(
|
||||||
|
targetsV2: SubnetProxyTargetV2[]
|
||||||
|
): { targets: SubnetProxyTargetV2[]; certs: CertRef[] } {
|
||||||
|
const idByContent = new Map<string, string>();
|
||||||
|
const certs: CertRef[] = [];
|
||||||
|
|
||||||
|
const targets = targetsV2.map((target) => {
|
||||||
|
if (!target.tlsCert || !target.tlsKey) {
|
||||||
|
return target;
|
||||||
|
}
|
||||||
|
|
||||||
|
const contentKey = `${target.tlsCert}|${target.tlsKey}`;
|
||||||
|
let id = idByContent.get(contentKey);
|
||||||
|
if (!id) {
|
||||||
|
id = createHash("sha1").update(contentKey).digest("hex").slice(0, 16);
|
||||||
|
idByContent.set(contentKey, id);
|
||||||
|
certs.push({ id, cert: target.tlsCert, key: target.tlsKey });
|
||||||
|
}
|
||||||
|
|
||||||
|
const { tlsCert, tlsKey, ...rest } = target;
|
||||||
|
return { ...rest, tlsCertId: id };
|
||||||
|
});
|
||||||
|
|
||||||
|
return { targets, certs };
|
||||||
|
}
|
||||||
|
|
||||||
export type HTTPTarget = {
|
export type HTTPTarget = {
|
||||||
destAddr: string; // must be an IP or hostname
|
destAddr: string; // must be an IP or hostname
|
||||||
destPort: number;
|
destPort: number;
|
||||||
scheme: "http" | "https";
|
scheme: "http" | "https";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type CertByDomain = Map<string, { certFile: string; keyFile: string }>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetches the TLS certificates for every enabled, SSL-enabled HTTP site
|
||||||
|
* resource's fullDomain in a single batched call, instead of one call per
|
||||||
|
* resource. Many resources commonly resolve to the very same certificate
|
||||||
|
* (e.g. a wildcard covering the org's domain), so batching turns what would
|
||||||
|
* be N concurrent DB/cache round-trips into one, and a lookup failure fails
|
||||||
|
* loudly for the whole batch rather than silently dropping the cert on a
|
||||||
|
* random subset of otherwise-identical resources under load.
|
||||||
|
*/
|
||||||
|
export async function batchFetchCertsForSiteResources(
|
||||||
|
allSiteResources: SiteResource[]
|
||||||
|
): Promise<CertByDomain> {
|
||||||
|
const domains = new Set(
|
||||||
|
allSiteResources
|
||||||
|
.filter((r) => r.enabled && r.mode === "http" && r.ssl && r.fullDomain)
|
||||||
|
.map((r) => r.fullDomain as string)
|
||||||
|
);
|
||||||
|
|
||||||
|
const certByDomain: CertByDomain = new Map();
|
||||||
|
if (domains.size === 0) {
|
||||||
|
return certByDomain;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const certResults = await getValidCertificatesForDomains(domains, true);
|
||||||
|
for (const cert of certResults) {
|
||||||
|
if (cert.certFile && cert.keyFile) {
|
||||||
|
certByDomain.set(cert.queriedDomain, {
|
||||||
|
certFile: cert.certFile,
|
||||||
|
keyFile: cert.keyFile
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
logger.error(
|
||||||
|
`Failed to batch-retrieve certificates for ${domains.size} domain(s): ${err}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return certByDomain;
|
||||||
|
}
|
||||||
|
|
||||||
export async function generateSubnetProxyTargetV2(
|
export async function generateSubnetProxyTargetV2(
|
||||||
siteResource: SiteResource,
|
siteResource: SiteResource,
|
||||||
clients: {
|
clients: {
|
||||||
clientId: number;
|
clientId: number;
|
||||||
pubKey: string | null;
|
pubKey: string | null;
|
||||||
subnet: string | null;
|
subnet: string | null;
|
||||||
}[]
|
}[],
|
||||||
|
certByDomain?: CertByDomain
|
||||||
): Promise<SubnetProxyTargetV2[] | undefined> {
|
): Promise<SubnetProxyTargetV2[] | undefined> {
|
||||||
if (!siteResource.enabled) {
|
if (!siteResource.enabled) {
|
||||||
logger.debug(
|
logger.debug(
|
||||||
@@ -750,23 +831,40 @@ export async function generateSubnetProxyTargetV2(
|
|||||||
let tlsKey: string | undefined;
|
let tlsKey: string | undefined;
|
||||||
|
|
||||||
if (siteResource.ssl && siteResource.fullDomain) {
|
if (siteResource.ssl && siteResource.fullDomain) {
|
||||||
try {
|
if (certByDomain) {
|
||||||
const certs = await getValidCertificatesForDomains(
|
// Caller batch-fetched certs for all resources up front (the
|
||||||
new Set([siteResource.fullDomain]),
|
// common, high-scale path) — just look up this resource's
|
||||||
true
|
// domain rather than issuing its own DB/cache round-trip.
|
||||||
);
|
const cert = certByDomain.get(siteResource.fullDomain);
|
||||||
if (certs.length > 0 && certs[0].certFile && certs[0].keyFile) {
|
if (cert) {
|
||||||
tlsCert = certs[0].certFile;
|
tlsCert = cert.certFile;
|
||||||
tlsKey = certs[0].keyFile;
|
tlsKey = cert.keyFile;
|
||||||
} else {
|
} else {
|
||||||
logger.warn(
|
logger.warn(
|
||||||
`No valid certificate found for SSL site resource ${siteResource.siteResourceId} with domain ${siteResource.fullDomain}`
|
`No valid certificate found for SSL site resource ${siteResource.siteResourceId} with domain ${siteResource.fullDomain}`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} else {
|
||||||
logger.error(
|
// No batched map supplied by the caller — fall back to a
|
||||||
`Failed to retrieve certificate for site resource ${siteResource.siteResourceId} domain ${siteResource.fullDomain}: ${err}`
|
// single-domain lookup for this resource alone.
|
||||||
);
|
try {
|
||||||
|
const certs = await getValidCertificatesForDomains(
|
||||||
|
new Set([siteResource.fullDomain]),
|
||||||
|
true
|
||||||
|
);
|
||||||
|
if (certs.length > 0 && certs[0].certFile && certs[0].keyFile) {
|
||||||
|
tlsCert = certs[0].certFile;
|
||||||
|
tlsKey = certs[0].keyFile;
|
||||||
|
} else {
|
||||||
|
logger.warn(
|
||||||
|
`No valid certificate found for SSL site resource ${siteResource.siteResourceId} with domain ${siteResource.fullDomain}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
logger.error(
|
||||||
|
`Failed to retrieve certificate for site resource ${siteResource.siteResourceId} domain ${siteResource.fullDomain}: ${err}`
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import { eq, and, inArray } from "drizzle-orm";
|
|||||||
import config from "@server/lib/config";
|
import config from "@server/lib/config";
|
||||||
import { decrypt } from "@server/lib/crypto";
|
import { decrypt } from "@server/lib/crypto";
|
||||||
import {
|
import {
|
||||||
|
batchFetchCertsForSiteResources,
|
||||||
formatEndpoint,
|
formatEndpoint,
|
||||||
generateSubnetProxyTargetV2,
|
generateSubnetProxyTargetV2,
|
||||||
SubnetProxyTargetV2
|
SubnetProxyTargetV2
|
||||||
@@ -206,11 +207,18 @@ export async function buildClientConfigurationForNewtClient(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Batch-fetch certs for every SSL-enabled HTTP resource's domain in one
|
||||||
|
// call rather than letting each resource fetch its own — with thousands
|
||||||
|
// of resources this avoids a concurrent DB/cache stampede for what is
|
||||||
|
// often the very same (e.g. wildcard) certificate.
|
||||||
|
const certByDomain = await batchFetchCertsForSiteResources(allSiteResources);
|
||||||
|
|
||||||
const resourceTargetsArr = await Promise.all(
|
const resourceTargetsArr = await Promise.all(
|
||||||
allSiteResources.map((resource) =>
|
allSiteResources.map((resource) =>
|
||||||
generateSubnetProxyTargetV2(
|
generateSubnetProxyTargetV2(
|
||||||
resource,
|
resource,
|
||||||
clientsByResourceId.get(resource.siteResourceId) ?? []
|
clientsByResourceId.get(resource.siteResourceId) ?? [],
|
||||||
|
certByDomain
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
import { sendToClient } from "#dynamic/routers/ws";
|
||||||
|
import logger from "@server/logger";
|
||||||
|
import {
|
||||||
|
canCompress,
|
||||||
|
supportsCertReferences
|
||||||
|
} from "@server/lib/clientVersionChecks";
|
||||||
|
import { CertRef } from "@server/lib/ip";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pushes an incremental set of certs to a newt client outside of a full
|
||||||
|
* newt/sync or newt/wg/receive-config, e.g. after a certificate renewal so
|
||||||
|
* that every target referencing it (by tlsCertId) picks up the new material
|
||||||
|
* without waiting for the next full resync.
|
||||||
|
*/
|
||||||
|
export async function sendCertsAdd(
|
||||||
|
newtId: string,
|
||||||
|
certs: CertRef[],
|
||||||
|
version?: string | null
|
||||||
|
) {
|
||||||
|
if (certs.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!supportsCertReferences(version)) {
|
||||||
|
logger.debug(
|
||||||
|
`Newt ${newtId} (version ${version}) does not support cert references, skipping certs/add`
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await sendToClient(
|
||||||
|
newtId,
|
||||||
|
{
|
||||||
|
type: "newt/certs/add",
|
||||||
|
data: certs
|
||||||
|
},
|
||||||
|
{
|
||||||
|
incrementConfigVersion: true,
|
||||||
|
compress: canCompress(version, "newt")
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tells a newt client to drop the given cert IDs, e.g. once the server knows
|
||||||
|
* no target references them anymore.
|
||||||
|
*/
|
||||||
|
export async function sendCertsRemove(
|
||||||
|
newtId: string,
|
||||||
|
certIds: string[],
|
||||||
|
version?: string | null
|
||||||
|
) {
|
||||||
|
if (certIds.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!supportsCertReferences(version)) {
|
||||||
|
logger.debug(
|
||||||
|
`Newt ${newtId} (version ${version}) does not support cert references, skipping certs/remove`
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await sendToClient(
|
||||||
|
newtId,
|
||||||
|
{
|
||||||
|
type: "newt/certs/remove",
|
||||||
|
data: { ids: certIds }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
incrementConfigVersion: true,
|
||||||
|
compress: canCompress(version, "newt")
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -7,7 +7,11 @@ import { eq } from "drizzle-orm";
|
|||||||
import { sendToExitNode } from "#dynamic/lib/exitNodes";
|
import { sendToExitNode } from "#dynamic/lib/exitNodes";
|
||||||
import { buildClientConfigurationForNewtClient } from "./buildConfiguration";
|
import { buildClientConfigurationForNewtClient } from "./buildConfiguration";
|
||||||
import { convertTargetsIfNecessary } from "../client/targets";
|
import { convertTargetsIfNecessary } from "../client/targets";
|
||||||
import { canCompress } from "@server/lib/clientVersionChecks";
|
import {
|
||||||
|
canCompress,
|
||||||
|
supportsCertReferences
|
||||||
|
} from "@server/lib/clientVersionChecks";
|
||||||
|
import { dedupeCertsForTargets } from "@server/lib/ip";
|
||||||
import config from "@server/lib/config";
|
import config from "@server/lib/config";
|
||||||
import { waitForSiteRebuildIdle } from "@server/lib/rebuildClientAssociations";
|
import { waitForSiteRebuildIdle } from "@server/lib/rebuildClientAssociations";
|
||||||
|
|
||||||
@@ -119,7 +123,16 @@ export const handleNewtGetConfigMessage: MessageHandler = async (context) => {
|
|||||||
exitNode
|
exitNode
|
||||||
);
|
);
|
||||||
|
|
||||||
const targetsToSend = await convertTargetsIfNecessary(newt.newtId, targets); // for backward compatibility with old newt versions that don't support the new target format
|
// Older newt clients only understand inline tlsCert/tlsKey on each
|
||||||
|
// target, so only switch to certId references once we know the client
|
||||||
|
// can resolve them.
|
||||||
|
let dedupedTargets = targets;
|
||||||
|
let certs: { id: string; cert: string; key: string }[] = [];
|
||||||
|
if (supportsCertReferences(newt.version)) {
|
||||||
|
({ targets: dedupedTargets, certs } = dedupeCertsForTargets(targets));
|
||||||
|
}
|
||||||
|
|
||||||
|
const targetsToSend = await convertTargetsIfNecessary(newt.newtId, dedupedTargets); // for backward compatibility with old newt versions that don't support the new target format
|
||||||
|
|
||||||
return {
|
return {
|
||||||
message: {
|
message: {
|
||||||
@@ -128,6 +141,7 @@ export const handleNewtGetConfigMessage: MessageHandler = async (context) => {
|
|||||||
ipAddress: site.address,
|
ipAddress: site.address,
|
||||||
peers,
|
peers,
|
||||||
targets: targetsToSend,
|
targets: targetsToSend,
|
||||||
|
certs,
|
||||||
chainId: chainId
|
chainId: chainId
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -6,7 +6,11 @@ import {
|
|||||||
buildClientConfigurationForNewtClient,
|
buildClientConfigurationForNewtClient,
|
||||||
buildTargetConfigurationForNewtClient
|
buildTargetConfigurationForNewtClient
|
||||||
} from "./buildConfiguration";
|
} from "./buildConfiguration";
|
||||||
import { canCompress } from "@server/lib/clientVersionChecks";
|
import {
|
||||||
|
canCompress,
|
||||||
|
supportsCertReferences
|
||||||
|
} from "@server/lib/clientVersionChecks";
|
||||||
|
import { dedupeCertsForTargets } from "@server/lib/ip";
|
||||||
|
|
||||||
export async function sendNewtSyncMessage(newt: Newt, site: Site) {
|
export async function sendNewtSyncMessage(newt: Newt, site: Site) {
|
||||||
const {
|
const {
|
||||||
@@ -28,6 +32,16 @@ export async function sendNewtSyncMessage(newt: Newt, site: Site) {
|
|||||||
site,
|
site,
|
||||||
exitNode
|
exitNode
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Older newt clients only understand inline tlsCert/tlsKey on each
|
||||||
|
// target, so only switch to certId references once we know the client
|
||||||
|
// can resolve them.
|
||||||
|
let clientTargets = targets;
|
||||||
|
let certs: { id: string; cert: string; key: string }[] = [];
|
||||||
|
if (supportsCertReferences(newt.version)) {
|
||||||
|
({ targets: clientTargets, certs } = dedupeCertsForTargets(targets));
|
||||||
|
}
|
||||||
|
|
||||||
await sendToClient(
|
await sendToClient(
|
||||||
newt.newtId,
|
newt.newtId,
|
||||||
{
|
{
|
||||||
@@ -39,7 +53,8 @@ export async function sendNewtSyncMessage(newt: Newt, site: Site) {
|
|||||||
},
|
},
|
||||||
healthCheckTargets: validHealthCheckTargets,
|
healthCheckTargets: validHealthCheckTargets,
|
||||||
peers: peers,
|
peers: peers,
|
||||||
clientTargets: targets,
|
clientTargets: clientTargets,
|
||||||
|
certs: certs,
|
||||||
browserGatewayTargets: browserGatewayTargets,
|
browserGatewayTargets: browserGatewayTargets,
|
||||||
remoteExitNodeSubnets: remoteExitNodeSubnets
|
remoteExitNodeSubnets: remoteExitNodeSubnets
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -95,7 +95,10 @@ export function useOptimisticLabels({
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function refresh() {
|
async function refresh() {
|
||||||
router.refresh();
|
// Only refresh if the labels have been modified
|
||||||
|
if (pendingActions.length > 0) {
|
||||||
|
router.refresh();
|
||||||
|
}
|
||||||
setPendingActions([]);
|
setPendingActions([]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user