99276f4ee5
The existing WireGuard code (models/wg_site.js, routes/wireguard.js) is the roaming-client/exit-node feature -- individual peer configs an admin hands out, not gateway-to-gateway mesh peering. This adds the latter, per MULTI_SITE_SPEC.md §4: two theta-gateway instances mesh by one calling the other's POST /api/mesh/register with a join token (minted via POST /api/mesh/join-tokens, admin-gated); both sides end up with a live wg0 peer for the other, mesh-indexed per Appendix A's addressing (172.24.<idx>.0/16 + 10.<idx>.0.0/16, idx 1-254). - utils/wg_iface.js: brings up the local interface, preferring in-kernel WireGuard (ip link add type wireguard) and falling back to userspace wireguard-go when the kernel module isn't available. Both packages added to the Dockerfile. - utils/mesh_addressing.js: pure addressing math, unit tested (test/unit/mesh_addressing.test.js). - models/mesh_gateway.js: Redis-backed registry of known peer gateways (same pattern as wg_site.js), assigns + persists mesh indexes. - utils/mesh_join_token.js: single-use bootstrap credential, same GETDEL-on-Redis pattern already used on the theta-directory side. - routes/mesh.js: /join-tokens (admin), /register (bearer token, no session -- called by a remote gateway), /join (admin, initiates from this side), /gateways (admin, list). Verified with a REAL two-container test (not mocked): two independent containers, each running this actual code, meshed via a live join-token handshake, brought up real kernel WireGuard interfaces, and passed ICMP traffic across the resulting encrypted tunnel end to end (0% packet loss). That test caught a real bug worth calling out: `wg set ... peer ... allowed-ips` only configures WireGuard's own crypto-routing table -- it does NOT add a kernel route for that destination (wg-quick normally does this as a separate step; we don't use wg-quick). A real encrypted handshake completed between the two containers with the route missing, and ping still showed 100% loss until setPeer() was fixed to add the corresponding `ip route add <allowed-ip> dev <iface>` itself.
86 lines
2.9 KiB
JavaScript
86 lines
2.9 KiB
JavaScript
'use strict';
|
|
|
|
// Registry of peer theta-gateway instances this gateway has meshed with —
|
|
// raw Redis, same pattern as wg_site.js/audit_event.js. Each registration
|
|
// carries what's needed to configure a local WireGuard peer entry for them:
|
|
// public key, reachable endpoint, and the mesh IP this gateway assigned them
|
|
// (MULTI_SITE_SPEC.md's one-octet-per-site addressing, 172.24.<idx>.0/16 +
|
|
// 10.<idx>.0.0/16, idx 1-254).
|
|
//
|
|
// Redis keys:
|
|
// mesh_gateway:<id> — hash of gateway fields
|
|
// mesh_gateway_index — sorted set (score = createdAt, value = id)
|
|
|
|
const crypto = require('crypto');
|
|
const conf = require('@simpleworkjs/conf');
|
|
const { getRedis } = require('./index');
|
|
|
|
const MAX_MESH_INDEX = 254;
|
|
|
|
const P = () => conf.redis.prefix;
|
|
const idxKey = () => `${P()}mesh_gateway_index`;
|
|
const gatewayKey = (id) => `${P()}mesh_gateway:${id}`;
|
|
|
|
function serialize(obj) {
|
|
const out = {};
|
|
for (const [k, v] of Object.entries(obj)) {
|
|
out[k] = String(v == null ? '' : v);
|
|
}
|
|
return out;
|
|
}
|
|
|
|
function deserialize(h) {
|
|
if (!h || !h.id) return null;
|
|
return { ...h, meshIndex: Number(h.meshIndex || 0), createdAt: Number(h.createdAt || 0), lastSeenAt: Number(h.lastSeenAt || 0) };
|
|
}
|
|
|
|
async function list() {
|
|
const redis = await getRedis();
|
|
const ids = await redis.zRange(idxKey(), 0, -1);
|
|
const out = [];
|
|
for (const id of ids) {
|
|
const g = deserialize(await redis.hGetAll(gatewayKey(id)));
|
|
if (g) out.push(g);
|
|
}
|
|
return out;
|
|
}
|
|
|
|
async function findByPublicKey(publicKey) {
|
|
const all = await list();
|
|
return all.find((g) => g.publicKey === publicKey) || null;
|
|
}
|
|
|
|
function nextFreeMeshIndex(existing) {
|
|
const used = new Set(existing.map((g) => g.meshIndex).filter(Boolean));
|
|
for (let i = 1; i <= MAX_MESH_INDEX; i++) {
|
|
if (!used.has(i)) return i;
|
|
}
|
|
throw new Error(`Mesh index space exhausted (max ${MAX_MESH_INDEX} gateways)`);
|
|
}
|
|
|
|
// Register (or re-register, idempotent by publicKey) a peer gateway.
|
|
// Re-registering the same public key updates its endpoint/siteSlug but
|
|
// reuses its existing mesh index -- a gateway that re-registers after a
|
|
// restart must not get bumped to a new mesh subnet.
|
|
async function register({ publicKey, endpoint, siteSlug }) {
|
|
const redis = await getRedis();
|
|
const existing = await list();
|
|
const already = existing.find((g) => g.publicKey === publicKey);
|
|
|
|
const now = Date.now();
|
|
if (already) {
|
|
const updated = { ...already, endpoint, siteSlug: siteSlug || already.siteSlug, lastSeenAt: now };
|
|
await redis.hSet(gatewayKey(already.id), serialize(updated));
|
|
return updated;
|
|
}
|
|
|
|
const id = crypto.randomBytes(8).toString('hex');
|
|
const meshIndex = nextFreeMeshIndex(existing);
|
|
const gateway = { id, publicKey, endpoint, siteSlug: siteSlug || '', meshIndex, createdAt: now, lastSeenAt: now };
|
|
await redis.hSet(gatewayKey(id), serialize(gateway));
|
|
await redis.zAdd(idxKey(), { score: now, value: id });
|
|
return gateway;
|
|
}
|
|
|
|
module.exports = { list, findByPublicKey, register, MAX_MESH_INDEX };
|