wmantly
c96a4b6652
Server endpoints for joining a spoke to a master directory (MULTI_SITE_SPEC.md).
This pass is server-only; setup.sh wiring and the UI are the next layer.
- Site join keys (SiteJoinKey model, stj_ prefix): mint/revoke/delete/list,
hashed at rest, shown once — the same model as agent join keys.
- POST /api/site/export (master, Bearer stj_ key, no admin session): returns the
local LDAP tree (slapcat LDIF) + resource catalog + siteSlug + baseDn.
- POST /api/site/join (spoke, admin): { masterUrl, joinKey } pulls the master
export, imports resources (upsert by slug) + LDAP (ldapadd -c), and persists
the spoke role. Refused if already a spoke.
- Persisted site role: utils/site_config.js keeps isMaster/masterUrl/siteSlug in
/config/site.json (env seeds defaults); site-status/site-promote now use it.
- Unit tests (site_join, site_config) with in-memory stubs, wired into npm test.
- docs/site-join.md + docs router entry.
- Repairs the corrupted multi-site emojis (crown/bolt) in directory.ejs.
- .gitguardian.yml ignores the generic-password false positive on reading the
LDAP bind credential from runtime config (never a hardcoded secret).
63 lines
2.2 KiB
JavaScript
63 lines
2.2 KiB
JavaScript
'use strict';
|
|
|
|
const fs = require('fs');
|
|
const os = require('os');
|
|
const path = require('path');
|
|
|
|
// Point SITE_CONFIG_FILE at a fresh temp path and clear the env defaults so
|
|
// each test observes a known state. jest.resetModules() gives a fresh module
|
|
// (the `current` cache is module-scoped).
|
|
function freshEnv(overrides = {}) {
|
|
const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'site-cfg-'));
|
|
const file = path.join(dir, 'site.json');
|
|
for (const k of ['IS_MASTER', 'MASTER_URL', 'SITE_SLUG', 'SITE_CONFIG_FILE']) delete process.env[k];
|
|
process.env.SITE_CONFIG_FILE = file;
|
|
Object.assign(process.env, overrides);
|
|
jest.resetModules();
|
|
return { file };
|
|
}
|
|
|
|
test('site_config defaults to a fresh master / site-default with no file', () => {
|
|
freshEnv();
|
|
const sc = require('../utils/site_config');
|
|
const c = sc.get();
|
|
expect(c.isMaster).toBe(true);
|
|
expect(c.masterUrl).toBe('');
|
|
expect(c.siteSlug).toBe('site-default');
|
|
expect(c.wanConnected).toBe(true);
|
|
});
|
|
|
|
test('site_config honors the env seed values', () => {
|
|
freshEnv({ IS_MASTER: 'false', MASTER_URL: 'https://m.example.com', SITE_SLUG: 'site-east' });
|
|
const sc = require('../utils/site_config');
|
|
const c = sc.get();
|
|
expect(c.isMaster).toBe(false);
|
|
expect(c.masterUrl).toBe('https://m.example.com');
|
|
expect(c.siteSlug).toBe('site-east');
|
|
});
|
|
|
|
test('site_config save persists and a fresh require reloads it', () => {
|
|
const { file } = freshEnv();
|
|
const sc = require('../utils/site_config');
|
|
sc.save({ isMaster: false, masterUrl: 'https://m.example.com', siteSlug: 'site-east' });
|
|
|
|
const onDisk = JSON.parse(fs.readFileSync(file, 'utf8'));
|
|
expect(onDisk.isMaster).toBe(false);
|
|
expect(onDisk.siteSlug).toBe('site-east');
|
|
|
|
jest.resetModules();
|
|
const sc2 = require('../utils/site_config');
|
|
const c = sc2.get();
|
|
expect(c.isMaster).toBe(false);
|
|
expect(c.masterUrl).toBe('https://m.example.com');
|
|
expect(c.siteSlug).toBe('site-east');
|
|
});
|
|
|
|
test('site_config save returns the merged config', () => {
|
|
freshEnv();
|
|
const sc = require('../utils/site_config');
|
|
const c = sc.save({ masterUrl: 'https://m.example.com' });
|
|
expect(c.isMaster).toBe(true); // untouched default survives
|
|
expect(c.masterUrl).toBe('https://m.example.com');
|
|
});
|