Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6bd2aaec56 | ||
|
|
80e97b4118 | ||
|
|
0a18d5354d | ||
|
|
a0121d4975 | ||
|
|
678d45e4f9 | ||
|
|
60348cf0c5 | ||
|
|
958405651b | ||
|
|
db244b116a | ||
|
|
1db5aa22dc | ||
|
|
8a1f17099d | ||
|
|
a75113b6ac | ||
|
|
2bc7d5cde5 | ||
|
|
19ca4ffc91 | ||
|
|
1bc0fe8811 |
No files matched your search
@@ -5,6 +5,41 @@ tag (08 §3.1): `selfphoneng-api`, `selfphoneng-asterisk` and `selfphoneng-probe
|
||||
the Gitea registry. From v0.0.3 the release also has the probe as downloads for machines without
|
||||
Docker.
|
||||
|
||||
## v0.0.12 — 2026-10-28
|
||||
|
||||
**Before you update:** this version changes the database (spam reports); the api backs up first,
|
||||
by itself. Portainer: change both tags to `0.0.12` and redeploy. Compose:
|
||||
`sudo scripts/update.sh v0.0.12`. If you run the network test probe, update it too (see
|
||||
**Probe key** below).
|
||||
|
||||
- **My reports:** everyone with an extension gets a Reports tab: the calls that rang them, how
|
||||
many they answered and missed, talk time, calls and missed calls per day, and their busiest
|
||||
hours.
|
||||
- **Report spam:** on the Calls page, an incoming outside call has a **Report spam** button. When
|
||||
the spam check flagged the call, its finding is the reason; otherwise the person types one.
|
||||
Reports wait at the top of **Blocked numbers** for an admin to Block or Dismiss, and the
|
||||
Dashboard counts them.
|
||||
- **Second security review** (spec 08 §7), eight findings fixed, none critical:
|
||||
- Signing in by email (OpenID or directory) no longer matches admins or anyone who already has
|
||||
a connected sign-in, and connecting an OpenID account only finishes in the browser that
|
||||
started it.
|
||||
- **Recordings, transcripts and AI summaries** only go to whoever made or answered the call.
|
||||
Ring group and queue members whose phone only rang no longer get a coworker's recording, nor
|
||||
its summary in their call report email or on their Contrack timeline.
|
||||
- The `voicemail.new` webhook no longer carries the voicemail's transcript.
|
||||
- Changing the Contrack address asks for the company token again, and everyone reconnects
|
||||
their own Contrack token.
|
||||
- A directory account can only be swapped for another by an admin.
|
||||
- **Probe key** (strongly recommended): Settings → Network → **Generate key**, then set it as
|
||||
`PROBE_KEY` on the probe and restart it. The probe then only answers your server. Without a key
|
||||
it still works, and Diagnostics warns. Behind your own reverse proxy (`TRUST_PROXY=true`), the
|
||||
proxy must run on the probe's machine.
|
||||
- **Asterisk 24.0.0-rc3.** TLS trunks get a health check again, and Test checks them too (rc2
|
||||
couldn't check them over TLS). `pnpm test:asterisk-upgrade` now checks what SelfPhoneNG relies
|
||||
on Asterisk doing before any version change.
|
||||
- **Docs:** a CrowdSec rule for slow SIP scanners, and how to check that CrowdSec bans
|
||||
([network](docs/admin-guide/network.md#crowdsec)).
|
||||
|
||||
## v0.0.11 — 2026-10-28
|
||||
|
||||
**Updating:** no database changes. Portainer: change both tags to `0.0.11` and redeploy. Compose:
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
A fully open source, self-hosted business phone system. Bring your own SIP trunk and numbers
|
||||
(reference provider: voip.ms). Built on Asterisk 24 + TypeScript + PostgreSQL 18, runs in Docker.
|
||||
|
||||
**Status:** pre-1.0 (v0.0.11), for testing. See [what's left for v1](docs/v1-checklist.md).
|
||||
**Status:** pre-1.0 (v0.0.12), for testing. See [what's left for v1](docs/v1-checklist.md).
|
||||
|
||||
## What it does today
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@selfphoneng/api",
|
||||
"version": "0.0.11",
|
||||
"version": "0.0.12",
|
||||
"private": true,
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"type": "module",
|
||||
|
||||
@@ -18,6 +18,7 @@ import {
|
||||
import { todayIn } from '../generator/load.ts';
|
||||
import { getSetting } from '../services/settings.ts';
|
||||
import { ContrackError, contrackBook, contrackInteraction, contrackSettings } from './contrack.ts';
|
||||
import { ON_THE_CALL } from '../services/cdr.ts';
|
||||
|
||||
/** A recorded call waits this long for its summary before it's logged without one. */
|
||||
const SUMMARY_WAIT_MS = 30 * 60_000;
|
||||
@@ -141,11 +142,13 @@ export async function logCallsToContrack(d: {
|
||||
.limit(500);
|
||||
|
||||
// One entry per call and person (a person can be in a call as caller, rang and answered).
|
||||
const todo = new Map<string, (typeof rows)[number] & { out: boolean }>();
|
||||
// `heard`: made or answered it; a phone that only rang gets no recording or summary (08 §7 #3).
|
||||
const todo = new Map<string, (typeof rows)[number] & { out: boolean; heard: boolean }>();
|
||||
for (const r of rows) {
|
||||
const k = `${r.call.id}|${r.userId}`;
|
||||
const out = r.role === 'caller' || todo.get(k)?.out === true;
|
||||
todo.set(k, { ...r, out });
|
||||
const heard = ON_THE_CALL.includes(r.role) || todo.get(k)?.heard === true;
|
||||
todo.set(k, { ...r, out, heard });
|
||||
}
|
||||
const skipUser = new Set<string>(); // Contrack down or token refused: try again next run
|
||||
let logged = 0;
|
||||
@@ -169,7 +172,8 @@ export async function logCallsToContrack(d: {
|
||||
await record(null);
|
||||
continue;
|
||||
}
|
||||
const wantSummary = r.withSummary && summariesOn && r.call.recordingId !== null;
|
||||
const recorded = r.heard && r.call.recordingId !== null;
|
||||
const wantSummary = r.withSummary && summariesOn && recorded;
|
||||
if (wantSummary && !r.aiDoneAt && now.getTime() - r.call.endedAt.getTime() < SUMMARY_WAIT_MS)
|
||||
continue; // the transcript job hasn't summarized it yet
|
||||
const e = timelineEntry(
|
||||
@@ -180,7 +184,7 @@ export async function logCallsToContrack(d: {
|
||||
toNumber: r.call.toNumber,
|
||||
talkSeconds: r.call.talkSeconds,
|
||||
answeredBy: r.answeredById && r.answeredById !== r.extId ? r.answeredBy : null,
|
||||
recorded: r.call.recordingId !== null,
|
||||
recorded,
|
||||
},
|
||||
wantSummary ? r.summary : null,
|
||||
);
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
CREATE TABLE "spam_reports" (
|
||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
||||
"number" text NOT NULL,
|
||||
"reason" text NOT NULL,
|
||||
"reported_by" uuid,
|
||||
"created_at" timestamp with time zone DEFAULT now() NOT NULL,
|
||||
"updated_at" timestamp with time zone DEFAULT now() NOT NULL,
|
||||
CONSTRAINT "spam_reports_number_reportedBy_unique" UNIQUE("number","reported_by")
|
||||
);
|
||||
--> statement-breakpoint
|
||||
ALTER TABLE "spam_reports" ADD CONSTRAINT "spam_reports_reported_by_users_id_fk" FOREIGN KEY ("reported_by") REFERENCES "public"."users"("id") ON DELETE set null ON UPDATE no action;
|
||||
File diff suppressed because it is too large.
Load diff
@@ -106,6 +106,13 @@
|
||||
"when": 1793127210386,
|
||||
"tag": "0014_spam_check",
|
||||
"breakpoints": true
|
||||
},
|
||||
{
|
||||
"idx": 15,
|
||||
"version": "7",
|
||||
"when": 1793212840276,
|
||||
"tag": "0015_spam_reports",
|
||||
"breakpoints": true
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -670,6 +670,19 @@ export const ftcComplaints = pgTable(
|
||||
(t) => [index().on(t.number), index().on(t.reportedAt)],
|
||||
);
|
||||
|
||||
/** "Report spam" from a user's call history, waiting for an admin (05 §2 Blocked numbers). */
|
||||
export const spamReports = pgTable(
|
||||
'spam_reports',
|
||||
{
|
||||
id: id(),
|
||||
number: text().notNull(),
|
||||
reason: text().notNull(),
|
||||
reportedBy: uuid().references(() => users.id, { onDelete: 'set null' }),
|
||||
...timestamps,
|
||||
},
|
||||
(t) => [unique().on(t.number, t.reportedBy)],
|
||||
);
|
||||
|
||||
export const callExtensions = pgTable(
|
||||
'call_extensions',
|
||||
{
|
||||
|
||||
@@ -140,7 +140,7 @@ endpoint = trunk-a1b2c3d4-0000-4000-8000-000000000004
|
||||
[trunk-a1b2c3d4-0000-4000-8000-000000000004]
|
||||
type = aor
|
||||
contact = sip:chicago1.voip.ms:5061;transport=tls
|
||||
qualify_frequency = 0
|
||||
qualify_frequency = 60
|
||||
|
||||
[trunk-a1b2c3d4-0000-4000-8000-000000000004]
|
||||
type = endpoint
|
||||
|
||||
@@ -232,11 +232,9 @@ function trunkSections(t: SnapTrunk, snap: Snapshot): string {
|
||||
section(`trunk-${id}`, [
|
||||
'type = aor',
|
||||
`contact = sip:${target}`,
|
||||
// ponytail: Asterisk 24 checks a qualify's TLS certificate against the IP, not the name, so
|
||||
// OPTIONS to voip.ms fail verify_server and the contact goes Unavailable (calls and
|
||||
// REGISTER verify fine). No qualify over TLS: registration shows the trunk's health.
|
||||
// Turn it back on when a qualify to chicago1.voip.ms:5061 passes.
|
||||
`qualify_frequency = ${t.transport === 'tls' ? 0 : 60}`,
|
||||
// Over TLS too since 24.0.0-rc3, which checks a qualify's certificate against the host name
|
||||
// (rc2 used the IP and failed verify_server; upgrade-test.ts tlsQualifyByHostname).
|
||||
'qualify_frequency = 60',
|
||||
]),
|
||||
section(`trunk-${id}`, [
|
||||
'type = endpoint',
|
||||
|
||||
@@ -213,12 +213,10 @@ export class LiveState extends EventEmitter<{ message: [LiveMessage] }> {
|
||||
/** POST /api/trunks/:id/test: qualify now, then read registration and reachability. */
|
||||
async testTrunk(
|
||||
id: string,
|
||||
{ waitMs = 1500, qualify = true } = {},
|
||||
{ waitMs = 1500 } = {},
|
||||
): Promise<{ live: TrunkLive; rttMs: number | null }> {
|
||||
if (qualify) {
|
||||
await this.ami.action({ Action: 'PJSIPQualify', Endpoint: `trunk-${id}` }).catch(() => {});
|
||||
await new Promise((r) => setTimeout(r, waitMs)); // the OPTIONS answer arrives asynchronously
|
||||
}
|
||||
await this.ami.action({ Action: 'PJSIPQualify', Endpoint: `trunk-${id}` }).catch(() => {});
|
||||
await new Promise((r) => setTimeout(r, waitMs)); // the OPTIONS answer arrives asynchronously
|
||||
await this.refreshRegistrations();
|
||||
const rttMs = await this.refreshReachable(id);
|
||||
const live = this.trunks.get(id);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// /api/blocked-numbers (04 §7.3): PostgreSQL, then AstDB SP/BLOCK/<number>, which every trunk
|
||||
// entry checks (03 §6.4). Admin only.
|
||||
// entry checks (03 §6.4). /api/spam-reports: users' Report spam, to block or dismiss. Admin only.
|
||||
import { desc, eq } from 'drizzle-orm';
|
||||
import type { FastifyInstance } from 'fastify';
|
||||
import { z } from 'zod';
|
||||
@@ -9,9 +9,10 @@ import {
|
||||
formatNumber,
|
||||
type BlockedDto,
|
||||
type ListResponse,
|
||||
type SpamReportDto,
|
||||
} from '@selfphoneng/shared';
|
||||
import { requireAdmin } from '../auth/guards.ts';
|
||||
import { blockedNumbers } from '../db/schema.ts';
|
||||
import { blockedNumbers, spamReports, users } from '../db/schema.ts';
|
||||
import { conflict, notFound } from '../errors.ts';
|
||||
import { setBlock } from '../services/astdb.ts';
|
||||
import { audit } from '../services/audit.ts';
|
||||
@@ -52,6 +53,7 @@ export async function blockedRoutes(app: FastifyInstance) {
|
||||
throw e;
|
||||
}
|
||||
await mirror(b.number, true);
|
||||
await db.delete(spamReports).where(eq(spamReports.number, b.number));
|
||||
await audit(db, {
|
||||
actorUserId: req.user!.id,
|
||||
actorIp: req.ip,
|
||||
@@ -78,4 +80,28 @@ export async function blockedRoutes(app: FastifyInstance) {
|
||||
});
|
||||
return { ok: true };
|
||||
});
|
||||
|
||||
app.get('/api/spam-reports', async (): Promise<ListResponse<SpamReportDto>> => ({
|
||||
items: (
|
||||
await db
|
||||
.select({ r: spamReports, name: users.displayName })
|
||||
.from(spamReports)
|
||||
.leftJoin(users, eq(users.id, spamReports.reportedBy))
|
||||
.orderBy(desc(spamReports.createdAt))
|
||||
).map(({ r, name }) => ({
|
||||
id: r.id,
|
||||
number: r.number,
|
||||
reason: r.reason,
|
||||
reportedBy: name,
|
||||
createdAt: r.createdAt.toISOString(),
|
||||
})),
|
||||
nextCursor: null,
|
||||
}));
|
||||
|
||||
app.delete('/api/spam-reports/:id', async (req) => {
|
||||
const { id } = IdParams.parse(req.params);
|
||||
const [r] = await db.delete(spamReports).where(eq(spamReports.id, id)).returning();
|
||||
if (!r) throw notFound('Already handled');
|
||||
return { ok: true };
|
||||
});
|
||||
}
|
||||
@@ -1,11 +1,15 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// /api/calls (admin) and /api/me/calls (04 §7.3): call history, newest first, keyset paging.
|
||||
import { and, asc, desc, eq, ilike, inArray, or, sql, type SQL } from 'drizzle-orm';
|
||||
// /api/me/spam-reports: Report spam on a call that rang me (05 §4).
|
||||
import { and, asc, desc, eq, ilike, inArray, ne, or, sql, type SQL } from 'drizzle-orm';
|
||||
import type { FastifyInstance } from 'fastify';
|
||||
import { alias } from 'drizzle-orm/pg-core';
|
||||
import { z } from 'zod';
|
||||
import {
|
||||
CallFilterSchema,
|
||||
SpamReportCreateSchema,
|
||||
formatNumber,
|
||||
normalizeNumber,
|
||||
type CallDetailDto,
|
||||
type CallDto,
|
||||
type ListResponse,
|
||||
@@ -14,9 +18,18 @@ import {
|
||||
} from '@selfphoneng/shared';
|
||||
import { requireAdmin, requireAuth } from '../auth/guards.ts';
|
||||
import type { Db } from '../db/client.ts';
|
||||
import { callExtensions, calls, cdr, dids, extensions } from '../db/schema.ts';
|
||||
import {
|
||||
blockedNumbers,
|
||||
callExtensions,
|
||||
calls,
|
||||
cdr,
|
||||
dids,
|
||||
extensions,
|
||||
spamReports,
|
||||
} from '../db/schema.ts';
|
||||
import { contactNames } from '../contacts/book.ts';
|
||||
import { badRequest, notFound } from '../errors.ts';
|
||||
import { badRequest, conflict, notFound } from '../errors.ts';
|
||||
import { ON_THE_CALL } from '../services/cdr.ts';
|
||||
import { getSetting } from '../services/settings.ts';
|
||||
|
||||
const answerer = alias(extensions, 'answerer');
|
||||
@@ -216,6 +229,8 @@ export async function callRoutes(app: FastifyInstance) {
|
||||
const out = mine.includes('caller');
|
||||
return {
|
||||
...c,
|
||||
// Only rang (a ring group): someone else's conversation (08 §7 #3).
|
||||
recordingId: mine.some((r) => ON_THE_CALL.includes(r)) ? c.recordingId : null,
|
||||
myRole: out ? 'out' : 'in',
|
||||
missedByMe: !out && (MISSED as readonly string[]).includes(c.status),
|
||||
};
|
||||
@@ -224,4 +239,42 @@ export async function callRoutes(app: FastifyInstance) {
|
||||
};
|
||||
},
|
||||
);
|
||||
|
||||
/** The admins see it on Blocked numbers and block or dismiss it. */
|
||||
app.post('/api/me/spam-reports', { preHandler: requireAuth }, async (req, reply) => {
|
||||
const body = SpamReportCreateSchema.parse(req.body);
|
||||
const [c] = await db
|
||||
.select({ number: calls.fromNumber })
|
||||
.from(calls)
|
||||
.innerJoin(callExtensions, eq(callExtensions.callId, calls.id))
|
||||
.innerJoin(extensions, eq(extensions.id, callExtensions.extensionId))
|
||||
.where(
|
||||
and(
|
||||
eq(calls.id, body.callId),
|
||||
eq(calls.direction, 'inbound'),
|
||||
eq(extensions.userId, req.user!.id),
|
||||
ne(callExtensions.role, 'caller'),
|
||||
),
|
||||
)
|
||||
.limit(1);
|
||||
if (!c) throw notFound('Not a call from outside that rang you');
|
||||
let number: string;
|
||||
try {
|
||||
number = normalizeNumber(c.number ?? '');
|
||||
} catch {
|
||||
throw badRequest("This caller's number was hidden, so it can't be blocked");
|
||||
}
|
||||
const [blocked] = await db
|
||||
.select({ id: blockedNumbers.id })
|
||||
.from(blockedNumbers)
|
||||
.where(eq(blockedNumbers.number, number));
|
||||
if (blocked) throw conflict(`${formatNumber(number)} is already blocked`);
|
||||
const [r] = await db
|
||||
.insert(spamReports)
|
||||
.values({ number, reason: body.reason, reportedBy: req.user!.id })
|
||||
.onConflictDoNothing()
|
||||
.returning();
|
||||
if (!r) throw conflict(`You already reported ${formatNumber(number)}`);
|
||||
return reply.code(201).send({ ok: true });
|
||||
});
|
||||
}
|
||||
@@ -270,8 +270,10 @@ export async function contactRoutes(app: FastifyInstance) {
|
||||
.object({ url: z.string().trim().min(1), companyToken: z.string().trim().optional() })
|
||||
.parse(req.body);
|
||||
const saved = await getSetting(db, 'contacts.contrack');
|
||||
// The saved token only for the saved address: another one gets none (08 §7 #7).
|
||||
const same = saved?.url === b.url.replace(/\/+$/, '');
|
||||
const token =
|
||||
b.companyToken || (saved?.companyTokenEnc ? decrypt(saved.companyTokenEnc) : null);
|
||||
b.companyToken || (same && saved.companyTokenEnc ? decrypt(saved.companyTokenEnc) : null);
|
||||
try {
|
||||
return { ok: true, detail: await contrackCheck(b.url, token) };
|
||||
} catch (err) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// Sign in with OpenID Connect, connect and disconnect an OpenID account (12 §3.2, §3.3).
|
||||
import { and, eq, gt, isNull, notExists } from 'drizzle-orm';
|
||||
import { and, eq, gt, isNull, ne, notExists } from 'drizzle-orm';
|
||||
import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
|
||||
import { z } from 'zod';
|
||||
import { decrypt, encrypt } from '../crypto/secrets.ts';
|
||||
@@ -15,7 +15,7 @@ import {
|
||||
} from '../errors.ts';
|
||||
import { requireAdmin, requireAuth } from '../auth/guards.ts';
|
||||
import { isLoginBlocked, recordLoginFailure } from '../auth/login-limiter.ts';
|
||||
import { createSession, setSessionCookie } from '../auth/sessions.ts';
|
||||
import { COOKIE, createSession, getSessionUser, setSessionCookie } from '../auth/sessions.ts';
|
||||
import { audit } from '../services/audit.ts';
|
||||
import { getSetting } from '../services/settings.ts';
|
||||
import { decide, verifiedEmail } from '../sso/claims.ts';
|
||||
@@ -146,7 +146,13 @@ export async function oidcRoutes(app: FastifyInstance) {
|
||||
.where(and(eq(userIdentities.kind, 'oidc'), eq(userIdentities.subject, r.subject)));
|
||||
|
||||
if (connecting) {
|
||||
// Connect (12 §3.3): to the user of the session that asked, if it's still signed in.
|
||||
// Connect (12 §3.3): to the user of the session that asked, if it's still signed in, and
|
||||
// only in that browser: a planted sp_oidc can't connect someone else's account (08 §7 #8).
|
||||
const here = req.cookies[COOKIE]
|
||||
? await getSessionUser(db, req.cookies[COOKIE], false)
|
||||
: null;
|
||||
if (here?.sessionId !== connecting)
|
||||
return fail('expired', 'connect finished in another browser than the one that asked');
|
||||
const [sess] = await db
|
||||
.select({ userId: sessions.userId, email: users.email })
|
||||
.from(sessions)
|
||||
@@ -186,7 +192,8 @@ export async function oidcRoutes(app: FastifyInstance) {
|
||||
|
||||
let userId = owner?.userId;
|
||||
if (!userId) {
|
||||
// A user without a password or an OpenID account yet, by verified email (12 §3.3 step 2).
|
||||
// A user without a password or any connected account yet, by verified email (12 §3.3
|
||||
// step 2). Never an admin: a provider account with their email isn't them (08 §7 #2).
|
||||
const v = verifiedEmail(r.claims, s.trustEmail);
|
||||
const [u] = v
|
||||
? await db
|
||||
@@ -196,13 +203,12 @@ export async function oidcRoutes(app: FastifyInstance) {
|
||||
and(
|
||||
eq(users.email, v),
|
||||
isNull(users.passwordHash),
|
||||
ne(users.role, 'admin'),
|
||||
notExists(
|
||||
db
|
||||
.select({ id: userIdentities.id })
|
||||
.from(userIdentities)
|
||||
.where(
|
||||
and(eq(userIdentities.userId, users.id), eq(userIdentities.kind, 'oidc')),
|
||||
),
|
||||
.where(eq(userIdentities.userId, users.id)),
|
||||
),
|
||||
),
|
||||
)
|
||||
@@ -322,8 +328,15 @@ export async function oidcRoutes(app: FastifyInstance) {
|
||||
recordLoginFailure(req.ip, login);
|
||||
throw badRequest('The directory refused that username or password');
|
||||
}
|
||||
if ((await connectDirectory(db, req.log, req.user!.id, entry, req.ip)) === 'taken')
|
||||
const r = await connectDirectory(db, req.log, req.user!.id, entry, req.ip);
|
||||
if (r === 'taken')
|
||||
throw new HttpError(409, 'taken', 'That directory account belongs to another user');
|
||||
if (r === 'connected_other')
|
||||
throw new HttpError(
|
||||
409,
|
||||
'connected_other',
|
||||
'Another directory account is connected. Ask an admin to disconnect it first',
|
||||
);
|
||||
return { ok: true };
|
||||
});
|
||||
app.delete('/api/users/:id/identities/:kind', { preHandler: requireAdmin }, (req, reply) => {
|
||||
|
||||
@@ -13,6 +13,7 @@ import { callExtensions, calls, extensions, recordings } from '../db/schema.ts';
|
||||
import { badRequest, forbidden, notFound } from '../errors.ts';
|
||||
import { audit } from '../services/audit.ts';
|
||||
import { sideFiles } from '../ai/calls.ts';
|
||||
import { ON_THE_CALL } from '../services/cdr.ts';
|
||||
|
||||
/** The recording and, when call transcripts left them, its two side files. */
|
||||
const removeFiles = async (dir: string, filePath: string) => {
|
||||
@@ -109,7 +110,10 @@ export async function recordingRoutes(app: FastifyInstance) {
|
||||
},
|
||||
);
|
||||
|
||||
/** Admins, or a participant: their extension is on the call this recording belongs to. */
|
||||
/**
|
||||
* Admins, or who was on the call: their extension made or answered it. Not a phone that only
|
||||
* rang (a ring group, a queue): that's a coworker's conversation (08 §7 #3).
|
||||
*/
|
||||
async function mayHear(user: { id: string; role: string }, recordingId: string) {
|
||||
if (user.role === 'admin') return;
|
||||
const [mine] = await db
|
||||
@@ -117,7 +121,13 @@ export async function recordingRoutes(app: FastifyInstance) {
|
||||
.from(calls)
|
||||
.innerJoin(callExtensions, eq(callExtensions.callId, calls.id))
|
||||
.innerJoin(extensions, eq(extensions.id, callExtensions.extensionId))
|
||||
.where(and(eq(calls.recordingId, recordingId), eq(extensions.userId, user.id)))
|
||||
.where(
|
||||
and(
|
||||
eq(calls.recordingId, recordingId),
|
||||
eq(extensions.userId, user.id),
|
||||
inArray(callExtensions.role, ON_THE_CALL),
|
||||
),
|
||||
)
|
||||
.limit(1);
|
||||
if (!mine) throw forbidden('Not your call');
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// /api/reports (04 §7.3, 05 §2 Reports): calls per day, busiest hours, per-queue stats. Admin only.
|
||||
import { and, asc, eq, sql } from 'drizzle-orm';
|
||||
// /api/reports (04 §7.3, 05 §2 Reports): calls per day, busiest hours, per-queue stats. Admin only,
|
||||
// but /api/me/reports/summary: the same summary of the calls made to me.
|
||||
import { and, asc, eq, inArray, ne, sql } from 'drizzle-orm';
|
||||
import type { FastifyInstance } from 'fastify';
|
||||
import {
|
||||
CALL_DIRECTIONS,
|
||||
@@ -10,12 +11,12 @@ import {
|
||||
type ProviderBalanceDto,
|
||||
type ReportSummary,
|
||||
} from '@selfphoneng/shared';
|
||||
import { requireAdmin } from '../auth/guards.ts';
|
||||
import { requireAdmin, requireAuth } from '../auth/guards.ts';
|
||||
import type { Db } from '../db/client.ts';
|
||||
import { decrypt } from '../crypto/secrets.ts';
|
||||
import { calls, queues, trunks } from '../db/schema.ts';
|
||||
import { callExtensions, calls, extensions, queues, trunks } from '../db/schema.ts';
|
||||
import { getBalance, VoipmsError } from '../integrations/voipms/client.ts';
|
||||
import { badRequest } from '../errors.ts';
|
||||
import { badRequest, notFound } from '../errors.ts';
|
||||
import { todayIn } from '../generator/load.ts';
|
||||
import { queueStats } from '../services/queuestats.ts';
|
||||
import { getSetting } from '../services/settings.ts';
|
||||
@@ -35,14 +36,28 @@ async function range(db: Db, query: unknown) {
|
||||
|
||||
export async function reportRoutes(app: FastifyInstance) {
|
||||
const { db } = app;
|
||||
app.addHook('preHandler', requireAdmin);
|
||||
const admin = { preHandler: requireAdmin };
|
||||
|
||||
app.get('/api/reports/summary', async (req): Promise<ReportSummary> => {
|
||||
const { tz, from, to } = await range(db, req.query);
|
||||
/** `toExt`: only the calls that rang or were answered by that extension, not the ones it made. */
|
||||
async function summary(query: unknown, toExt?: string): Promise<ReportSummary> {
|
||||
const { tz, from, to } = await range(db, query);
|
||||
const where = and(
|
||||
sql`${calls.startedAt} >= (${from}::date)::timestamp at time zone ${tz}`,
|
||||
sql`${calls.startedAt} < ((${to}::date + 1)::timestamp at time zone ${tz})`,
|
||||
toExt
|
||||
? inArray(
|
||||
calls.id,
|
||||
db
|
||||
.select({ id: callExtensions.callId })
|
||||
.from(callExtensions)
|
||||
.where(and(eq(callExtensions.extensionId, toExt), ne(callExtensions.role, 'caller'))),
|
||||
)
|
||||
: undefined,
|
||||
);
|
||||
// Mine: answered and talk time are the calls I picked up, not a coworker in my ring group.
|
||||
const answered = toExt
|
||||
? sql`${calls.answeredByExtensionId} = ${toExt}`
|
||||
: sql`${calls.status} = 'answered'`;
|
||||
const local = sql`(${calls.startedAt} at time zone ${tz})`;
|
||||
const missed = sql`${calls.status} in ('missed', 'voicemail', 'abandoned')`;
|
||||
// Outside line time: inbound from arrival (a receptionist or voicemail answers too),
|
||||
@@ -73,14 +88,14 @@ export async function reportRoutes(app: FastifyInstance) {
|
||||
db
|
||||
.select({
|
||||
calls: sql<number>`count(*)::int`,
|
||||
answered: sql<number>`count(*) filter (where ${calls.status} = 'answered')::int`,
|
||||
answered: sql<number>`count(*) filter (where ${answered})::int`,
|
||||
missed: sql<number>`count(*) filter (where ${missed})::int`,
|
||||
talk: sql<number>`coalesce(sum(${calls.talkSeconds}), 0)::int`,
|
||||
talk: sql<number>`coalesce(sum(${calls.talkSeconds}) filter (where ${toExt ? answered : sql`true`}), 0)::int`,
|
||||
lineIn: sql<number>`round(${lineIn})::int`,
|
||||
lineOut: sql<number>`${lineOut}::int`,
|
||||
avgTalk: sql<
|
||||
number | null
|
||||
>`round(avg(${calls.talkSeconds}) filter (where ${calls.status} = 'answered'))::int`,
|
||||
>`round(avg(${calls.talkSeconds}) filter (where ${answered}))::int`,
|
||||
})
|
||||
.from(calls)
|
||||
.where(where),
|
||||
@@ -113,10 +128,21 @@ export async function reportRoutes(app: FastifyInstance) {
|
||||
},
|
||||
hours,
|
||||
};
|
||||
}
|
||||
|
||||
app.get('/api/reports/summary', admin, (req) => summary(req.query));
|
||||
|
||||
app.get('/api/me/reports/summary', { preHandler: requireAuth }, async (req) => {
|
||||
const [ext] = await db
|
||||
.select({ id: extensions.id })
|
||||
.from(extensions)
|
||||
.where(eq(extensions.userId, req.user!.id));
|
||||
if (!ext) throw notFound("You don't have an extension yet. Ask your admin.");
|
||||
return summary(req.query, ext.id);
|
||||
});
|
||||
|
||||
/** Each voip.ms trunk's account balance (owner, 2026-10-21); a trunk without API login says so. */
|
||||
app.get('/api/reports/balance', async (): Promise<ListResponse<ProviderBalanceDto>> => {
|
||||
app.get('/api/reports/balance', admin, async (): Promise<ListResponse<ProviderBalanceDto>> => {
|
||||
const rows = await db
|
||||
.select()
|
||||
.from(trunks)
|
||||
@@ -150,7 +176,7 @@ export async function reportRoutes(app: FastifyInstance) {
|
||||
return { items, nextCursor: null };
|
||||
});
|
||||
|
||||
app.get('/api/reports/queues', async (req): Promise<ListResponse<QueueReportRow>> => {
|
||||
app.get('/api/reports/queues', admin, async (req): Promise<ListResponse<QueueReportRow>> => {
|
||||
const { from, to } = await range(db, req.query);
|
||||
const qs = await db.select().from(queues).orderBy(asc(queues.number));
|
||||
return {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// /api/settings (04 §7.3) and the dashboard warnings. Admin only.
|
||||
import { eq, inArray } from 'drizzle-orm';
|
||||
import { randomBytes } from 'node:crypto';
|
||||
import { eq, inArray, isNotNull } from 'drizzle-orm';
|
||||
import type { FastifyInstance } from 'fastify';
|
||||
import { z } from 'zod';
|
||||
import {
|
||||
@@ -26,7 +27,7 @@ import {
|
||||
type Warning,
|
||||
} from '@selfphoneng/shared';
|
||||
import type { Db } from '../db/client.ts';
|
||||
import { dids, extensions, trunks } from '../db/schema.ts';
|
||||
import { dids, extensions, trunks, users } from '../db/schema.ts';
|
||||
import { HttpError, badRequest } from '../errors.ts';
|
||||
import { SLOW, requireAdmin } from '../auth/guards.ts';
|
||||
import { decrypt, encrypt } from '../crypto/secrets.ts';
|
||||
@@ -63,6 +64,7 @@ const READ_ONLY = new Set<string>([
|
||||
'spam.state',
|
||||
'sms.webhookToken',
|
||||
'setup.completed',
|
||||
'network.probeKeyEnc',
|
||||
]);
|
||||
|
||||
async function toDto(db: Db): Promise<SettingsDto> {
|
||||
@@ -72,10 +74,12 @@ async function toDto(db: Db): Promise<SettingsDto> {
|
||||
'auth.oidc': oidc,
|
||||
'auth.ldap': ldap,
|
||||
spam,
|
||||
'network.probeKeyEnc': probeKey,
|
||||
...rest
|
||||
} = await getAllSettings(db);
|
||||
return {
|
||||
...rest,
|
||||
'network.hasProbeKey': probeKey !== null,
|
||||
spam: {
|
||||
...spam,
|
||||
ipqs: spam.ipqs && { hasKey: true },
|
||||
@@ -257,6 +261,7 @@ export async function settingsRoutes(app: FastifyInstance) {
|
||||
app.patch('/api/settings', async (req) => {
|
||||
const body = z.record(z.string(), z.unknown()).parse(req.body);
|
||||
const values: Record<string, unknown> = {};
|
||||
let contrackMoved = false;
|
||||
for (const [key, raw] of Object.entries(body)) {
|
||||
if (!(key in SettingsSchemas) || READ_ONLY.has(key))
|
||||
throw badRequest(`${key} can't be changed here`);
|
||||
@@ -287,8 +292,13 @@ export async function settingsRoutes(app: FastifyInstance) {
|
||||
} catch (err) {
|
||||
throw badRequest(`Contrack address: ${(err as Error).message}`);
|
||||
}
|
||||
// The saved tokens only go back to the address they were typed for (08 §7 #7).
|
||||
const url = input?.url.replace(/\/+$/, '');
|
||||
const moved = !!old && !!input && old.url !== url;
|
||||
if (moved && old.companyTokenEnc && !input.companyToken && !input.clearCompanyToken)
|
||||
throw badRequest('The Contrack address changed: enter the company token again');
|
||||
values[key] = input && {
|
||||
url: input.url.replace(/\/+$/, ''),
|
||||
url: url!,
|
||||
publicUrl: input.publicUrl,
|
||||
companyTokenEnc: input.companyToken
|
||||
? encrypt(input.companyToken)
|
||||
@@ -296,6 +306,7 @@ export async function settingsRoutes(app: FastifyInstance) {
|
||||
? ''
|
||||
: (old?.companyTokenEnc ?? ''),
|
||||
};
|
||||
if (moved) contrackMoved = true;
|
||||
forgetBook(null);
|
||||
} else if (key === 'auth.ldap') {
|
||||
values[key] = await ldapFromInput(raw);
|
||||
@@ -349,8 +360,17 @@ export async function settingsRoutes(app: FastifyInstance) {
|
||||
const cert = await readTlsCert(app.config.TLS_DIR);
|
||||
if (!cert.ok) throw badRequest(`Can't turn on TLS. ${cert.error}`);
|
||||
}
|
||||
// The probe's key was made for its address: another probe doesn't get it (08 §7 #9).
|
||||
if ('network.probeUrl' in values && values['network.probeUrl'] !== before['network.probeUrl'])
|
||||
values['network.probeKeyEnc'] = null;
|
||||
for (const [key, value] of Object.entries(values))
|
||||
await setSetting(db, key as SettingKey, value as never);
|
||||
// People's own Contrack tokens were for the old address: they connect again (08 §7 #7).
|
||||
if (contrackMoved)
|
||||
await db
|
||||
.update(users)
|
||||
.set({ contrackTokenEnc: null })
|
||||
.where(isNotNull(users.contrackTokenEnc));
|
||||
// A new IPQualityScore key may have credits: don't wait for spamQuotaCheck (14 §3).
|
||||
if ((body.spam as SpamInput | undefined)?.ipqs?.key) await resumeIpqs(db, 'a new key');
|
||||
const changed = Object.keys(values).filter(
|
||||
@@ -474,6 +494,25 @@ export async function settingsRoutes(app: FastifyInstance) {
|
||||
},
|
||||
);
|
||||
|
||||
/**
|
||||
* A new key for the network test probe (08 §7 #9): shown this once, for its PROBE_KEY. Made for
|
||||
* the probe address set now; the old key stops working on the next test.
|
||||
*/
|
||||
app.post('/api/settings/network/probe-key', async (req) => {
|
||||
if (!(await getSetting(db, 'network.probeUrl')))
|
||||
throw badRequest('Set the probe address first');
|
||||
const key = randomBytes(32).toString('base64url');
|
||||
await setSetting(db, 'network.probeKeyEnc', encrypt(key));
|
||||
await audit(db, {
|
||||
actorUserId: req.user!.id,
|
||||
actorIp: req.ip,
|
||||
action: 'update',
|
||||
entityType: 'settings',
|
||||
summary: 'Made a new network test probe key',
|
||||
});
|
||||
return { key };
|
||||
});
|
||||
|
||||
/** The server's public IPv4, as an outside service sees it (only sent when asked). */
|
||||
app.post('/api/settings/network/detect-public-ip', { config: SLOW }, async () => {
|
||||
const ip = await detectPublicIp();
|
||||
|
||||
@@ -208,21 +208,18 @@ export async function trunkRoutes(app: FastifyInstance) {
|
||||
if (!t.enabled) throw badRequest('Turn the trunk on first');
|
||||
if (!app.live.amiConnected)
|
||||
throw new HttpError(503, 'unavailable', 'Asterisk is not connected');
|
||||
// No OPTIONS over TLS (see the trunk's aor in generator/pjsip.ts).
|
||||
const { live, rttMs } = await app.live.testTrunk(id, { qualify: t.transport !== 'tls' });
|
||||
const { live, rttMs } = await app.live.testTrunk(id);
|
||||
const reg = t.authMode === 'registration';
|
||||
const detail =
|
||||
reg && live.registration === 'registered'
|
||||
? `Registered with ${t.serverHost}`
|
||||
: reg && live.registration === 'rejected'
|
||||
? `${t.serverHost} rejected the username or password`
|
||||
: !reg && t.transport === 'tls'
|
||||
? `Can't check a TLS trunk without registration from here: make a test call.`
|
||||
: !live.reachable
|
||||
? `${t.serverHost} doesn't answer. Check the server name and that this server can reach it on port ${t.serverPort}.`
|
||||
: reg
|
||||
? `${t.serverHost} answers but the registration hasn't completed yet. Try again in a minute.`
|
||||
: `${t.serverHost} answers (IP authentication: no registration)`;
|
||||
: !live.reachable
|
||||
? `${t.serverHost} doesn't answer. Check the server name and that this server can reach it on port ${t.serverPort}.`
|
||||
: reg
|
||||
? `${t.serverHost} answers but the registration hasn't completed yet. Try again in a minute.`
|
||||
: `${t.serverHost} answers (IP authentication: no registration)`;
|
||||
return { registration: reg ? live.registration : 'unknown', rttMs, detail };
|
||||
});
|
||||
|
||||
|
||||
@@ -138,6 +138,9 @@ export async function sendCallReports(d: {
|
||||
aiDoneAt: recordings.aiDoneAt,
|
||||
out: sql<boolean>`exists (select 1 from ${callExtensions} where ${callExtensions.callId} = ${calls.id}
|
||||
and ${callExtensions.extensionId} = ${e.id} and ${callExtensions.role} = 'caller')`,
|
||||
// Made or answered it: only rang means a coworker's conversation (08 §7 #3).
|
||||
heard: sql<boolean>`exists (select 1 from ${callExtensions} where ${callExtensions.callId} = ${calls.id}
|
||||
and ${callExtensions.extensionId} = ${e.id} and ${callExtensions.role} in ('caller', 'answered'))`,
|
||||
})
|
||||
.from(calls)
|
||||
.leftJoin(answerer, eq(answerer.id, calls.answeredByExtensionId))
|
||||
@@ -177,9 +180,9 @@ export async function sendCallReports(d: {
|
||||
toNumber: r.c.toNumber,
|
||||
talkSeconds: r.c.talkSeconds,
|
||||
answeredBy: r.answeredById && r.answeredById !== e.id ? r.answeredBy : null,
|
||||
recorded: r.c.recordingId !== null,
|
||||
summary: r.summary,
|
||||
summaryPending: r.c.recordingId !== null && r.aiDoneAt === null,
|
||||
recorded: r.heard && r.c.recordingId !== null,
|
||||
summary: r.heard ? r.summary : null,
|
||||
summaryPending: r.heard && r.c.recordingId !== null && r.aiDoneAt === null,
|
||||
}));
|
||||
const withSummaries =
|
||||
e.callReportSummaries &&
|
||||
|
||||
@@ -14,6 +14,12 @@ import { callExtensions, calls, cdr, dids, extensions, recordings } from '../db/
|
||||
import { durationMs } from '../media/audio.ts';
|
||||
|
||||
type CdrRow = typeof cdr.$inferSelect;
|
||||
|
||||
/**
|
||||
* The call_extensions roles of someone who was on the call, not just rung: they may hear its
|
||||
* recording and read its transcript and summary (08 §7 #3).
|
||||
*/
|
||||
export const ON_THE_CALL = ['caller', 'answered'];
|
||||
type Tx = Parameters<Parameters<Db['transaction']>[0]>[0];
|
||||
|
||||
/** cdr_manager.conf has usegmtime = yes: "2026-10-18 19:28:37" is UTC. */
|
||||
|
||||
@@ -9,6 +9,7 @@ import { BlockList, isIPv4 } from 'node:net';
|
||||
import type { DiagnosticCheck, NetworkTestDto } from '@selfphoneng/shared';
|
||||
import type { AmiClient } from '../ami/client.ts';
|
||||
import type { Config } from '../config.ts';
|
||||
import { decrypt } from '../crypto/secrets.ts';
|
||||
import type { Db } from '../db/client.ts';
|
||||
import { detectPublicIp } from '../jobs.ts';
|
||||
import { getAllSettings } from './settings.ts';
|
||||
@@ -221,15 +222,23 @@ export async function insideChecks(d: DiagDeps): Promise<DiagnosticCheck[]> {
|
||||
);
|
||||
|
||||
out.push(
|
||||
s['network.probeUrl']
|
||||
? check('probe', 'Network test probe', 'ok', s['network.probeUrl'])
|
||||
: check(
|
||||
!s['network.probeUrl']
|
||||
? check(
|
||||
'probe',
|
||||
'Network test probe',
|
||||
'skip',
|
||||
'None set, so nothing is tested from outside your network.',
|
||||
'Run apps/probe on a machine outside this network (deploy/probe), then put its URL in Settings → Network.',
|
||||
),
|
||||
)
|
||||
: s['network.probeKeyEnc']
|
||||
? check('probe', 'Network test probe', 'ok', `${s['network.probeUrl']}, with its key`)
|
||||
: check(
|
||||
'probe',
|
||||
'Network test probe',
|
||||
'warn',
|
||||
`${s['network.probeUrl']} has no key: anyone who finds it can use it.`,
|
||||
'Settings → Network → Generate key, then set it as PROBE_KEY on the probe and restart it (strongly recommended).',
|
||||
),
|
||||
);
|
||||
return out;
|
||||
}
|
||||
@@ -289,14 +298,20 @@ export async function networkTest(
|
||||
let ip: string | null = null;
|
||||
let results: ProbeResult[] = [];
|
||||
let probeError: string | null = null;
|
||||
let keyRefused = false;
|
||||
const key = s['network.probeKeyEnc'];
|
||||
try {
|
||||
const r = await (d.fetchProbe ?? fetch)(new URL('/v1/check', probe), {
|
||||
method: 'POST',
|
||||
headers: { 'content-type': 'application/json' },
|
||||
headers: {
|
||||
'content-type': 'application/json',
|
||||
...(key && { authorization: `Bearer ${decrypt(key)}` }),
|
||||
},
|
||||
body: JSON.stringify({ host, tests }),
|
||||
signal: AbortSignal.timeout(30_000),
|
||||
});
|
||||
const body = (await r.json()) as { ip?: string; results?: ProbeResult[]; error?: string };
|
||||
keyRefused = r.status === 401;
|
||||
if (!r.ok) probeError = body.error ?? `HTTP ${r.status}`;
|
||||
else ({ ip = null, results = [] } = body as { ip: string; results: ProbeResult[] });
|
||||
// Datagrams sent last arrive just after the answer.
|
||||
@@ -316,7 +331,9 @@ export async function networkTest(
|
||||
'Network test probe',
|
||||
'fail',
|
||||
`${probe} didn't answer: ${probeError}`,
|
||||
'Check the probe runs and is reachable from this server, then try again.',
|
||||
keyRefused
|
||||
? "The probe's PROBE_KEY isn't this server's key. Settings → Network → Generate key, set it as PROBE_KEY on the probe and restart it."
|
||||
: 'Check the probe runs and is reachable from this server, then try again.',
|
||||
),
|
||||
],
|
||||
};
|
||||
|
||||
@@ -121,11 +121,12 @@ async function transcribeMessage(d: VoicemailDeps, row: Row): Promise<string | n
|
||||
async function announce(d: VoicemailDeps, box: Box, found: Row) {
|
||||
const transcript = await transcribeMessage(d, found);
|
||||
const row = { ...found, transcript };
|
||||
// Every mailbox, with or without a user (the live message is only for the user's own).
|
||||
void enqueueWebhook(d.db, 'voicemail.new', {
|
||||
...toVoicemailDto(row),
|
||||
extension: box.number,
|
||||
}).catch((err: unknown) => d.log.error({ err }, 'webhook enqueue failed'));
|
||||
// Every mailbox, with or without a user (the live message is only for the user's own). Not
|
||||
// the transcript: webhooks go off this server, and transcripts never do (10 §1, 08 §7 #6).
|
||||
const { transcript: _words, ...hook } = toVoicemailDto(row);
|
||||
void enqueueWebhook(d.db, 'voicemail.new', { ...hook, extension: box.number }).catch(
|
||||
(err: unknown) => d.log.error({ err }, 'webhook enqueue failed'),
|
||||
);
|
||||
if (box.userId)
|
||||
d.live.emit('message', {
|
||||
type: 'voicemail.new',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// A directory entry → its SelfPhoneNG user (12 §4.3): connected before, or by the directory's
|
||||
// email. Never a new user (owner, 2026-10-25).
|
||||
import { and, eq } from 'drizzle-orm';
|
||||
import { and, eq, notExists } from 'drizzle-orm';
|
||||
import { deleteUserSessions } from '../auth/sessions.ts';
|
||||
import type { Db } from '../db/client.ts';
|
||||
import { userIdentities, users } from '../db/schema.ts';
|
||||
@@ -22,7 +22,21 @@ export async function directoryUserFor(db: Db, e: DirectoryEntry): Promise<UserR
|
||||
.where(and(eq(userIdentities.kind, 'ldap'), eq(userIdentities.subject, e.id)));
|
||||
if (byId) return byId.u;
|
||||
if (!e.email) return null;
|
||||
const [byEmail] = await db.select().from(users).where(eq(users.email, e.email));
|
||||
// Nobody with another way in either: an OpenID user's account is theirs to connect (08 §7 #1).
|
||||
const [byEmail] = await db
|
||||
.select()
|
||||
.from(users)
|
||||
.where(
|
||||
and(
|
||||
eq(users.email, e.email),
|
||||
notExists(
|
||||
db
|
||||
.select({ id: userIdentities.id })
|
||||
.from(userIdentities)
|
||||
.where(eq(userIdentities.userId, users.id)),
|
||||
),
|
||||
),
|
||||
);
|
||||
return byEmail && byEmailOk(byEmail) ? byEmail : null;
|
||||
}
|
||||
|
||||
@@ -35,19 +49,27 @@ export async function directoryUserFor(db: Db, e: DirectoryEntry): Promise<UserR
|
||||
const byEmailOk = (u: UserRow) =>
|
||||
u.role !== 'admin' && (u.passwordHash === null || u.mustChangePassword);
|
||||
|
||||
/** Connect a directory account the person proved (My settings, 12 §4.3). */
|
||||
/**
|
||||
* Connect a directory account the person proved (My settings, 12 §4.3). Not another one in place
|
||||
* of the one they have: the leaver check follows it, so swapping is an admin's job (08 §7 #5).
|
||||
*/
|
||||
export async function connectDirectory(
|
||||
db: Db,
|
||||
log: { info(o: object, m: string): void },
|
||||
userId: string,
|
||||
e: DirectoryEntry,
|
||||
ip: string,
|
||||
): Promise<'connected' | 'taken'> {
|
||||
): Promise<'connected' | 'taken' | 'connected_other'> {
|
||||
const [owner] = await db
|
||||
.select({ userId: userIdentities.userId })
|
||||
.from(userIdentities)
|
||||
.where(and(eq(userIdentities.kind, 'ldap'), eq(userIdentities.subject, e.id)));
|
||||
if (owner && owner.userId !== userId) return 'taken';
|
||||
const [mine] = await db
|
||||
.select({ subject: userIdentities.subject })
|
||||
.from(userIdentities)
|
||||
.where(and(eq(userIdentities.userId, userId), eq(userIdentities.kind, 'ldap')));
|
||||
if (mine && mine.subject !== e.id) return 'connected_other';
|
||||
await db.transaction(async (tx) => {
|
||||
await tx
|
||||
.delete(userIdentities)
|
||||
@@ -101,11 +123,8 @@ export async function directorySignIn(
|
||||
entityId: u.id,
|
||||
summary: `${u.email} connected directory account ${e.dn}`,
|
||||
});
|
||||
} else if (mine.subject !== e.id) {
|
||||
// Their email matches, but another directory account is already theirs: not this one.
|
||||
log.info({ userId: u.id }, `directory entry ${e.dn} matches by email but isn't theirs`);
|
||||
return null;
|
||||
} else
|
||||
// Found by this account's id (directoryUserFor never matches by email someone connected).
|
||||
await db
|
||||
.update(userIdentities)
|
||||
.set({ email: e.email, lastUsedAt: new Date() })
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// A new Asterisk in asterisk/Dockerfile must go through the upgrade check first (verified.ts).
|
||||
import { readFileSync } from 'node:fs';
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import { VERIFIED_ASTERISK, pinnedAsterisk } from './asterisk/verified.ts';
|
||||
|
||||
describe('the pinned Asterisk', () => {
|
||||
it('is the version the upgrade check last passed on', () => {
|
||||
expect(
|
||||
pinnedAsterisk(),
|
||||
`asterisk/Dockerfile pins ${pinnedAsterisk()}, the upgrade check last passed on ` +
|
||||
`${VERIFIED_ASTERISK}. Build the image, run \`pnpm test:asterisk-upgrade\` and ` +
|
||||
'`pnpm test:asterisk`, act on what moved, then set VERIFIED_ASTERISK in ' +
|
||||
'apps/api/test/asterisk/verified.ts',
|
||||
).toBe(VERIFIED_ASTERISK);
|
||||
});
|
||||
|
||||
it('is the one spec 01 §2 names, and its copy of the Dockerfile is the file', () => {
|
||||
const spec = readFileSync(
|
||||
new URL('../../../docs/spec/01-infrastructure.md', import.meta.url),
|
||||
'utf8',
|
||||
);
|
||||
expect(spec).toContain(`**Pinned: \`${pinnedAsterisk()}\``);
|
||||
const copy = /^## 2\. [\s\S]*?^```dockerfile\n([\s\S]*?)^```$/m.exec(spec)?.[1];
|
||||
const file = readFileSync(new URL('../../../asterisk/Dockerfile', import.meta.url), 'utf8');
|
||||
expect(copy, 'spec 01 §2 has a copy of asterisk/Dockerfile: keep it the same').toBe(file);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,311 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// Asterisk upgrade check (01 §2): boot the pinned image and measure each behaviour in verified.ts,
|
||||
// then list every one that moved and what depends on it. A second Asterisk plays a provider on
|
||||
// TLS with a certificate from our own CA for "provider.test", so the qualify check sees a real
|
||||
// host name. Needs Docker and the image built from asterisk/Dockerfile (ASTERISK_IMAGE, default
|
||||
// "selfphoneng-asterisk").
|
||||
// Usage: pnpm test:asterisk-upgrade
|
||||
import { spawnSync } from 'node:child_process';
|
||||
import { cpSync, mkdtempSync, readdirSync, rmSync, writeFileSync, appendFileSync } from 'node:fs';
|
||||
import { tmpdir } from 'node:os';
|
||||
import { join } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { AmiClient } from '../../src/ami/client.ts';
|
||||
import { field, type AmiMessage } from '../../src/ami/events.ts';
|
||||
import { FACTS, VERIFIED_ASTERISK, pinnedAsterisk, type Fact } from './verified.ts';
|
||||
|
||||
const IMAGE = process.env.ASTERISK_IMAGE ?? 'selfphoneng-asterisk';
|
||||
const GOLDEN = fileURLToPath(
|
||||
new URL('../../src/generator/__golden__/one-user/expected', import.meta.url),
|
||||
);
|
||||
const NET = 'sp-upgrade';
|
||||
const PBX = 'sp-upgrade-pbx';
|
||||
const PROVIDER = 'sp-upgrade-provider';
|
||||
const HOST = 'provider.test';
|
||||
const AMI_PORT = 15040;
|
||||
const AMI_SECRET = 'upgrade-test-secret';
|
||||
const SUB = { user: 'upgrade', pass: 'UpgradeSecret42' };
|
||||
const RISKY = ['app_system', 'func_shell', 'app_disa', 'res_agi', 'app_externalivr'];
|
||||
|
||||
const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms));
|
||||
const docker = (...args: string[]) => {
|
||||
const r = spawnSync('docker', args, { encoding: 'utf8' });
|
||||
return { ok: r.status === 0, out: `${r.stdout ?? ''}${r.stderr ?? ''}` };
|
||||
};
|
||||
const log = (...a: unknown[]) => console.log('[upgrade-test]', ...a);
|
||||
async function waitFor(what: string, fn: () => Promise<boolean>, seconds = 60) {
|
||||
for (let i = 0; i < seconds; i++) {
|
||||
if (await fn()) return;
|
||||
await sleep(1000);
|
||||
}
|
||||
throw new Error(`timed out waiting for ${what}`);
|
||||
}
|
||||
|
||||
/** A CA, and a certificate from it for HOST: what the PBX trusts and the provider shows. */
|
||||
function certificates(dir: string) {
|
||||
const r = docker(
|
||||
'run',
|
||||
'--rm',
|
||||
'-v',
|
||||
`${dir}:/out`,
|
||||
'--entrypoint',
|
||||
'sh',
|
||||
IMAGE,
|
||||
'-c',
|
||||
[
|
||||
'cd /out',
|
||||
'openssl req -x509 -newkey rsa:2048 -nodes -days 1 -subj /CN=sp-upgrade-ca -keyout ca.key -out ca.pem',
|
||||
`openssl req -newkey rsa:2048 -nodes -subj /CN=${HOST} -keyout privkey.pem -out host.csr`,
|
||||
`printf 'subjectAltName=DNS:${HOST}' > host.ext`,
|
||||
'openssl x509 -req -in host.csr -CA ca.pem -CAkey ca.key -CAcreateserial -days 1 -extfile host.ext -out fullchain.pem',
|
||||
'chmod 644 *',
|
||||
].join(' && '),
|
||||
);
|
||||
if (!r.ok) throw new Error(`certificates: ${r.out}`);
|
||||
}
|
||||
|
||||
const tlsTransport = (name: string, port: number, client: boolean) => `
|
||||
[${name}]
|
||||
type = transport
|
||||
protocol = tls
|
||||
bind = 0.0.0.0:${port}
|
||||
cert_file = /tls/fullchain.pem
|
||||
priv_key_file = /tls/privkey.pem
|
||||
method = tlsv1_2
|
||||
${client ? 'verify_server = yes\nca_list_file = /tls/ca.pem\n' : ''}`;
|
||||
|
||||
/** The provider: TLS only, one account that may register. */
|
||||
const providerPjsip = `${tlsTransport('transport-tls', 5061, false)}
|
||||
[${SUB.user}]
|
||||
type = endpoint
|
||||
context = default
|
||||
disallow = all
|
||||
allow = ulaw
|
||||
auth = ${SUB.user}-auth
|
||||
aors = ${SUB.user}
|
||||
|
||||
[${SUB.user}-auth]
|
||||
type = auth
|
||||
auth_type = userpass
|
||||
username = ${SUB.user}
|
||||
password = ${SUB.pass}
|
||||
|
||||
[${SUB.user}]
|
||||
type = aor
|
||||
max_contacts = 1
|
||||
remove_existing = yes
|
||||
`;
|
||||
|
||||
/**
|
||||
* Added to the one-user golden config: a trunk to the provider by name over TLS. The registration
|
||||
* is the control (REGISTER verifies the name on every version we know); the AOR's qualify is the
|
||||
* fact being measured.
|
||||
*/
|
||||
const pbxPjsip = `${tlsTransport('sp-upgrade-tls', 5062, true)}
|
||||
[sp-upgrade-auth]
|
||||
type = auth
|
||||
auth_type = userpass
|
||||
username = ${SUB.user}
|
||||
password = ${SUB.pass}
|
||||
|
||||
[sp-upgrade-reg]
|
||||
type = registration
|
||||
transport = sp-upgrade-tls
|
||||
outbound_auth = sp-upgrade-auth
|
||||
server_uri = sip:${HOST}:5061;transport=tls
|
||||
client_uri = sip:${SUB.user}@${HOST}:5061;transport=tls
|
||||
contact_user = ${SUB.user}
|
||||
retry_interval = 5
|
||||
|
||||
[sp-upgrade-trunk]
|
||||
type = aor
|
||||
contact = sip:${HOST}:5061;transport=tls
|
||||
qualify_frequency = 5
|
||||
|
||||
[sp-upgrade-trunk]
|
||||
type = endpoint
|
||||
transport = sp-upgrade-tls
|
||||
outbound_auth = sp-upgrade-auth
|
||||
aors = sp-upgrade-trunk
|
||||
context = sp-upgrade-test
|
||||
`;
|
||||
|
||||
const pbxDialplan = `
|
||||
[sp-upgrade-test]
|
||||
exten => s,1,Answer()
|
||||
same => n,Hangup()
|
||||
`;
|
||||
|
||||
async function main() {
|
||||
const pinned = pinnedAsterisk();
|
||||
const tls = mkdtempSync(join(tmpdir(), 'sp-upgrade-tls-'));
|
||||
const pbxConf = mkdtempSync(join(tmpdir(), 'sp-upgrade-pbx-'));
|
||||
const provConf = mkdtempSync(join(tmpdir(), 'sp-upgrade-prov-'));
|
||||
cpSync(GOLDEN, pbxConf, { recursive: true });
|
||||
appendFileSync(join(pbxConf, 'pjsip_selfphoneng.conf'), pbxPjsip);
|
||||
appendFileSync(join(pbxConf, 'extensions_selfphoneng.conf'), pbxDialplan);
|
||||
for (const f of readdirSync(GOLDEN))
|
||||
writeFileSync(join(provConf, f), f === 'pjsip_selfphoneng.conf' ? providerPjsip : '');
|
||||
writeFileSync(
|
||||
join(pbxConf, 'manager.conf.template'),
|
||||
'[general]\nenabled = yes\nport = 5038\nbindaddr = 0.0.0.0\n\n[selfphoneng]\nsecret = ${AMI_SECRET}\npermit = 0.0.0.0/0.0.0.0\nread = all\nwrite = all\n',
|
||||
);
|
||||
|
||||
const ami = new AmiClient({
|
||||
host: '127.0.0.1',
|
||||
port: AMI_PORT,
|
||||
username: 'selfphoneng',
|
||||
secret: AMI_SECRET,
|
||||
logger: { info() {}, warn() {}, error() {}, debug() {} },
|
||||
backoffMs: [500],
|
||||
});
|
||||
const asterisk = (name: string, conf: string, extra: string[]) =>
|
||||
docker(
|
||||
'run',
|
||||
'-d',
|
||||
'--rm',
|
||||
'--name',
|
||||
name,
|
||||
'--network',
|
||||
NET,
|
||||
...extra,
|
||||
'-e',
|
||||
`AMI_SECRET=${AMI_SECRET}`,
|
||||
'-v',
|
||||
`${conf}:/etc/asterisk/selfphoneng`,
|
||||
'-v',
|
||||
`${tls}:/tls:ro`,
|
||||
IMAGE,
|
||||
);
|
||||
const booted = (name: string) =>
|
||||
waitFor(
|
||||
`${name} to boot`,
|
||||
async () => docker('exec', name, 'asterisk', '-rx', 'core waitfullybooted').ok,
|
||||
);
|
||||
|
||||
const seen = {} as Record<Fact, boolean>;
|
||||
const problems: string[] = [];
|
||||
try {
|
||||
docker('rm', '-f', PBX, PROVIDER);
|
||||
docker('network', 'create', NET);
|
||||
certificates(tls);
|
||||
const prov = asterisk(PROVIDER, provConf, ['--network-alias', HOST]);
|
||||
if (!prov.ok) throw new Error(`provider: ${prov.out}`);
|
||||
await booted(PROVIDER);
|
||||
const pbx = asterisk(PBX, pbxConf, [
|
||||
'-p',
|
||||
`127.0.0.1:${AMI_PORT}:5038`,
|
||||
'-v',
|
||||
`${join(pbxConf, 'manager.conf.template')}:/etc/asterisk/manager.conf.template:ro`,
|
||||
]);
|
||||
if (!pbx.ok) throw new Error(`pbx: ${pbx.out}`);
|
||||
await booted(PBX);
|
||||
|
||||
const running = docker('exec', PBX, 'asterisk', '-V').out.trim();
|
||||
if (running !== `Asterisk ${pinned}`)
|
||||
throw new Error(
|
||||
`the image runs "${running}" but asterisk/Dockerfile pins ${pinned}: rebuild it ` +
|
||||
`(docker build -t ${IMAGE} asterisk)`,
|
||||
);
|
||||
log(`${running}, last verified on ${VERIFIED_ASTERISK}`);
|
||||
|
||||
ami.start();
|
||||
await new Promise((r) => ami.once('connected', r));
|
||||
const cli = (cmd: string) => ami.command(cmd);
|
||||
|
||||
const modules = await Promise.all(RISKY.map((m) => cli(`module show like ${m}`)));
|
||||
seen.riskyModulesGone = modules.every((o) => /\b0 modules loaded/.test(o));
|
||||
const ep101 = await cli('pjsip show endpoint 101');
|
||||
seen.mwiSubscribeReplaces = /mwi_subscribe_replaces_unsolicited\s*:\s*yes/.test(ep101);
|
||||
// set_var lines show as their own rows: " __SP_DIRECTION : internal".
|
||||
seen.setVarKeepsUnderscores = /^\s*__SP_DIRECTION\s*:\s*internal\s*$/m.test(ep101);
|
||||
const commands = await cli('manager show commands');
|
||||
seen.voicemailMoveRemove =
|
||||
/\bVoicemailMove\b/.test(commands) && /\bVoicemailRemove\b/.test(commands);
|
||||
|
||||
// CDR: one Local call through the test context.
|
||||
const cdr = new Promise<AmiMessage>((r) => ami.once('event:Cdr', r));
|
||||
await cli('channel originate Local/s@sp-upgrade-test application Wait 1');
|
||||
const m = await Promise.race([
|
||||
cdr,
|
||||
sleep(15_000).then(() => {
|
||||
throw new Error('no Cdr event within 15 s of a call');
|
||||
}),
|
||||
]);
|
||||
seen.cdrLinkedId = !!field(m, 'LinkedID');
|
||||
const start = field(m, 'StartTime') ?? '';
|
||||
seen.cdrTimesUtcNoZone =
|
||||
/^\d{4}-\d\d-\d\d \d\d:\d\d:\d\d$/.test(start) &&
|
||||
Math.abs(Date.parse(`${start.replace(' ', 'T')}Z`) - Date.now()) < 120_000;
|
||||
|
||||
// TLS: the registration must work first, or the qualify answer says nothing.
|
||||
await waitFor(
|
||||
'the TLS registration to the provider (the control)',
|
||||
async () => /sp-upgrade-reg\S*\s.*Registered/.test(await cli('pjsip show registrations')),
|
||||
45,
|
||||
).catch(async (e: Error) => {
|
||||
throw new Error(`${e.message}:\n${await cli('pjsip show registrations')}`);
|
||||
});
|
||||
let contacts = '';
|
||||
for (let i = 0; i < 20; i++) {
|
||||
contacts = await cli('pjsip show contacts');
|
||||
if (/sp-upgrade-trunk\/\S+\s.*\b(Avail|Unavail)/.test(contacts)) break;
|
||||
await sleep(1000);
|
||||
}
|
||||
seen.tlsQualifyByHostname = /sp-upgrade-trunk\/\S+\s.*\bAvail\b/.test(contacts);
|
||||
if (!seen.tlsQualifyByHostname) {
|
||||
const why = docker('logs', PBX)
|
||||
// eslint-disable-next-line no-control-regex -- strips Asterisk's ANSI colors
|
||||
.out.replace(/\x1b\[[0-9;]*m/g, '')
|
||||
.split('\n');
|
||||
const line = contacts.split('\n').find((l) => l.includes('sp-upgrade-trunk'));
|
||||
log('qualify over TLS failed:', line);
|
||||
for (const l of why
|
||||
.filter((x) => /sp-upgrade-trunk|identity|EUNSUP|qualif/i.test(x))
|
||||
.slice(-4))
|
||||
log(l.trim());
|
||||
}
|
||||
|
||||
const listed = await ami.actionList({ Action: 'PJSIPShowContacts' });
|
||||
seen.staticContactsInShowContacts = listed.some((x) => x.Aor === 'sp-upgrade-trunk');
|
||||
const detail = await ami.actionList({
|
||||
Action: 'PJSIPShowEndpoint',
|
||||
Endpoint: 'sp-upgrade-trunk',
|
||||
});
|
||||
seen.endpointShowsContactStatus = detail.some(
|
||||
(x) => x.Event === 'ContactStatusDetail' && x.AOR === 'sp-upgrade-trunk',
|
||||
);
|
||||
} catch (e) {
|
||||
problems.push((e as Error).message);
|
||||
} finally {
|
||||
ami.stop();
|
||||
docker('rm', '-f', PBX, PROVIDER);
|
||||
docker('network', 'rm', NET);
|
||||
for (const d of [tls, pbxConf, provConf]) rmSync(d, { recursive: true, force: true });
|
||||
}
|
||||
|
||||
const moved = (Object.keys(FACTS) as Fact[]).filter(
|
||||
(k) => k in seen && seen[k] !== FACTS[k].expect,
|
||||
);
|
||||
for (const k of Object.keys(FACTS) as Fact[])
|
||||
console.log(
|
||||
`${!(k in seen) ? '? ' : moved.includes(k) ? 'MOVED' : 'ok '} ${k}: ${k in seen ? seen[k] : 'not measured'}`,
|
||||
);
|
||||
for (const k of moved)
|
||||
problems.push(
|
||||
`${k} was ${FACTS[k].expect} on ${VERIFIED_ASTERISK}, is ${seen[k]} on ${pinned}: ` +
|
||||
`${FACTS[k].what}. Depends on it: ${FACTS[k].where}`,
|
||||
);
|
||||
if (problems.length) {
|
||||
console.log('FAIL asterisk upgrade');
|
||||
for (const p of problems) console.log(` ${p}`);
|
||||
process.exit(1);
|
||||
}
|
||||
console.log(
|
||||
pinned === VERIFIED_ASTERISK
|
||||
? `ok asterisk ${pinned}: every fact as recorded`
|
||||
: `ok asterisk ${pinned}: nothing moved since ${VERIFIED_ASTERISK}; set VERIFIED_ASTERISK in verified.ts`,
|
||||
);
|
||||
}
|
||||
|
||||
await main();
|
||||
@@ -0,0 +1,68 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// What the code relies on Asterisk doing, as last measured by upgrade-test.ts, and on which
|
||||
// version. asterisk-version.test.ts fails when asterisk/Dockerfile pins another version: run
|
||||
// `pnpm test:asterisk-upgrade` on the new image, act on each change it lists, then update this.
|
||||
import { readFileSync } from 'node:fs';
|
||||
|
||||
export const VERIFIED_ASTERISK = '24.0.0-rc3';
|
||||
|
||||
/** The version asterisk/Dockerfile builds. */
|
||||
export function pinnedAsterisk(): string {
|
||||
const file = readFileSync(new URL('../../../../asterisk/Dockerfile', import.meta.url), 'utf8');
|
||||
const v = /^ARG ASTERISK_VERSION=(\S+)$/m.exec(file)?.[1];
|
||||
if (!v) throw new Error('asterisk/Dockerfile has no ARG ASTERISK_VERSION');
|
||||
return v;
|
||||
}
|
||||
|
||||
/** `expect`: the answer on VERIFIED_ASTERISK. `where`: what depends on it, to change if it moves. */
|
||||
export const FACTS = {
|
||||
riskyModulesGone: {
|
||||
expect: true,
|
||||
what: 'app_system, func_shell, app_disa, res_agi and app_externalivr are not loaded',
|
||||
where: 'asterisk/conf/modules.conf noload lines (08 §6): a renamed module would load again',
|
||||
},
|
||||
mwiSubscribeReplaces: {
|
||||
expect: true,
|
||||
what: 'endpoints take mwi_subscribe_replaces_unsolicited',
|
||||
where: 'generator/pjsip.ts: without it a phone that SUBSCRIBEs for MWI gets a 500 (03 §5.2)',
|
||||
},
|
||||
setVarKeepsUnderscores: {
|
||||
expect: true,
|
||||
what: 'set_var = __SP_DIRECTION=… loads as "__SP_DIRECTION"',
|
||||
where: 'generator/pjsip.ts set_var lines; dialplan reads SP_DIRECTION on dialed legs (03 §5.2)',
|
||||
},
|
||||
staticContactsInShowContacts: {
|
||||
expect: false,
|
||||
what: 'PJSIPShowContacts lists static (contact =) AOR contacts',
|
||||
where: 'live/state.ts reads trunk reachability from PJSIPShowEndpoint instead (04 §5.1)',
|
||||
},
|
||||
endpointShowsContactStatus: {
|
||||
expect: true,
|
||||
what: 'PJSIPShowEndpoint has a ContactStatusDetail for a static contact',
|
||||
where: 'live/state.ts trunk reachability (04 §5.1)',
|
||||
},
|
||||
voicemailMoveRemove: {
|
||||
expect: true,
|
||||
what: 'the AMI actions VoicemailMove and VoicemailRemove exist',
|
||||
where: 'services/voicemail.ts mark read and delete (04 §5.6)',
|
||||
},
|
||||
cdrLinkedId: {
|
||||
expect: true,
|
||||
what: 'Cdr AMI events carry LinkedID (cdr_manager.conf mapping)',
|
||||
where: 'services/cdr.ts groups a call by it (01 §3.15, 04 §5.4)',
|
||||
},
|
||||
cdrTimesUtcNoZone: {
|
||||
expect: true,
|
||||
what: 'Cdr StartTime is "YYYY-MM-DD HH:MM:SS" in UTC, no zone',
|
||||
where: 'services/cdr.ts utc() adds the Z itself',
|
||||
},
|
||||
tlsQualifyByHostname: {
|
||||
expect: true,
|
||||
what: 'a qualify OPTIONS over TLS checks the certificate against the host name, not the IP',
|
||||
where:
|
||||
'generator/pjsip.ts qualifies TLS trunks and Test sends PJSIPQualify (08 §2.1). False on ' +
|
||||
'24.0.0-rc2: a TLS trunk then showed as unreachable, so it had qualify_frequency = 0',
|
||||
},
|
||||
} as const;
|
||||
|
||||
export type Fact = keyof typeof FACTS;
|
||||
@@ -1,25 +1,32 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// M6-T8: /api/blocked-numbers and the AstDB mirror (04 §5.5).
|
||||
// M6-T8: /api/blocked-numbers and the AstDB mirror (04 §5.5); users' Report spam (05 §4).
|
||||
import type { LightMyRequestResponse } from 'fastify';
|
||||
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
|
||||
import { callExtensions, calls, extensions } from '../src/db/schema.ts';
|
||||
import { encrypt } from '../src/crypto/secrets.ts';
|
||||
import { syncAstDb } from '../src/services/astdb.ts';
|
||||
import { hasTestDb } from './db.ts';
|
||||
import { ADMIN, H, createTestApp } from './app.ts';
|
||||
|
||||
describe.skipIf(!hasTestDb)('/api/blocked-numbers', () => {
|
||||
let t: Awaited<ReturnType<typeof createTestApp>>;
|
||||
let req: (method: string, url: string, payload?: unknown) => Promise<LightMyRequestResponse>;
|
||||
let req: (
|
||||
method: string,
|
||||
url: string,
|
||||
payload?: unknown,
|
||||
as?: string,
|
||||
) => Promise<LightMyRequestResponse>;
|
||||
|
||||
beforeAll(async () => {
|
||||
t = await createTestApp();
|
||||
await t.clearMustChange(ADMIN.email);
|
||||
const cookie = await t.login(ADMIN.email, ADMIN.password);
|
||||
req = (method, url, payload) =>
|
||||
req = (method, url, payload, as = cookie) =>
|
||||
t.app.inject({
|
||||
method: method as 'GET',
|
||||
url,
|
||||
payload: payload as object,
|
||||
headers: { ...H, cookie },
|
||||
headers: { ...H, cookie: as },
|
||||
});
|
||||
});
|
||||
afterAll(() => t?.close());
|
||||
@@ -59,4 +66,62 @@ describe.skipIf(!hasTestDb)('/api/blocked-numbers', () => {
|
||||
});
|
||||
expect((await req('GET', '/api/blocked-numbers')).json().items).toEqual([]);
|
||||
});
|
||||
|
||||
it('Report spam: only on an outside call that rang me; Block clears it, Dismiss drops it', async () => {
|
||||
const sam = await t.addUser('sam@example.com', 'sam-password-123');
|
||||
await t.addUser('pat@example.com', 'pat-password-123');
|
||||
const [ext] = await t.db
|
||||
.insert(extensions)
|
||||
.values({
|
||||
number: '103',
|
||||
name: 'Sam',
|
||||
sipPasswordEnc: encrypt('x'),
|
||||
voicemailPinEnc: encrypt('4826'),
|
||||
userId: sam.id,
|
||||
})
|
||||
.returning();
|
||||
const call = async (linkedid: string, from: string | null, role: string) => {
|
||||
const [c] = await t.db
|
||||
.insert(calls)
|
||||
.values({
|
||||
linkedid,
|
||||
direction: 'inbound',
|
||||
status: 'answered',
|
||||
fromNumber: from,
|
||||
startedAt: new Date(),
|
||||
endedAt: new Date(),
|
||||
})
|
||||
.returning();
|
||||
await t.db.insert(callExtensions).values({ callId: c!.id, extensionId: ext!.id, role });
|
||||
return c!.id;
|
||||
};
|
||||
const robo = await call('r1', '13125550142', 'rang');
|
||||
const hidden = await call('r2', null, 'answered');
|
||||
const samC = await t.login('sam@example.com', 'sam-password-123');
|
||||
const patC = await t.login('pat@example.com', 'pat-password-123');
|
||||
const report = (callId: string, as: string, reason = 'Car warranty robocall') =>
|
||||
req('POST', '/api/me/spam-reports', { callId, reason }, as);
|
||||
|
||||
expect((await report(robo, patC)).statusCode).toBe(404); // not a call that rang Pat
|
||||
expect((await report(robo, samC, ' ')).statusCode).toBe(400); // no reason
|
||||
expect((await report(hidden, samC)).statusCode).toBe(400); // no number to block
|
||||
expect((await report(robo, samC)).statusCode).toBe(201);
|
||||
expect((await report(robo, samC)).statusCode).toBe(409); // once each
|
||||
expect((await req('GET', '/api/spam-reports', undefined, samC)).statusCode).toBe(403);
|
||||
const [r] = (await req('GET', '/api/spam-reports')).json().items;
|
||||
expect(r).toMatchObject({
|
||||
number: '13125550142',
|
||||
reason: 'Car warranty robocall',
|
||||
reportedBy: 'sam@example.com',
|
||||
});
|
||||
|
||||
expect((await req('DELETE', `/api/spam-reports/${r.id}`)).statusCode).toBe(200);
|
||||
expect((await req('GET', '/api/spam-reports')).json().items).toEqual([]);
|
||||
|
||||
expect((await report(robo, samC)).statusCode).toBe(201); // dismissed: may report again
|
||||
const b = await req('POST', '/api/blocked-numbers', { number: r.number, reason: r.reason });
|
||||
expect(b.statusCode).toBe(201);
|
||||
expect((await req('GET', '/api/spam-reports')).json().items).toEqual([]);
|
||||
expect((await report(robo, samC)).statusCode).toBe(409); // already blocked
|
||||
});
|
||||
});
|
||||
@@ -181,4 +181,43 @@ describe.skipIf(!hasTestDb)('call report email', () => {
|
||||
await run('2026-10-23T13:06:00Z');
|
||||
expect(t.mails[1]!.text).not.toContain('quote');
|
||||
});
|
||||
|
||||
it('no recording or summary of a call that only rang my phone (08 §7 #3)', async () => {
|
||||
await dan('PATCH', '/api/me', { callReportSummaries: true });
|
||||
const [rec] = await t.db
|
||||
.insert(recordings)
|
||||
.values({
|
||||
linkedid: 'r4',
|
||||
filePath: '2026/10/24/r4.wav',
|
||||
startedAt: new Date('2026-10-24T15:00:00Z'),
|
||||
summary: 'Secret pricing for Acme',
|
||||
aiDoneAt: new Date(),
|
||||
})
|
||||
.returning();
|
||||
const [c] = await t.db
|
||||
.insert(calls)
|
||||
.values({
|
||||
linkedid: 'c4', // the ring group rang Dan; a coworker answered and talked
|
||||
direction: 'inbound',
|
||||
status: 'answered',
|
||||
startedAt: new Date('2026-10-24T15:00:00Z'),
|
||||
endedAt: new Date('2026-10-24T15:05:00Z'),
|
||||
fromNumber: '13125557777',
|
||||
talkSeconds: 300,
|
||||
recordingId: rec!.id,
|
||||
})
|
||||
.returning();
|
||||
await t.db.insert(callExtensions).values({ callId: c!.id, extensionId: extId, role: 'rang' });
|
||||
await t.db
|
||||
.update(extensions)
|
||||
.set({ callReportSentAt: new Date('2026-10-24T13:00:00Z') })
|
||||
.where(eq(extensions.id, extId));
|
||||
t.mails.length = 0;
|
||||
expect(await run('2026-10-25T13:06:00Z')).toBe(1);
|
||||
const text = t.mails[0]!.text;
|
||||
expect(text).toContain('Incoming from (312) 555-7777');
|
||||
expect(text).not.toContain('Secret pricing');
|
||||
expect(text).not.toContain('recorded');
|
||||
expect(text).not.toContain('Summary not ready');
|
||||
});
|
||||
});
|
||||
@@ -460,6 +460,19 @@ describe.skipIf(!hasTestDb)('contacts in Contrack', () => {
|
||||
fake.state.readOnly.clear();
|
||||
expect(await run()).toBe(0);
|
||||
expect(jane).toHaveLength(8);
|
||||
|
||||
// Only rang Dan (a coworker took it): on his timeline, but not its recording or summary.
|
||||
const [k12] = await t.db
|
||||
.insert(calls)
|
||||
.values(call('k12', 1.5, { recordingId: done!.id }))
|
||||
.returning();
|
||||
await t.db
|
||||
.insert(callExtensions)
|
||||
.values({ callId: k12!.id, extensionId: ext!.id, role: 'rang' });
|
||||
forgetBook(danId);
|
||||
expect(await run()).toBe(1);
|
||||
expect(jane.at(-1)!.content).not.toMatch(/recorded|Acme/);
|
||||
expect(jane.at(-1)).not.toHaveProperty('actionItem');
|
||||
});
|
||||
|
||||
it('contacts from before Contrack are copied once, the builtin ones kept (C6)', async () => {
|
||||
@@ -521,4 +534,35 @@ describe.skipIf(!hasTestDb)('contacts in Contrack', () => {
|
||||
]);
|
||||
expect((await dan('GET', '/api/me')).json().contrack).toBeNull();
|
||||
});
|
||||
|
||||
it('the saved tokens only go to the address they were saved for (08 §7 #7)', async () => {
|
||||
// Another machine on the network that answers like Contrack, and notes what it's sent.
|
||||
const heard: string[] = [];
|
||||
const other = createServer((req, res) => {
|
||||
heard.push(String(req.headers.authorization ?? ''));
|
||||
res.setHeader('content-type', 'application/json');
|
||||
res.end('[]');
|
||||
});
|
||||
await new Promise<void>((ok) => other.listen(0, '127.0.0.1', ok));
|
||||
const otherUrl = `http://127.0.0.1:${(other.address() as AddressInfo).port}`;
|
||||
try {
|
||||
await admin('POST', '/api/contacts/contrack/test', { url: otherUrl });
|
||||
expect(heard.join(' ')).not.toContain('ctk_company');
|
||||
// A new address needs its token typed again…
|
||||
const kept = await admin('PATCH', '/api/settings', {
|
||||
'contacts.contrack': { url: otherUrl },
|
||||
});
|
||||
expect(kept.statusCode).toBe(400);
|
||||
expect(kept.json().error.message).toMatch(/token again/);
|
||||
// …and people's own tokens are for the old one: they connect again.
|
||||
const moved = await admin('PATCH', '/api/settings', {
|
||||
'contacts.contrack': { url: otherUrl, companyToken: 'ctk_new_place' },
|
||||
});
|
||||
expect(moved.statusCode, moved.body).toBe(200);
|
||||
const [d] = await t.db.select().from(users).where(eq(users.id, danId));
|
||||
expect(d!.contrackTokenEnc).toBeNull();
|
||||
} finally {
|
||||
other.close();
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -154,4 +154,55 @@ describe.skipIf(!hasTestDb)('diagnostics', () => {
|
||||
401,
|
||||
);
|
||||
});
|
||||
|
||||
it('the probe key: made here, shown once, sent to the probe, never in settings (08 §7 #9)', async () => {
|
||||
const cookie = await t.login(ADMIN.email, ADMIN.password);
|
||||
const as = (method: string, url: string, payload?: object) =>
|
||||
t.app.inject({ method: method as 'GET', url, payload, headers: { ...H, cookie } });
|
||||
await setSetting(t.db, 'network.probeUrl', 'https://probe.test');
|
||||
// No key yet: the inside checks say to make one.
|
||||
expect(byId(await insideChecks(deps)).probe).toMatchObject({ status: 'warn' });
|
||||
|
||||
const g = await as('POST', '/api/settings/network/probe-key');
|
||||
expect(g.statusCode, g.body).toBe(200);
|
||||
const { key } = g.json() as { key: string };
|
||||
expect(key).toMatch(/^[A-Za-z0-9_-]{43}$/);
|
||||
const s = await as('GET', '/api/settings');
|
||||
expect(s.json()['network.hasProbeKey']).toBe(true);
|
||||
expect(s.body).not.toContain(key);
|
||||
expect(s.json()).not.toHaveProperty('network.probeKeyEnc');
|
||||
expect((await as('PATCH', '/api/settings', { 'network.probeKeyEnc': 'x' })).statusCode).toBe(
|
||||
400,
|
||||
);
|
||||
expect(byId(await insideChecks(deps)).probe).toMatchObject({ status: 'ok' });
|
||||
|
||||
let auth: string | null = null;
|
||||
await networkTest(
|
||||
{
|
||||
...deps,
|
||||
fetchProbe: (async (_u: URL, init: RequestInit) => {
|
||||
auth = new Headers(init.headers).get('authorization');
|
||||
return new Response(JSON.stringify({ ip: '203.0.113.10', results: [] }));
|
||||
}) as unknown as typeof fetch,
|
||||
},
|
||||
'quick',
|
||||
);
|
||||
expect(auth).toBe(`Bearer ${key}`);
|
||||
// The probe refusing it says what to do.
|
||||
const refused = await networkTest(
|
||||
{
|
||||
...deps,
|
||||
fetchProbe: (async () =>
|
||||
new Response(JSON.stringify({ error: 'a key is needed' }), {
|
||||
status: 401,
|
||||
})) as unknown as typeof fetch,
|
||||
},
|
||||
'quick',
|
||||
);
|
||||
expect(byId(refused.checks).probe!.fix).toContain('PROBE_KEY');
|
||||
|
||||
// Another address: the key was for the old probe, so it's gone.
|
||||
await as('PATCH', '/api/settings', { 'network.probeUrl': 'https://other-probe.test' });
|
||||
expect((await as('GET', '/api/settings')).json()['network.hasProbeKey']).toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -1,12 +1,13 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// 12 §4.3: who a directory entry may connect to by email, who may disconnect it (§4.5), and a
|
||||
// directory that's down counting as a failed sign-in (§4.2).
|
||||
// directory that's down counting as a failed sign-in (§4.2). 08 §7: no OpenID user by email, no
|
||||
// swapping the connected account.
|
||||
import { eq } from 'drizzle-orm';
|
||||
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
|
||||
import { resetLoginLimiter } from '../src/auth/login-limiter.ts';
|
||||
import { userIdentities, users } from '../src/db/schema.ts';
|
||||
import { setSetting } from '../src/services/settings.ts';
|
||||
import { directorySignIn } from '../src/sso/directory.ts';
|
||||
import { connectDirectory, directorySignIn } from '../src/sso/directory.ts';
|
||||
import type { DirectoryEntry } from '../src/sso/ldap.ts';
|
||||
import { hasTestDb } from './db.ts';
|
||||
import { ADMIN, H, createTestApp } from './app.ts';
|
||||
@@ -52,6 +53,38 @@ describe.skipIf(!hasTestDb)('directory accounts by email (12 §4.3)', () => {
|
||||
}
|
||||
});
|
||||
|
||||
it('never connects by email someone who signs in with OpenID (08 §7 #1)', async () => {
|
||||
// A directory that lets people edit their own mail: Mallory's entry, the victim's email.
|
||||
const victim = await t.addUser('oidc-only@example.com', 'unused-pw-2');
|
||||
await t.db.update(users).set({ passwordHash: null }).where(eq(users.id, victim.id));
|
||||
await t.db
|
||||
.insert(userIdentities)
|
||||
.values({ userId: victim.id, kind: 'oidc', subject: 'https://idp victim-sub' });
|
||||
expect(await directorySignIn(t.db, log, entry(victim.email), '127.0.0.1')).toBeNull();
|
||||
expect(await connected(victim.id)).toBe(1); // the OpenID account only
|
||||
});
|
||||
|
||||
it('a connected directory account is only swapped by an admin (08 §7 #5)', async () => {
|
||||
const u = await t.addUser('swapper@example.com', 'swapper-password-1');
|
||||
expect(await connectDirectory(t.db, log, u.id, entry(u.email), '127.0.0.1')).toBe('connected');
|
||||
const [first] = await t.db.select().from(userIdentities).where(eq(userIdentities.userId, u.id));
|
||||
// The same account again is fine; another one (a shared mailbox) is not.
|
||||
expect(
|
||||
await connectDirectory(
|
||||
t.db,
|
||||
log,
|
||||
u.id,
|
||||
{ ...entry(u.email), id: first!.subject },
|
||||
'127.0.0.1',
|
||||
),
|
||||
).toBe('connected');
|
||||
expect(await connectDirectory(t.db, log, u.id, entry('shared@example.com'), '127.0.0.1')).toBe(
|
||||
'connected_other',
|
||||
);
|
||||
const now = await t.db.select().from(userIdentities).where(eq(userIdentities.userId, u.id));
|
||||
expect(now.map((i) => i.subject)).toEqual([first!.subject]);
|
||||
});
|
||||
|
||||
it('only an admin can disconnect a directory account (a leaver must stay checked)', async () => {
|
||||
const u = await t.addUser('leaver@example.com', 'leaver-password-1');
|
||||
await t.db.insert(userIdentities).values({ userId: u.id, kind: 'ldap', subject: 'leaver-id' });
|
||||
|
||||
@@ -207,6 +207,56 @@ for (const alg of ['RS256', 'ES256'] as const)
|
||||
expect(ids).toMatchObject([{ kind: 'oidc', subject: `${idp.issuer} u-cara` }]);
|
||||
});
|
||||
|
||||
it('never matches by email an admin, or someone with a directory account (08 §7 #2)', async () => {
|
||||
const [boss, dir] = await t.db
|
||||
.insert(users)
|
||||
.values([
|
||||
{ email: 'diradmin@example.com', displayName: 'Boss', passwordHash: null, role: 'admin' },
|
||||
{ email: 'diruser@example.com', displayName: 'Dir', passwordHash: null },
|
||||
])
|
||||
.returning();
|
||||
await t.db
|
||||
.insert(userIdentities)
|
||||
.values({ userId: dir!.id, kind: 'ldap', subject: 'dir-user-id' });
|
||||
for (const u of [boss!, dir!]) {
|
||||
idp.st.user = { sub: `u-${u.email}`, email: u.email, email_verified: true };
|
||||
const { callback } = await flow();
|
||||
expect(errorOf(callback!)).toBe('not_connected');
|
||||
expect(session(callback!)).toBeNull();
|
||||
}
|
||||
});
|
||||
|
||||
it('connect finishes only in the browser whose session asked (08 §7 #8)', async () => {
|
||||
// Mallory starts Connect, then plants her sp_oidc cookie in Vic's browser and sends him on.
|
||||
await t.addUser('mallory@example.com', 'mallory-password-1');
|
||||
const [m] = await t.db.select().from(users).where(eq(users.email, 'mallory@example.com'));
|
||||
await t.addUser('vic@example.com', 'vic-password-123');
|
||||
const mallory = await t.login('mallory@example.com', 'mallory-password-1');
|
||||
const vic = await t.login('vic@example.com', 'vic-password-123');
|
||||
idp.st.user = { sub: 'u-vic', email: 'vic@example.com', email_verified: true };
|
||||
for (const theirs of [vic, '']) {
|
||||
const start = await t.app.inject({
|
||||
method: 'POST',
|
||||
url: '/api/auth/oidc/connect',
|
||||
headers: { ...H, cookie: mallory },
|
||||
payload: {},
|
||||
});
|
||||
const pending = start.cookies.find((c) => c.name === 'sp_oidc')!;
|
||||
const atIdp = await fetch((start.json() as { url: string }).url, { redirect: 'manual' });
|
||||
const back = new URL(atIdp.headers.get('location')!);
|
||||
const callback = await t.app.inject({
|
||||
url: back.pathname + back.search,
|
||||
headers: { cookie: [`sp_oidc=${pending.value}`, theirs].filter(Boolean).join('; ') },
|
||||
});
|
||||
expect(errorOf(callback)).toBe('expired');
|
||||
const ids = await t.db
|
||||
.select()
|
||||
.from(userIdentities)
|
||||
.where(eq(userIdentities.userId, m!.id));
|
||||
expect(ids).toEqual([]);
|
||||
}
|
||||
});
|
||||
|
||||
it('trustEmail matches an unverified email', async () => {
|
||||
await t.db
|
||||
.insert(users)
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// M7-T3: a recorded call (sp_recording) is linked to its calls row and playable by admins and the
|
||||
// people on the call; delete and retention remove file and row.
|
||||
// people on the call (not a phone that only rang, 08 §7 #3); delete and retention remove file and row.
|
||||
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
|
||||
import { join } from 'node:path';
|
||||
import { eq } from 'drizzle-orm';
|
||||
import type { LightMyRequestResponse } from 'fastify';
|
||||
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
|
||||
import type { AmiMessage } from '../src/ami/events.ts';
|
||||
import { calls, cdr, extensions, recordings } from '../src/db/schema.ts';
|
||||
import { callExtensions, calls, cdr, extensions, recordings, users } from '../src/db/schema.ts';
|
||||
import { encrypt } from '../src/crypto/secrets.ts';
|
||||
import { cleanupRecordings } from '../src/routes/recordings.ts';
|
||||
import { aggregateCall, toCdrRow } from '../src/services/cdr.ts';
|
||||
@@ -56,6 +56,8 @@ describe.skipIf(!hasTestDb)('call recordings', () => {
|
||||
};
|
||||
});
|
||||
afterAll(() => t?.close());
|
||||
const bobId = async () =>
|
||||
(await t.db.select().from(users).where(eq(users.email, 'bob@example.com')))[0]!.id;
|
||||
|
||||
it('the recording is linked to its call, with size and length', async () => {
|
||||
const [c] = await t.db.select().from(calls);
|
||||
@@ -91,6 +93,26 @@ describe.skipIf(!hasTestDb)('call recordings', () => {
|
||||
expect((await as.alice('GET', '/api/recordings')).statusCode).toBe(403);
|
||||
});
|
||||
|
||||
it('a phone that only rang (ring group, queue) gets neither audio nor transcript (08 §7 #3)', async () => {
|
||||
const [bob] = await t.db
|
||||
.insert(extensions)
|
||||
.values({
|
||||
number: '102',
|
||||
name: 'Bob',
|
||||
userId: await bobId(),
|
||||
sipPasswordEnc: encrypt('x'),
|
||||
voicemailPinEnc: encrypt('4826'),
|
||||
})
|
||||
.returning();
|
||||
const [c] = await t.db.select().from(calls);
|
||||
await t.db.insert(callExtensions).values({ callId: c!.id, extensionId: bob!.id, role: 'rang' });
|
||||
expect((await as.bob('GET', `/api/recordings/${recId}/audio`)).statusCode).toBe(403);
|
||||
expect((await as.bob('GET', `/api/recordings/${recId}/transcript`)).statusCode).toBe(403);
|
||||
const mine = (await as.bob('GET', '/api/me/calls')).json();
|
||||
expect(mine.items).toEqual([expect.objectContaining({ id: c!.id, recordingId: null })]);
|
||||
expect((await as.alice('GET', `/api/recordings/${recId}/transcript`)).statusCode).toBe(200);
|
||||
});
|
||||
|
||||
it('retention deletes recordings past their days; delete removes file and link', async () => {
|
||||
expect(await cleanupRecordings(t.db, dir(), 3650)).toBe(0);
|
||||
expect((await as.admin('DELETE', `/api/recordings/${recId}`)).statusCode).toBe(200);
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// M11-T6: /api/reports/summary and /api/reports/queues (04 §7.3), days in the company time zone.
|
||||
// M11-T6: /api/reports/summary and /api/reports/queues (04 §7.3), days in the company time zone;
|
||||
// /api/me/reports/summary, the calls made to me.
|
||||
import type { LightMyRequestResponse } from 'fastify';
|
||||
import { inArray } from 'drizzle-orm';
|
||||
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
|
||||
import { calls, queueCalls, queues } from '../src/db/schema.ts';
|
||||
import { callExtensions, calls, extensions, queueCalls, queues } from '../src/db/schema.ts';
|
||||
import { encrypt } from '../src/crypto/secrets.ts';
|
||||
import { setSetting } from '../src/services/settings.ts';
|
||||
import { hasTestDb } from './db.ts';
|
||||
import { ADMIN, H, createTestApp } from './app.ts';
|
||||
@@ -125,5 +128,74 @@ describe.skipIf(!hasTestDb)('/api/reports', () => {
|
||||
await t.addUser('pat@example.com', 'pat-password-123');
|
||||
const pat = await t.login('pat@example.com', 'pat-password-123');
|
||||
expect((await get('/api/reports/queues', pat)).statusCode).toBe(403);
|
||||
expect((await get('/api/me/reports/summary', pat)).statusCode).toBe(404); // no extension
|
||||
});
|
||||
|
||||
it('mine: only calls made to me; answered and talk time are the ones I picked up', async () => {
|
||||
const sam = await t.addUser('sam@example.com', 'sam-password-123');
|
||||
const [mine, other] = await t.db
|
||||
.insert(extensions)
|
||||
.values(
|
||||
(['103', '104'] as const).map((number) => ({
|
||||
number,
|
||||
name: number,
|
||||
sipPasswordEnc: encrypt('x'),
|
||||
voicemailPinEnc: encrypt('4826'),
|
||||
userId: number === '103' ? sam.id : null,
|
||||
})),
|
||||
)
|
||||
.returning();
|
||||
await t.db.insert(calls).values({
|
||||
linkedid: 'g',
|
||||
direction: 'internal',
|
||||
status: 'answered',
|
||||
startedAt: new Date('2026-05-05T15:00:00Z'), // Tue 10:00
|
||||
endedAt: new Date('2026-05-05T15:00:45Z'),
|
||||
talkSeconds: 40,
|
||||
answeredByExtensionId: mine!.id,
|
||||
});
|
||||
const ids = Object.fromEntries(
|
||||
(
|
||||
await t.db
|
||||
.select({ id: calls.id, linkedid: calls.linkedid })
|
||||
.from(calls)
|
||||
.where(inArray(calls.linkedid, ['a', 'b', 'c', 'g']))
|
||||
).map((c) => [c.linkedid, c.id]),
|
||||
);
|
||||
// a: rang me and a coworker, the coworker answered. b: rang me, missed. c: I made it. g: mine.
|
||||
await t.db
|
||||
.update(calls)
|
||||
.set({ answeredByExtensionId: other!.id })
|
||||
.where(inArray(calls.id, [ids.a!]));
|
||||
await t.db.insert(callExtensions).values([
|
||||
{ callId: ids.a!, extensionId: mine!.id, role: 'rang' },
|
||||
{ callId: ids.a!, extensionId: other!.id, role: 'answered' },
|
||||
{ callId: ids.b!, extensionId: mine!.id, role: 'rang' },
|
||||
{ callId: ids.c!, extensionId: mine!.id, role: 'caller' },
|
||||
{ callId: ids.g!, extensionId: mine!.id, role: 'rang' },
|
||||
{ callId: ids.g!, extensionId: mine!.id, role: 'answered' },
|
||||
]);
|
||||
const cookie = await t.login('sam@example.com', 'sam-password-123');
|
||||
const r = await get('/api/me/reports/summary?from=2026-05-04&to=2026-05-06', cookie);
|
||||
expect(r.statusCode, r.body).toBe(200);
|
||||
const s = r.json();
|
||||
expect(s.days).toEqual([
|
||||
{ date: '2026-05-04', inbound: 2, outbound: 0, internal: 0, missed: 1, outsideMinutes: 2 },
|
||||
{ date: '2026-05-05', inbound: 0, outbound: 0, internal: 1, missed: 0, outsideMinutes: 0 },
|
||||
{ date: '2026-05-06', inbound: 0, outbound: 0, internal: 0, missed: 0, outsideMinutes: 0 },
|
||||
]);
|
||||
expect(s.totals).toEqual({
|
||||
calls: 3,
|
||||
answered: 1,
|
||||
missed: 1,
|
||||
avgTalkSeconds: 40,
|
||||
talkSeconds: 40,
|
||||
outsideSeconds: { inbound: 95, outbound: 0 },
|
||||
});
|
||||
expect(s.hours.flat().reduce((a: number, b: number) => a + b)).toBe(3);
|
||||
// The company summary is unchanged by who rang.
|
||||
expect(
|
||||
(await get('/api/reports/summary?from=2026-05-04&to=2026-05-04')).json().totals.answered,
|
||||
).toBe(2);
|
||||
});
|
||||
});
|
||||
@@ -117,11 +117,11 @@ describe.skipIf(!hasTestDb)('schema matches spec 02', () => {
|
||||
beforeAll(async () => ({ db, drop } = await createTestDb()));
|
||||
afterAll(() => drop?.());
|
||||
|
||||
it('creates all 47 tables', async () => {
|
||||
it('creates all 48 tables', async () => {
|
||||
const r = await db.execute(
|
||||
sql`select count(*)::int as n from information_schema.tables where table_schema = 'public'`,
|
||||
);
|
||||
expect(r.rows[0]).toEqual({ n: 47 });
|
||||
expect(r.rows[0]).toEqual({ n: 48 });
|
||||
});
|
||||
|
||||
it.each(Object.keys(EXPECTED))('%s columns', async (table) => {
|
||||
|
||||
@@ -105,7 +105,7 @@ describe.skipIf(!hasTestDb || !hasOpenssl)('SIP TLS setting', () => {
|
||||
expect(await warningCodes()).not.toContain('tls_cert');
|
||||
});
|
||||
|
||||
it('a TLS trunk: no qualify, Test does not send OPTIONS, TLS stays on while it exists', async () => {
|
||||
it('a TLS trunk: qualified like the others (24.0.0-rc3), TLS stays on while it exists', async () => {
|
||||
const trunk = await req('POST', '/api/trunks', {
|
||||
name: 'voip.ms TLS',
|
||||
serverHost: '127.0.0.1',
|
||||
@@ -119,13 +119,15 @@ describe.skipIf(!hasTestDb || !hasOpenssl)('SIP TLS setting', () => {
|
||||
await t.app.generator.apply({ trigger: 'test' });
|
||||
const { readFile } = await import('node:fs/promises');
|
||||
const conf = await readFile(join(t.app.generator.dir, 'pjsip_selfphoneng.conf'), 'utf8');
|
||||
expect(conf).toMatch(/contact = sip:127\.0\.0\.1:5061;transport=tls\nqualify_frequency = 0\n/);
|
||||
expect(conf).toMatch(/contact = sip:127\.0\.0\.1:5061;transport=tls\nqualify_frequency = 60\n/);
|
||||
expect(conf).toMatch(/media_encryption = sdes/);
|
||||
expect(conf).toMatch(/verify_server = yes/);
|
||||
t.live.amiConnected = true;
|
||||
const test = await req('POST', `/api/trunks/${trunk.json().id}/test`);
|
||||
expect(test.statusCode).toBe(200);
|
||||
expect(t.ami.actions.filter((a) => a.Action === 'PJSIPQualify')).toEqual([]);
|
||||
expect(t.ami.actions.filter((a) => a.Action === 'PJSIPQualify')).toEqual([
|
||||
expect.objectContaining({ Endpoint: `trunk-${trunk.json().id}` }),
|
||||
]);
|
||||
const off = await req('PATCH', '/api/settings', { 'sip.tlsEnabled': false });
|
||||
expect(off.statusCode).toBe(400);
|
||||
expect(off.json().error.message).toMatch(/uses TLS/);
|
||||
|
||||
@@ -7,7 +7,7 @@ import { join } from 'node:path';
|
||||
import { eq } from 'drizzle-orm';
|
||||
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
|
||||
import type { LiveMessage } from '@selfphoneng/shared';
|
||||
import { extensions, voicemailMessages } from '../src/db/schema.ts';
|
||||
import { extensions, voicemailMessages, webhookDeliveries, webhooks } from '../src/db/schema.ts';
|
||||
import { parseCallerId, type watchVoicemail } from '../src/services/voicemail.ts';
|
||||
import { setSetting } from '../src/services/settings.ts';
|
||||
import { hasTestDb } from './db.ts';
|
||||
@@ -175,11 +175,21 @@ describe.skipIf(!hasTestDb)('voicemail watcher', () => {
|
||||
const url = `http://127.0.0.1:${(stt.address() as AddressInfo).port}/v1`;
|
||||
await setSetting(t.db, 'ai.stt', { url, model: 'whisper' });
|
||||
await setSetting(t.db, 'ai.voicemailTranscripts', true);
|
||||
await t.db
|
||||
.insert(webhooks)
|
||||
.values({ url: 'https://hooks.example.com/x', secretEnc: 'x', events: ['voicemail.new'] });
|
||||
try {
|
||||
leave('INBOX', 3, '1792300700-00000004', '<104>');
|
||||
await w.scan('101');
|
||||
const r = (await rows()).find((x) => x.msgId === '1792300700-00000004')!;
|
||||
expect(r.transcript).toBe('Please call me.');
|
||||
// A webhook goes off this server: the words stay here (10 §1, 08 §7 #6).
|
||||
const [hook] = await t.db
|
||||
.select()
|
||||
.from(webhookDeliveries)
|
||||
.where(eq(webhookDeliveries.event, 'voicemail.new'));
|
||||
expect((hook!.payload as { data: object }).data).toMatchObject({ id: r.id });
|
||||
expect((hook!.payload as { data: object }).data).not.toHaveProperty('transcript');
|
||||
expect(t.mails.at(-1)!.text).toContain(
|
||||
'What they said (automatic, may have mistakes):\nPlease call me.',
|
||||
);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@selfphoneng/probe",
|
||||
"version": "0.0.11",
|
||||
"version": "0.0.12",
|
||||
"private": true,
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"type": "module",
|
||||
|
||||
+14
-3
@@ -1,10 +1,21 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// The network test probe (08 §2.6): run it outside the network SelfPhoneNG is in, and put its URL
|
||||
// in Settings → Network. `node src/index.ts` (Node 24 runs TypeScript as is).
|
||||
// PORT (default 8080), TRUST_PROXY=true behind a reverse proxy that sets X-Forwarded-For.
|
||||
// PORT (default 8080), TRUST_PROXY=true behind a reverse proxy on this machine that sets
|
||||
// X-Forwarded-For. HOST: where to listen; with TRUST_PROXY=true 127.0.0.1 (only the proxy may
|
||||
// reach it), else every address. PROBE_KEY: the key from SelfPhoneNG's Settings → Network;
|
||||
// without one anyone who finds the probe can use it.
|
||||
import { createProbe } from './server.ts';
|
||||
|
||||
const port = Number(process.env.PORT ?? 8080);
|
||||
const probe = createProbe({ trustProxy: process.env.TRUST_PROXY === 'true' });
|
||||
probe.listen(port, () => console.log(`selfphoneng-probe listening on ${port}`));
|
||||
const trustProxy = process.env.TRUST_PROXY === 'true';
|
||||
const host = process.env.HOST ?? (trustProxy ? '127.0.0.1' : '::');
|
||||
const key = process.env.PROBE_KEY || undefined;
|
||||
const probe = createProbe({ trustProxy, key });
|
||||
probe.listen(port, host, () => console.log(`selfphoneng-probe listening on ${host} ${port}`));
|
||||
if (!key)
|
||||
console.warn(
|
||||
'No PROBE_KEY: anyone who finds this probe can use it. Make one in SelfPhoneNG ' +
|
||||
'(Settings → Network → Generate key) and set PROBE_KEY.',
|
||||
);
|
||||
for (const sig of ['SIGINT', 'SIGTERM']) process.on(sig, () => probe.close(() => process.exit(0)));
|
||||
@@ -1,12 +1,18 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// The probe against stand-ins on 127.0.0.1: TCP, HTTP and a WebSocket upgrade, SIP over UDP and
|
||||
// TCP, raw UDP; and the server: it only tests the address that asked, validates, rate-limits.
|
||||
// TCP, raw UDP; and the server: it only tests the address that asked, validates, rate-limits,
|
||||
// believes X-Forwarded-For only from a proxy on this machine (08 §7 #4), and with PROBE_KEY only
|
||||
// answers who sends it (#9).
|
||||
import { createSocket, type Socket as UdpSocket } from 'node:dgram';
|
||||
import { createServer as httpServer, type Server as HttpServer } from 'node:http';
|
||||
import {
|
||||
createServer as httpServer,
|
||||
type IncomingMessage,
|
||||
type Server as HttpServer,
|
||||
} from 'node:http';
|
||||
import { createServer as tcpServer, type AddressInfo, type Server } from 'node:net';
|
||||
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
|
||||
import { runTest } from './checks.ts';
|
||||
import { createProbe, parseCheck } from './server.ts';
|
||||
import { clientIp, createProbe, parseCheck } from './server.ts';
|
||||
|
||||
const port = (s: Server | HttpServer) => (s.address() as AddressInfo).port;
|
||||
const listen = <T extends Server | HttpServer>(s: T) =>
|
||||
@@ -165,3 +171,38 @@ describe('probe server', () => {
|
||||
target.close();
|
||||
});
|
||||
});
|
||||
|
||||
describe('the probe key', () => {
|
||||
it('with a key, only a request that sends it gets tested (08 §7 #9)', async () => {
|
||||
const key = 'k3y'.repeat(15);
|
||||
const probe = await listen(createProbe({ key }));
|
||||
const post = (authorization?: string) =>
|
||||
fetch(`http://127.0.0.1:${port(probe)}/v1/check`, {
|
||||
method: 'POST',
|
||||
headers: { 'content-type': 'application/json', ...(authorization && { authorization }) },
|
||||
body: JSON.stringify({ host: 'pbx.test', tests: [{ id: 'a', kind: 'tcp', port: 1 }] }),
|
||||
});
|
||||
expect((await post()).status).toBe(401);
|
||||
expect((await post('Bearer wrong')).status).toBe(401);
|
||||
expect((await post(`Bearer ${key}x`)).status).toBe(401);
|
||||
expect((await post(`Bearer ${key}`)).status).toBe(200);
|
||||
expect((await fetch(`http://127.0.0.1:${port(probe)}/healthz`)).status).toBe(200);
|
||||
probe.close();
|
||||
});
|
||||
});
|
||||
|
||||
describe('the address that asked', () => {
|
||||
const req = (peer: string, xff?: string) =>
|
||||
({
|
||||
headers: xff ? { 'x-forwarded-for': xff } : {},
|
||||
socket: { remoteAddress: peer },
|
||||
}) as unknown as IncomingMessage;
|
||||
|
||||
it('takes X-Forwarded-For only from the local proxy (08 §7 #4)', () => {
|
||||
// Reached straight from the internet: the header is whatever the caller wrote.
|
||||
expect(clientIp(req('203.0.113.5', '198.51.100.9'), true)).toBe('203.0.113.5');
|
||||
for (const proxy of ['127.0.0.1', '::ffff:127.0.0.1', '::1'])
|
||||
expect(clientIp(req(proxy, '10.0.0.1, 198.51.100.9'), true)).toBe('198.51.100.9');
|
||||
expect(clientIp(req('::ffff:203.0.113.5', '198.51.100.9'), false)).toBe('203.0.113.5');
|
||||
});
|
||||
});
|
||||
@@ -1,7 +1,9 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// POST /v1/check {host, tests}: runs the tests against the address the request came from and
|
||||
// answers {ip, results}. GET /healthz. No other target can be given, which is what keeps the probe
|
||||
// from being aimed at someone else; each address gets a few checks per 10 minutes.
|
||||
// from being aimed at someone else; each address gets a few checks per 10 minutes. With a key
|
||||
// (PROBE_KEY, made in SelfPhoneNG's Settings → Network), only who sends it is tested (08 §7 #9).
|
||||
import { createHash, timingSafeEqual } from 'node:crypto';
|
||||
import { createServer, type IncomingMessage, type Server } from 'node:http';
|
||||
import { isIP } from 'node:net';
|
||||
import { runTest, type Result, type Test } from './checks.ts';
|
||||
@@ -9,6 +11,8 @@ import { runTest, type Result, type Test } from './checks.ts';
|
||||
export type ProbeOptions = {
|
||||
/** Behind a reverse proxy: the address is the last X-Forwarded-For entry (the proxy adds it). */
|
||||
trustProxy?: boolean;
|
||||
/** Only requests with `Authorization: Bearer <key>` are tested. None: anyone may ask. */
|
||||
key?: string;
|
||||
/** Checks per address per window. */
|
||||
maxChecks?: number;
|
||||
windowMs?: number;
|
||||
@@ -48,15 +52,27 @@ export function parseCheck(body: unknown): { host: string; tests: Test[] } | str
|
||||
return { host: b.host, tests };
|
||||
}
|
||||
|
||||
const clientIp = (req: IncomingMessage, trustProxy: boolean) => {
|
||||
/**
|
||||
* The address to test. X-Forwarded-For only counts when the request came from a proxy on this
|
||||
* machine: reached directly, the header is whatever the caller wrote (08 §7 #4).
|
||||
*/
|
||||
export const clientIp = (req: IncomingMessage, trustProxy: boolean) => {
|
||||
const peer = req.socket.remoteAddress!.replace(/^::ffff:/, '');
|
||||
const xff = req.headers['x-forwarded-for'];
|
||||
const raw =
|
||||
trustProxy && typeof xff === 'string'
|
||||
? xff.split(',').at(-1)!.trim()
|
||||
: req.socket.remoteAddress!;
|
||||
return raw.replace(/^::ffff:/, '');
|
||||
const local = peer === '127.0.0.1' || peer === '::1';
|
||||
return trustProxy && local && typeof xff === 'string'
|
||||
? xff
|
||||
.split(',')
|
||||
.at(-1)!
|
||||
.trim()
|
||||
.replace(/^::ffff:/, '')
|
||||
: peer;
|
||||
};
|
||||
|
||||
/** Equal, in the same time whatever was sent (hashes, so lengths don't show either). */
|
||||
const sameKey = (a: string, b: string) =>
|
||||
timingSafeEqual(createHash('sha256').update(a).digest(), createHash('sha256').update(b).digest());
|
||||
|
||||
function readJson(req: IncomingMessage): Promise<unknown> {
|
||||
return new Promise((resolve, reject) => {
|
||||
let size = 0;
|
||||
@@ -78,7 +94,7 @@ function readJson(req: IncomingMessage): Promise<unknown> {
|
||||
}
|
||||
|
||||
export function createProbe(opts: ProbeOptions = {}): Server {
|
||||
const { trustProxy = false, maxChecks = 10, windowMs = 10 * 60_000 } = opts;
|
||||
const { trustProxy = false, key, maxChecks = 10, windowMs = 10 * 60_000 } = opts;
|
||||
// ponytail: in-process memory; addresses past the window are swept on each check.
|
||||
const seen = new Map<string, number[]>();
|
||||
const allow = (ip: string, now = Date.now()) => {
|
||||
@@ -95,6 +111,8 @@ export function createProbe(opts: ProbeOptions = {}): Server {
|
||||
if (req.method === 'GET' && req.url === '/healthz') return send(res, 200, { ok: true });
|
||||
if (req.method !== 'POST' || req.url !== '/v1/check')
|
||||
return send(res, 404, { error: 'not found' });
|
||||
if (key && !sameKey(req.headers.authorization ?? '', `Bearer ${key}`))
|
||||
return send(res, 401, { error: 'this probe needs its key' });
|
||||
const ip = clientIp(req, trustProxy);
|
||||
void readJson(req)
|
||||
.then(async (body) => {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@selfphoneng/web",
|
||||
"version": "0.0.11",
|
||||
"version": "0.0.12",
|
||||
"private": true,
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"type": "module",
|
||||
|
||||
@@ -26,6 +26,8 @@ import type {
|
||||
AnnouncementUpdate,
|
||||
BlockedCreate,
|
||||
BlockedDto,
|
||||
SpamReportCreate,
|
||||
SpamReportDto,
|
||||
CallDetailDto,
|
||||
CallDto,
|
||||
CallFilter,
|
||||
@@ -293,6 +295,9 @@ export const systemApi = {
|
||||
api<{ ok: true }>('POST', `/api/system/asterisk/restart?now=${now}`),
|
||||
detectPublicIp: () =>
|
||||
api<{ ip: string }>('POST', '/api/settings/network/detect-public-ip').then((r) => r.ip),
|
||||
/** A new key for the network test probe, shown this once (08 §7 #9). */
|
||||
probeKey: () =>
|
||||
api<{ key: string }>('POST', '/api/settings/network/probe-key').then((r) => r.key),
|
||||
tls: () => api<TlsCert>('GET', '/api/system/tls'),
|
||||
diagnostics: () => api<DiagnosticsDto>('GET', '/api/system/diagnostics'),
|
||||
networkTest: (mode: 'quick' | 'complete') =>
|
||||
@@ -306,6 +311,9 @@ export const systemApi = {
|
||||
export const meApi = {
|
||||
calls: (cursor?: string) =>
|
||||
api<ListResponse<MyCallDto>>('GET', `/api/me/calls${cursor ? `?cursor=${cursor}` : ''}`),
|
||||
reportSpam: (r: SpamReportCreate) => api<{ ok: true }>('POST', '/api/me/spam-reports', r),
|
||||
/** The summary of the calls made to me. */
|
||||
report: (r: ReportRange) => api<ReportSummary>('GET', `/api/me/reports/summary?${callQuery(r)}`),
|
||||
get: () => api<MeDto>('GET', '/api/me'),
|
||||
/** 14 §5.1: only for a caller ringing me now. */
|
||||
callerCheck: (number: string) =>
|
||||
@@ -505,6 +513,8 @@ export const blockedApi = {
|
||||
list: () => api<ListResponse<BlockedDto>>('GET', '/api/blocked-numbers').then((r) => r.items),
|
||||
create: (b: BlockedCreate) => api<BlockedDto>('POST', '/api/blocked-numbers', b),
|
||||
remove: (id: string) => api<{ ok: true }>('DELETE', `/api/blocked-numbers/${id}`),
|
||||
reports: () => api<ListResponse<SpamReportDto>>('GET', '/api/spam-reports').then((r) => r.items),
|
||||
dismiss: (id: string) => api<{ ok: true }>('DELETE', `/api/spam-reports/${id}`),
|
||||
};
|
||||
|
||||
/** Filters as a query string (empty values left out). */
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// Blocked numbers (05 §2): calls from these numbers are rejected before anything rings.
|
||||
// Blocked numbers (05 §2): calls from these numbers are rejected before anything rings. Users'
|
||||
// Report spam waits at the top for Block or Dismiss.
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { useState } from 'react';
|
||||
import { formatNumber } from '@selfphoneng/shared';
|
||||
import { blockedApi } from '../../api/client.ts';
|
||||
import { Alert, Button, Field, inputClass } from '../../components/ui.tsx';
|
||||
import { Alert, Button, Field, Panel, inputClass } from '../../components/ui.tsx';
|
||||
|
||||
export function BlockedPage() {
|
||||
const qc = useQueryClient();
|
||||
const list = useQuery({ queryKey: ['blocked'], queryFn: blockedApi.list });
|
||||
const reports = useQuery({ queryKey: ['blocked', 'reports'], queryFn: blockedApi.reports });
|
||||
const refresh = () => qc.invalidateQueries({ queryKey: ['blocked'] });
|
||||
const [number, setNumber] = useState('');
|
||||
const [reason, setReason] = useState('');
|
||||
@@ -24,6 +26,16 @@ export function BlockedPage() {
|
||||
mutationFn: (id: string) => blockedApi.remove(id),
|
||||
onSuccess: refresh,
|
||||
});
|
||||
// Blocking a number clears every report of it (api).
|
||||
const block = useMutation({
|
||||
mutationFn: (r: { number: string; reason: string }) => blockedApi.create(r),
|
||||
onSuccess: refresh,
|
||||
});
|
||||
const dismiss = useMutation({
|
||||
mutationFn: (id: string) => blockedApi.dismiss(id),
|
||||
onSuccess: refresh,
|
||||
});
|
||||
const error = add.error ?? remove.error ?? block.error ?? dismiss.error ?? reports.error;
|
||||
|
||||
return (
|
||||
<section className="flex flex-col gap-4">
|
||||
@@ -32,6 +44,38 @@ export function BlockedPage() {
|
||||
Calls from these numbers are rejected before any phone rings. Emergency calls you make are
|
||||
never affected.
|
||||
</p>
|
||||
{!!reports.data?.length && (
|
||||
<Panel title="Reported as spam">
|
||||
<ul className="divide-y divide-line">
|
||||
{reports.data.map((r) => (
|
||||
<li key={r.id} className="flex flex-wrap items-center gap-x-3 gap-y-1 py-2 text-sm">
|
||||
<span className="font-mono">{formatNumber(r.number)}</span>
|
||||
<span className="min-w-0 flex-1">
|
||||
{r.reason}
|
||||
<span className="block text-xs text-muted">
|
||||
{r.reportedBy ?? 'A former user'}, {new Date(r.createdAt).toLocaleString()}
|
||||
</span>
|
||||
</span>
|
||||
<Button
|
||||
variant="primary"
|
||||
aria-label={`Block ${formatNumber(r.number)}`}
|
||||
disabled={block.isPending}
|
||||
onClick={() => block.mutate({ number: r.number, reason: r.reason })}
|
||||
>
|
||||
Block
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
aria-label={`Dismiss the report of ${formatNumber(r.number)}`}
|
||||
onClick={() => dismiss.mutate(r.id)}
|
||||
>
|
||||
Dismiss
|
||||
</Button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</Panel>
|
||||
)}
|
||||
<form
|
||||
className="flex flex-wrap items-end gap-2"
|
||||
onSubmit={(e) => {
|
||||
@@ -66,7 +110,7 @@ export function BlockedPage() {
|
||||
Block
|
||||
</Button>
|
||||
</form>
|
||||
{(add.error ?? remove.error) && <Alert>{(add.error ?? remove.error)!.message}</Alert>}
|
||||
{error && <Alert>{error.message}</Alert>}
|
||||
{list.data?.length === 0 && <p className="text-sm text-muted">Nobody is blocked.</p>}
|
||||
{list.data && list.data.length > 0 && (
|
||||
<ul className="divide-y divide-line rounded-xl border border-line bg-surface shadow-sm">
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// Dashboard (05 §2). Warnings, telephony link, trunks, calls in progress (hang up / transfer)
|
||||
// queue tiles, parked calls and extensions online.
|
||||
// queue tiles, parked calls and extensions online, spam reports waiting.
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { useEffect, useState, type ReactNode } from 'react';
|
||||
import type { ActiveCall, QueueLive, Warning } from '@selfphoneng/shared';
|
||||
import { Link } from 'react-router';
|
||||
import { liveApi, settingsApi, type SpyMode } from '../../api/client.ts';
|
||||
import { blockedApi, liveApi, settingsApi, type SpyMode } from '../../api/client.ts';
|
||||
import { ConfirmDialog } from '../../components/Dialog.tsx';
|
||||
import { Alert, Button, inputClass } from '../../components/ui.tsx';
|
||||
import { fmtNumber } from './CallsPage.tsx';
|
||||
@@ -31,6 +31,11 @@ export function DashboardPage() {
|
||||
const onCall = list.filter((e) =>
|
||||
['inuse', 'busy', 'onhold', 'ringinuse'].includes(e.state),
|
||||
).length;
|
||||
const reports = useQuery({
|
||||
queryKey: ['blocked', 'reports'],
|
||||
queryFn: blockedApi.reports,
|
||||
refetchInterval: 30_000,
|
||||
});
|
||||
|
||||
return (
|
||||
<section className="flex flex-col gap-6">
|
||||
@@ -40,7 +45,7 @@ export function DashboardPage() {
|
||||
(t) => t.registration === 'rejected' || (!t.reachable && t.registration !== 'registered'),
|
||||
)}
|
||||
/>
|
||||
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-4">
|
||||
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-5">
|
||||
<Card title="Extensions online">
|
||||
{status === 'connecting' ? '…' : `${online} / ${list.length}`}
|
||||
</Card>
|
||||
@@ -61,6 +66,12 @@ export function DashboardPage() {
|
||||
{status === 'connecting' ? '…' : amiConnected ? 'Connected' : 'Not connected'}
|
||||
</span>
|
||||
</Card>
|
||||
<Card title="Spam reports">
|
||||
<Link to="/admin/blocked" className="hover:underline">
|
||||
{reports.data?.length ?? '…'}
|
||||
<span className="sr-only"> waiting on Blocked numbers</span>
|
||||
</Link>
|
||||
</Card>
|
||||
</div>
|
||||
|
||||
<QueueTiles />
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// Reports (05 §2): totals (calls, minutes, the voip.ms balance), calls and outside minutes per
|
||||
// day, missed per day, busiest hours, queue table.
|
||||
// day, missed per day, busiest hours, queue table. `mine` (05 §4): the calls made to me, without
|
||||
// the company's outside minutes, balance and queues.
|
||||
// ponytail: bars and the heatmap are plain divs and a table, no chart library.
|
||||
import { useQuery } from '@tanstack/react-query';
|
||||
import { useState } from 'react';
|
||||
import type { ReportRange, ReportSummary } from '@selfphoneng/shared';
|
||||
import { reportsApi } from '../../api/client.ts';
|
||||
import { meApi, reportsApi } from '../../api/client.ts';
|
||||
import { Alert, Button, Field, inputClass } from '../../components/ui.tsx';
|
||||
import { fmtDuration } from './CallsPage.tsx';
|
||||
|
||||
@@ -116,18 +117,23 @@ function Heatmap({ hours }: { hours: number[][] }) {
|
||||
);
|
||||
}
|
||||
|
||||
export function ReportsPage() {
|
||||
export function ReportsPage({ mine = false }: { mine?: boolean }) {
|
||||
const [draft, setDraft] = useState<ReportRange>({});
|
||||
const [range, setRange] = useState<ReportRange>({});
|
||||
const summary = useQuery({
|
||||
queryKey: ['reports', 'summary', range],
|
||||
queryFn: () => reportsApi.summary(range),
|
||||
queryKey: [mine ? 'me' : 'reports', 'summary', range],
|
||||
queryFn: () => (mine ? meApi.report(range) : reportsApi.summary(range)),
|
||||
});
|
||||
const queues = useQuery({
|
||||
queryKey: ['reports', 'queues', range],
|
||||
queryFn: () => reportsApi.queues(range),
|
||||
enabled: !mine,
|
||||
});
|
||||
const balance = useQuery({
|
||||
queryKey: ['reports', 'balance'],
|
||||
queryFn: reportsApi.balance,
|
||||
enabled: !mine,
|
||||
});
|
||||
const balance = useQuery({ queryKey: ['reports', 'balance'], queryFn: reportsApi.balance });
|
||||
const s = summary.data;
|
||||
const date = (k: 'from' | 'to', label: string) => (
|
||||
<Field label={label}>
|
||||
@@ -145,7 +151,8 @@ export function ReportsPage() {
|
||||
|
||||
return (
|
||||
<section className="flex flex-col gap-6">
|
||||
<h1 className="text-xl font-semibold">Reports</h1>
|
||||
<h1 className="text-xl font-semibold">{mine ? 'My reports' : 'Reports'}</h1>
|
||||
{mine && <p className="text-sm text-muted">Calls that rang you, not the ones you made.</p>}
|
||||
<form
|
||||
aria-label="Dates"
|
||||
className="flex flex-wrap items-end gap-3"
|
||||
@@ -174,19 +181,33 @@ export function ReportsPage() {
|
||||
{(
|
||||
[
|
||||
['Calls', s.totals.calls, null],
|
||||
['Answered', s.totals.answered, null],
|
||||
[
|
||||
mine ? 'You answered' : 'Answered',
|
||||
s.totals.answered,
|
||||
mine ? 'not the ones a coworker picked up' : null,
|
||||
],
|
||||
['Missed', s.totals.missed, 'missed, voicemail or hung up waiting'],
|
||||
[
|
||||
'Average talk time',
|
||||
s.totals.avgTalkSeconds === null ? '—' : fmtDuration(s.totals.avgTalkSeconds),
|
||||
null,
|
||||
],
|
||||
['Talk time', fmtMinutes(s.totals.talkSeconds), 'people talking, inside calls too'],
|
||||
[
|
||||
'Outside minutes',
|
||||
fmtMinutes(s.totals.outsideSeconds.inbound + s.totals.outsideSeconds.outbound),
|
||||
`${fmtMinutes(s.totals.outsideSeconds.inbound)} in, ${fmtMinutes(s.totals.outsideSeconds.outbound)} out: roughly what voip.ms bills`,
|
||||
'Talk time',
|
||||
fmtMinutes(s.totals.talkSeconds),
|
||||
mine ? null : 'people talking, inside calls too',
|
||||
],
|
||||
...(mine
|
||||
? []
|
||||
: ([
|
||||
[
|
||||
'Outside minutes',
|
||||
fmtMinutes(
|
||||
s.totals.outsideSeconds.inbound + s.totals.outsideSeconds.outbound,
|
||||
),
|
||||
`${fmtMinutes(s.totals.outsideSeconds.inbound)} in, ${fmtMinutes(s.totals.outsideSeconds.outbound)} out: roughly what voip.ms bills`,
|
||||
],
|
||||
] as const)),
|
||||
...(balance.data ?? []).map(
|
||||
(b) =>
|
||||
[
|
||||
@@ -204,12 +225,18 @@ export function ReportsPage() {
|
||||
</div>
|
||||
))}
|
||||
</dl>
|
||||
<Bars label="Calls per day" days={s.days} segments={SERIES} />
|
||||
<Bars
|
||||
label="Outside minutes per day"
|
||||
label="Calls per day"
|
||||
days={s.days}
|
||||
segments={[['outsideMinutes', 'Minutes', 'bg-emerald-500']]}
|
||||
segments={mine ? SERIES.filter(([k]) => k !== 'outbound') : SERIES}
|
||||
/>
|
||||
{!mine && (
|
||||
<Bars
|
||||
label="Outside minutes per day"
|
||||
days={s.days}
|
||||
segments={[['outsideMinutes', 'Minutes', 'bg-emerald-500']]}
|
||||
/>
|
||||
)}
|
||||
<Bars
|
||||
label="Missed per day"
|
||||
days={s.days}
|
||||
@@ -222,53 +249,55 @@ export function ReportsPage() {
|
||||
</>
|
||||
)}
|
||||
|
||||
<div className="flex flex-col gap-2">
|
||||
<h2 className="font-medium">Queues</h2>
|
||||
{queues.error && <Alert>{queues.error.message}</Alert>}
|
||||
{queues.data && !queues.data.length && <p className="text-sm text-muted">No queues.</p>}
|
||||
{!!queues.data?.length && (
|
||||
<div className="overflow-x-auto">
|
||||
<table aria-label="Queue report" className="w-full text-left text-sm">
|
||||
<thead className="text-muted">
|
||||
<tr>
|
||||
{[
|
||||
'Queue',
|
||||
'Calls',
|
||||
'Answered',
|
||||
'Hung up waiting',
|
||||
'Timed out',
|
||||
'Average wait',
|
||||
'Answered in time',
|
||||
].map((h) => (
|
||||
<th key={h} scope="col" className="px-2 py-1 font-normal">
|
||||
{h}
|
||||
</th>
|
||||
))}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-line">
|
||||
{queues.data.map((q) => (
|
||||
<tr key={q.id} className="tabular-nums">
|
||||
<td className="px-2 py-1">
|
||||
<span className="font-mono">{q.number}</span> {q.name}
|
||||
</td>
|
||||
<td className="px-2 py-1">{q.offered}</td>
|
||||
<td className="px-2 py-1">{q.answered}</td>
|
||||
<td className="px-2 py-1">{q.abandoned}</td>
|
||||
<td className="px-2 py-1">{q.timedOut}</td>
|
||||
<td className="px-2 py-1">
|
||||
{q.avgWaitSeconds === null ? '—' : `${q.avgWaitSeconds} s`}
|
||||
</td>
|
||||
<td className="px-2 py-1" title={`within ${q.slaSeconds} s`}>
|
||||
{q.withinSlaPercent === null ? '—' : `${q.withinSlaPercent}%`}
|
||||
</td>
|
||||
{!mine && (
|
||||
<div className="flex flex-col gap-2">
|
||||
<h2 className="font-medium">Queues</h2>
|
||||
{queues.error && <Alert>{queues.error.message}</Alert>}
|
||||
{queues.data && !queues.data.length && <p className="text-sm text-muted">No queues.</p>}
|
||||
{!!queues.data?.length && (
|
||||
<div className="overflow-x-auto">
|
||||
<table aria-label="Queue report" className="w-full text-left text-sm">
|
||||
<thead className="text-muted">
|
||||
<tr>
|
||||
{[
|
||||
'Queue',
|
||||
'Calls',
|
||||
'Answered',
|
||||
'Hung up waiting',
|
||||
'Timed out',
|
||||
'Average wait',
|
||||
'Answered in time',
|
||||
].map((h) => (
|
||||
<th key={h} scope="col" className="px-2 py-1 font-normal">
|
||||
{h}
|
||||
</th>
|
||||
))}
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-line">
|
||||
{queues.data.map((q) => (
|
||||
<tr key={q.id} className="tabular-nums">
|
||||
<td className="px-2 py-1">
|
||||
<span className="font-mono">{q.number}</span> {q.name}
|
||||
</td>
|
||||
<td className="px-2 py-1">{q.offered}</td>
|
||||
<td className="px-2 py-1">{q.answered}</td>
|
||||
<td className="px-2 py-1">{q.abandoned}</td>
|
||||
<td className="px-2 py-1">{q.timedOut}</td>
|
||||
<td className="px-2 py-1">
|
||||
{q.avgWaitSeconds === null ? '—' : `${q.avgWaitSeconds} s`}
|
||||
</td>
|
||||
<td className="px-2 py-1" title={`within ${q.slaSeconds} s`}>
|
||||
{q.withinSlaPercent === null ? '—' : `${q.withinSlaPercent}%`}
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
@@ -505,6 +505,11 @@ function NetworkTab({ s }: { s: SettingsDto }) {
|
||||
const [watch, setWatch] = useState(s['network.publicIpWatch']);
|
||||
const [probe, setProbe] = useState(s['network.probeUrl'] ?? '');
|
||||
const detect = useMutation({ mutationFn: systemApi.detectPublicIp, onSuccess: setIp });
|
||||
const qc = useQueryClient();
|
||||
const makeKey = useMutation({
|
||||
mutationFn: systemApi.probeKey,
|
||||
onSuccess: () => qc.invalidateQueries({ queryKey: ['settings'] }),
|
||||
});
|
||||
return (
|
||||
<form
|
||||
className="flex flex-col gap-4"
|
||||
@@ -555,13 +560,61 @@ function NetworkTab({ s }: { s: SettingsDto }) {
|
||||
/>
|
||||
)}
|
||||
</Field>
|
||||
{s['network.probeUrl'] && (
|
||||
<section
|
||||
aria-labelledby="probe-key-h"
|
||||
className="flex flex-col gap-2 rounded-lg border border-line p-3 text-sm"
|
||||
>
|
||||
<h3 id="probe-key-h" className="font-medium">
|
||||
Probe key
|
||||
</h3>
|
||||
{s['network.hasProbeKey'] ? (
|
||||
<p className="text-muted">Set: the probe only answers this server.</p>
|
||||
) : (
|
||||
<p className="text-amber-800 dark:text-amber-200">
|
||||
Not set: anyone who finds your probe can use it. Strongly recommended: generate a key
|
||||
and set it on the probe.
|
||||
</p>
|
||||
)}
|
||||
{makeKey.data ? (
|
||||
<>
|
||||
<p>
|
||||
Set this on the probe (its compose file or service), then restart it. It’s
|
||||
shown only now.
|
||||
</p>
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<code className="min-w-0 flex-1 rounded bg-subtle p-2 font-mono text-xs break-all select-all">
|
||||
PROBE_KEY={makeKey.data}
|
||||
</code>
|
||||
<Button
|
||||
type="button"
|
||||
onClick={() => void navigator.clipboard.writeText(makeKey.data)}
|
||||
>
|
||||
Copy
|
||||
</Button>
|
||||
</div>
|
||||
</>
|
||||
) : (
|
||||
<div>
|
||||
<Button type="button" onClick={() => makeKey.mutate()} disabled={makeKey.isPending}>
|
||||
{s['network.hasProbeKey'] ? 'Generate a new key' : 'Generate key'}
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
<p className="text-xs text-muted">
|
||||
A new probe address drops the key: generate one for the new probe.
|
||||
</p>
|
||||
</section>
|
||||
)}
|
||||
<div className="flex items-center gap-3">
|
||||
<Button type="submit" variant="primary" disabled={save.isPending}>
|
||||
Save
|
||||
</Button>
|
||||
{save.isSuccess && <span className="text-sm text-muted">Saved.</span>}
|
||||
</div>
|
||||
{(save.error ?? detect.error) && <Alert>{(save.error ?? detect.error)!.message}</Alert>}
|
||||
{(save.error ?? detect.error ?? makeKey.error) && (
|
||||
<Alert>{(save.error ?? detect.error ?? makeKey.error)!.message}</Alert>
|
||||
)}
|
||||
</form>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// My Phone (05 §4): Home, Calls, Voicemail, Contacts (11), Settings, People, and the softphone.
|
||||
// My Phone (05 §4): Home, Calls, Voicemail, Contacts (11), Reports, Settings, People, and the
|
||||
// softphone.
|
||||
import {
|
||||
BookUser,
|
||||
ChartColumn,
|
||||
House,
|
||||
Info,
|
||||
LogOut,
|
||||
@@ -30,6 +32,7 @@ import { fmtNumber } from '../admin/CallsPage.tsx';
|
||||
import { ParkedCalls } from '../../components/ParkedCalls.tsx';
|
||||
import { DndSwitch, MeSettingsPage, showTarget, useMe } from './MeSettingsPage.tsx';
|
||||
import { ContactsPage, useContactName, useContactShares } from './ContactsPage.tsx';
|
||||
import { ReportsPage } from '../admin/ReportsPage.tsx';
|
||||
|
||||
const link = 'text-link underline';
|
||||
|
||||
@@ -124,6 +127,12 @@ export function MePage({ user }: { user: AuthUser }) {
|
||||
</span>
|
||||
)}
|
||||
</NavLink>
|
||||
{user.extension && (
|
||||
<NavLink to="/me/reports" className={tab} onClick={close}>
|
||||
<ChartColumn className={icon} />
|
||||
Reports
|
||||
</NavLink>
|
||||
)}
|
||||
<NavLink to="/me/settings" className={tab} onClick={close}>
|
||||
<Settings className={icon} />
|
||||
Settings
|
||||
@@ -180,6 +189,7 @@ export function MePage({ user }: { user: AuthUser }) {
|
||||
<Route path="calls" element={<MyCallsPage />} />
|
||||
<Route path="voicemail" element={<VoicemailPage />} />
|
||||
<Route path="contacts" element={<ContactsPage />} />
|
||||
<Route path="reports" element={<ReportsPage mine />} />
|
||||
<Route path="settings" element={<MeSettingsPage />} />
|
||||
<Route path="people" element={<PresencePanel me={me} />} />
|
||||
</Routes>
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
// My calls (05 §4): my call history; click the other number to call back (the softphone when it's
|
||||
// on, else my desk phone rings first). Names from my contacts (11 §1), "Add to contacts".
|
||||
import { useInfiniteQuery } from '@tanstack/react-query';
|
||||
// on, else my desk phone rings first). Names from my contacts (11 §1), "Add to contacts", "Report
|
||||
// spam".
|
||||
import { useInfiniteQuery, useMutation } from '@tanstack/react-query';
|
||||
import { useState } from 'react';
|
||||
import type { MyCallDto } from '@selfphoneng/shared';
|
||||
import { meApi, recordingsApi } from '../../api/client.ts';
|
||||
import { Alert, Button } from '../../components/ui.tsx';
|
||||
import { Alert, Button, Field, inputClass } from '../../components/ui.tsx';
|
||||
import { softphone } from '../../softphone/SoftphoneEngine.ts';
|
||||
import { DIRECTION_TEXT, StatusBadge, fmtDuration, fmtNumber } from '../admin/CallsPage.tsx';
|
||||
import { AddToContacts, useContactName } from './ContactsPage.tsx';
|
||||
import { SpamNote } from '../../components/SpamNote.tsx';
|
||||
import { SpamNote, spamLine } from '../../components/SpamNote.tsx';
|
||||
|
||||
/** The other side of the call, from where I sit. */
|
||||
export const otherParty = (c: MyCallDto) =>
|
||||
@@ -30,6 +31,64 @@ export function useCallBack() {
|
||||
return { call, note };
|
||||
}
|
||||
|
||||
/** To the admins' Blocked numbers: the spam check's line when it flagged the call, else my words. */
|
||||
function ReportSpam({ c }: { c: MyCallDto }) {
|
||||
const flagged = c.spam && c.spam.risk !== 'low' ? spamLine(c.spam) : null;
|
||||
const [open, setOpen] = useState(false);
|
||||
const [reason, setReason] = useState('');
|
||||
const send = useMutation({
|
||||
mutationFn: (r: string) => meApi.reportSpam({ callId: c.id, reason: r }),
|
||||
});
|
||||
if (send.isSuccess)
|
||||
return (
|
||||
<span role="status" className="text-muted">
|
||||
Reported to your admin
|
||||
</span>
|
||||
);
|
||||
return (
|
||||
<>
|
||||
{open ? (
|
||||
<form
|
||||
aria-label={`Report ${fmtNumber(c.fromNumber)} as spam`}
|
||||
className="flex w-full flex-wrap items-end gap-2"
|
||||
onSubmit={(e) => {
|
||||
e.preventDefault();
|
||||
send.mutate(reason);
|
||||
}}
|
||||
>
|
||||
<Field label="Why is it spam?">
|
||||
{(p) => (
|
||||
<input
|
||||
{...p}
|
||||
className={inputClass}
|
||||
maxLength={200}
|
||||
placeholder="Robocall about my car warranty"
|
||||
value={reason}
|
||||
onChange={(e) => setReason(e.target.value)}
|
||||
/>
|
||||
)}
|
||||
</Field>
|
||||
<Button type="submit" variant="primary" disabled={!reason.trim() || send.isPending}>
|
||||
Report
|
||||
</Button>
|
||||
<Button type="button" variant="ghost" onClick={() => setOpen(false)}>
|
||||
Cancel
|
||||
</Button>
|
||||
</form>
|
||||
) : (
|
||||
<Button
|
||||
variant="ghost"
|
||||
disabled={send.isPending}
|
||||
onClick={() => (flagged ? send.mutate(flagged) : setOpen(true))}
|
||||
>
|
||||
Report spam
|
||||
</Button>
|
||||
)}
|
||||
{send.error && <Alert>{send.error.message}</Alert>}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export function MyCallsPage() {
|
||||
const list = useInfiniteQuery({
|
||||
queryKey: ['me', 'calls'],
|
||||
@@ -98,6 +157,9 @@ export function MyCallsPage() {
|
||||
)}
|
||||
<StatusBadge status={c.status} />
|
||||
<span className="w-12 text-right tabular-nums">{fmtDuration(c.talkSeconds)}</span>
|
||||
{c.myRole === 'in' && c.direction === 'inbound' && other.number && !known && (
|
||||
<ReportSpam c={c} />
|
||||
)}
|
||||
</li>
|
||||
);
|
||||
})}
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
FROM debian:trixie-slim AS build
|
||||
ARG ASTERISK_VERSION=24.0.0-rc2
|
||||
ARG ASTERISK_VERSION=24.0.0-rc3
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
build-essential ca-certificates curl wget pkg-config autoconf automake libtool \
|
||||
|
||||
@@ -6,8 +6,9 @@
|
||||
# docker compose -f deploy/probe/compose.yml up -d → http://<this machine>:8080
|
||||
#
|
||||
# Host networking, so it sees the real address that asks (Docker's published ports can hide it).
|
||||
# Behind your own HTTPS reverse proxy instead: set PORT to a local port, TRUST_PROXY=true, and have
|
||||
# the proxy set X-Forwarded-For. The SIP checks connect out from here, so no other ports are needed.
|
||||
# Behind your own HTTPS reverse proxy on this machine instead: set PORT to a local port,
|
||||
# TRUST_PROXY=true (it then listens on 127.0.0.1 only; HOST changes that), and have the proxy set
|
||||
# X-Forwarded-For. The SIP checks connect out from here, so no other ports are needed.
|
||||
services:
|
||||
probe:
|
||||
# Built by each release, like the api and asterisk images (pick your registry and version).
|
||||
@@ -17,6 +18,9 @@ services:
|
||||
environment:
|
||||
PORT: '8080'
|
||||
TRUST_PROXY: 'false'
|
||||
# Strongly recommended: SelfPhoneNG → Settings → Network → Generate key, paste it here, and
|
||||
# the probe only answers your server. Empty: anyone who finds the probe can use it.
|
||||
PROBE_KEY: ''
|
||||
logging:
|
||||
driver: json-file
|
||||
options: { max-size: 10m, max-file: '3' }
|
||||
@@ -12,7 +12,11 @@ Wants=network-online.target
|
||||
[Service]
|
||||
ExecStart=/usr/local/bin/selfphoneng-probe
|
||||
Environment=PORT=8080
|
||||
# Behind your own HTTPS reverse proxy that sets X-Forwarded-For: PORT to a local one, and
|
||||
# Strongly recommended: SelfPhoneNG → Settings → Network → Generate key, then uncomment and paste
|
||||
# it; the probe then only answers your server.
|
||||
#Environment=PROBE_KEY=
|
||||
# Behind your own HTTPS reverse proxy on this machine that sets X-Forwarded-For: PORT to a local
|
||||
# one, and TRUST_PROXY=true (it then listens on 127.0.0.1 only; HOST changes that).
|
||||
#Environment=TRUST_PROXY=true
|
||||
Restart=always
|
||||
RestartSec=5
|
||||
|
||||
@@ -72,8 +72,10 @@ on, each recorded call is also recorded one side at a time, and a minute or two
|
||||
- the two one-side files are deleted. The normal recording stays.
|
||||
|
||||
On the **Recordings** page each call shows its summary, **Show transcript**, and the search box
|
||||
finds calls by what was said. People who were on a call can read its transcript too, like they can
|
||||
play its recording, and get its summary in their call report email (My settings → Call report).
|
||||
finds calls by what was said. People who made or answered a call can read its transcript too, like
|
||||
they can play its recording, and get its summary in their call report email (My settings → Call
|
||||
report). Someone whose phone only rang (a ring group or queue a coworker answered) can't: it's
|
||||
someone else's conversation.
|
||||
|
||||
- Only calls that are recorded are written out (user record modes, phone numbers, queues and
|
||||
conference rooms set to record), and only those recorded while it's on.
|
||||
|
||||
+107
-2
@@ -89,7 +89,7 @@ needs inside (`selfphoneng-probe-linux-x64`, or `-arm64` for ARM machines), next
|
||||
With Node 22 or newer installed you can take the small `selfphoneng-probe.cjs` instead.
|
||||
|
||||
```sh
|
||||
v=v0.0.11 # the release
|
||||
v=v0.0.12 # the release
|
||||
curl -fLO https://git.dou.bet/spng/selfphoneng/releases/download/$v/selfphoneng-probe-linux-x64
|
||||
curl -fLO https://git.dou.bet/spng/selfphoneng/releases/download/$v/SHA256SUMS
|
||||
sha256sum --check --ignore-missing SHA256SUMS
|
||||
@@ -103,7 +103,8 @@ sudo ufw allow 8080/tcp
|
||||
(On GitHub, the downloads are at `https://github.com/iamdoubz/selfphoneng/releases/download/$v/…`.)
|
||||
To try it first without the service, run `./selfphoneng-probe-linux-x64` and open
|
||||
`http://<machine>:8080/healthz`. `PORT` changes the port; behind your own HTTPS reverse proxy
|
||||
that sets X-Forwarded-For, also set `TRUST_PROXY=true`.
|
||||
on the same machine that sets X-Forwarded-For, also set `TRUST_PROXY=true`. The probe then only
|
||||
listens on 127.0.0.1 (`HOST` changes it) and only believes X-Forwarded-For from there.
|
||||
|
||||
**With Docker:**
|
||||
|
||||
@@ -117,6 +118,14 @@ against someone else, and each address gets a few tests per 10 minutes. Its SIP
|
||||
OPTIONS request; if you run fail2ban or CrowdSec, add the probe's address to their allow list so a
|
||||
test never counts toward a ban.
|
||||
|
||||
**Give the probe a key (strongly recommended).** Without one, anyone who finds your probe can use
|
||||
it to test their own address, and spend its few tests per 10 minutes. After saving the address,
|
||||
click **Generate key** under it, copy the `PROBE_KEY=…` line, and add it to the probe: under
|
||||
`environment:` in `deploy/probe/compose.yml` (`PROBE_KEY: '…'`), or as an `Environment=PROBE_KEY=…`
|
||||
line in the service file (`sudo systemctl edit selfphoneng-probe`). Restart the probe. From then on
|
||||
it only answers this server, and System → Diagnostics stops warning about it. The key is shown only
|
||||
once; a new probe address drops it, so generate one for the new probe.
|
||||
|
||||
## Firewall
|
||||
|
||||
Allow only the ports in the [port table](README.md#ports). All SelfPhoneNG containers use the
|
||||
@@ -228,6 +237,102 @@ labels:
|
||||
|
||||
and run `systemctl reload crowdsec`.
|
||||
|
||||
#### Slow scanners: add a second rule
|
||||
|
||||
The collection's rules (`crowdsecurity/asterisk_bf`, and `asterisk_user_enum` for many different
|
||||
usernames from one address) hold 5 failed sign-ins per address and let one go every 10 seconds.
|
||||
An address is banned only after 6 failures in about a minute. That stops fast password guessers,
|
||||
but not the common SIP scanners that space their tries out. Each try writes two failures
|
||||
(`InvalidAccountID`, then `ChallengeResponseFailed`), and the scanner comes back every 20 seconds
|
||||
or slower, so the count drains as fast as it fills and the scanner is never banned. You see it as
|
||||
`log_failed_request ... No matching endpoint found` / `Failed to authenticate` in the Asterisk log,
|
||||
from the same address, for hours.
|
||||
|
||||
Add a slower rule next to the stock ones, `/etc/crowdsec/scenarios/selfphoneng-asterisk-slow.yaml`:
|
||||
|
||||
```yaml
|
||||
type: leaky
|
||||
name: selfphoneng/asterisk-slow-bf
|
||||
description: "Asterisk failed sign-ins spread over time (slow SIP scanners)"
|
||||
filter: evt.Meta.log_type == 'asterisk_failed_auth'
|
||||
groupby: evt.Meta.source_ip
|
||||
capacity: 10
|
||||
leakspeed: 5m
|
||||
blackhole: 5m
|
||||
labels:
|
||||
service: asterisk
|
||||
confidence: 3
|
||||
spoofable: 0
|
||||
classification:
|
||||
- attack.T1110
|
||||
behavior: "sip:bruteforce"
|
||||
label: "Asterisk slow bruteforce"
|
||||
remediation: true
|
||||
```
|
||||
|
||||
```sh
|
||||
systemctl reload crowdsec
|
||||
cscli scenarios list | grep selfphoneng # listed, marked local
|
||||
```
|
||||
|
||||
It counts the same failures from the same parser; only the bucket is different:
|
||||
|
||||
| | Stock: `crowdsecurity/asterisk_bf` | This rule: `selfphoneng/asterisk-slow-bf` |
|
||||
| ----------------- | ----------------------------------------- | ------------------------------------------------ |
|
||||
| Holds | 5 failures | 10 failures |
|
||||
| Lets one go every | 10 seconds | 5 minutes |
|
||||
| Bans after | 6 failures within about a minute | 11 failures, at more than one per 5 minutes |
|
||||
| A scanner every… | 20 s: never banned | 20 s: banned after about 2 minutes |
|
||||
| Comes from | the CrowdSec hub (`cscli hub upgrade`) | this file; change it as you like |
|
||||
|
||||
Keep both: the stock rule still bans fast guessers within a minute. How long a ban lasts is set by
|
||||
CrowdSec's profiles, the same for both (4 hours by default, `/etc/crowdsec/profiles.yaml`).
|
||||
fail2ban's settings above (5 failures in 10 minutes) already catch slow scanners.
|
||||
|
||||
The catch: one of your own phones with an old password, signing in from outside your networks,
|
||||
adds up failures too and is banned after about 11 tries. CrowdSec's standard whitelist
|
||||
(`crowdsecurity/whitelists`) skips private addresses, so phones in the office are safe. Add the public address of any other office or remote worker
|
||||
to a whitelist, `/etc/crowdsec/parsers/s02-enrich/selfphoneng-whitelist.yaml`:
|
||||
|
||||
```yaml
|
||||
name: selfphoneng/whitelist
|
||||
description: "Our offices and remote phones"
|
||||
whitelist:
|
||||
reason: "our offices"
|
||||
ip:
|
||||
- "198.51.100.7"
|
||||
```
|
||||
|
||||
#### Checking CrowdSec
|
||||
|
||||
```sh
|
||||
cscli metrics show acquisition parsers scenarios
|
||||
```
|
||||
|
||||
- **Acquisition:** `security.log`'s _Lines read_ goes up as Asterisk writes. _Lines parsed_ is
|
||||
lower, and that's normal: only failed sign-ins are parsed, other security events (challenges
|
||||
sent, successful sign-ins) are left out.
|
||||
- **Scenarios:** _Overflows_ for `asterisk_bf` and `selfphoneng/asterisk-slow-bf` is the number of
|
||||
bans each has made.
|
||||
|
||||
To follow one log line through the parser and the rules, give `cscli explain` a line from
|
||||
`security.log`:
|
||||
|
||||
```sh
|
||||
cscli explain --type asterisk \
|
||||
--log "$(grep ChallengeResponseFailed /opt/selfphoneng/data/asterisk-logs/security.log | tail -1)"
|
||||
```
|
||||
|
||||
Point `--file` at the log itself, never at `acquis.d/selfphoneng.yaml`: that parses the YAML's own
|
||||
lines as if they were log lines, and every one shows as a parser failure.
|
||||
|
||||
To ban an address now, and to see the bans:
|
||||
|
||||
```sh
|
||||
cscli decisions add --ip 203.0.113.5 --duration 7d --reason "SIP scanner"
|
||||
cscli decisions list
|
||||
```
|
||||
|
||||
## Web sign-in attacks
|
||||
|
||||
The web sign-in is rate limited. Failed attempts are written to the api's log as
|
||||
|
||||
@@ -142,20 +142,29 @@ missing or invalid, it logs a clear message and exits with code 1.
|
||||
## 2. Asterisk image (`asterisk/Dockerfile`)
|
||||
|
||||
Build Asterisk **24 LTS from source**. Pin an exact version: the newest 24.x release on the day you write it, recorded here in
|
||||
the same commit. **Pinned: `24.0.0-rc2` (2026-10-17).** The file in the repo is the source of truth; this copy is kept in sync.
|
||||
the same commit. **Pinned: `24.0.0-rc3` (2026-10-28).** The file in the repo is the source of truth; this copy is kept in sync.
|
||||
|
||||
> **Asterisk 24 status (checked 2026-10-17):** Asterisk 24 is the LTS line, but
|
||||
> only release candidates are published so far (24.0.0-rc2). Until 24.0.0 is final,
|
||||
> only release candidates are published so far (24.0.0-rc3 on 2026-10-28). Until 24.0.0 is final,
|
||||
> develop against the newest 24.0.0-rcN. Release candidates may sit under a
|
||||
> different download folder than `releases/`, so check the directory listing. Switch to 24.0.0 (or newer
|
||||
> 24.x) as soon as it is final, and don't ship v1.0 on a release candidate. If a module, option
|
||||
> or dialplan function in this spec turns out to have changed in 24, follow the Asterisk 24
|
||||
> docs and update the spec (AGENTS rule 10).
|
||||
|
||||
**Changing the version** (owner, 2026-10-28). `apps/api/test/asterisk/verified.ts` lists what the
|
||||
code relies on Asterisk doing (the "checked on 24.0.0-rcN" notes in these specs, and the TLS
|
||||
qualify workaround in 08 §2.1), with the version it was measured on. `asterisk-version.test.ts`
|
||||
(part of `pnpm test`) fails while the Dockerfile pins another version or this section names
|
||||
another. To move: build the image, run `pnpm test:asterisk-upgrade` (boots it with the one-user
|
||||
golden config next to a TLS provider with its own CA, measures each fact, and lists every one
|
||||
that moved with what depends on it) and `pnpm test:asterisk`, change what moved, then set
|
||||
`VERIFIED_ASTERISK` and update this section.
|
||||
|
||||
```dockerfile
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
FROM debian:trixie-slim AS build
|
||||
ARG ASTERISK_VERSION=24.0.0-rc2
|
||||
ARG ASTERISK_VERSION=24.0.0-rc3
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
build-essential ca-certificates curl wget pkg-config autoconf automake libtool \
|
||||
@@ -200,7 +209,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
COPY --from=build /out/ /
|
||||
COPY conf/ /etc/asterisk/
|
||||
COPY entrypoint.sh /entrypoint.sh
|
||||
RUN chmod +x /entrypoint.sh && mkdir -p /etc/asterisk/selfphoneng /var/lib/asterisk/db /var/lib/asterisk/moh /var/run/asterisk \
|
||||
COPY sp-vm-pincheck /usr/local/bin/sp-vm-pincheck
|
||||
RUN chmod +x /entrypoint.sh /usr/local/bin/sp-vm-pincheck && mkdir -p /etc/asterisk/selfphoneng /var/lib/asterisk/db /var/lib/asterisk/moh /var/run/asterisk \
|
||||
&& chown -R asterisk:asterisk /etc/asterisk /var/lib/asterisk /var/spool/asterisk /var/log/asterisk /var/run/asterisk
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
```
|
||||
|
||||
@@ -480,6 +480,14 @@ create table ftc_complaints ( -- the FTC copy (14 §2.2), kept windowDa
|
||||
create index on ftc_complaints (number);
|
||||
create index on ftc_complaints (reported_at);
|
||||
|
||||
create table spam_reports ( -- a user's Report spam (05 §4), until an admin blocks or dismisses it
|
||||
id uuid primary key default gen_random_uuid(),
|
||||
number text not null, -- normalized, from the call
|
||||
reason text not null, -- the spam check's line, or the user's words
|
||||
reported_by uuid references users(id) on delete set null,
|
||||
unique (number, reported_by)
|
||||
);
|
||||
|
||||
create table call_extensions ( -- which extensions were involved (for per-user history)
|
||||
call_id uuid not null references calls(id) on delete cascade,
|
||||
extension_id uuid not null references extensions(id) on delete cascade,
|
||||
|
||||
@@ -322,8 +322,8 @@ For `auth_mode = 'ip'`, leave out the `-auth` and `-reg` sections and the `outbo
|
||||
(and `from_user` when there is no username).
|
||||
Skip disabled trunks entirely.
|
||||
For TCP/TLS trunks, `server_uri`, `client_uri` and the AOR `contact` get `;transport=tcp|tls`.
|
||||
As built (M11-T2): TLS trunks get `qualify_frequency = 0` (Asterisk 24 checks a qualify's certificate
|
||||
against the IP, see 08 §2.1); their health comes from the registration.
|
||||
TLS trunks are qualified like the others (`qualify_frequency = 60`) since 24.0.0-rc3. On rc2 they
|
||||
had `qualify_frequency = 0`, because rc2 checked a qualify's certificate against the IP (08 §2.1).
|
||||
`identify` resolves `match` when the config loads, and an unresolvable name is an ERROR that drops the
|
||||
trunk's identify (verified), so the API refuses a server name that doesn't resolve, and a transport
|
||||
that isn't turned on in Settings → SIP.
|
||||
|
||||
@@ -286,7 +286,9 @@ As built (M7-T1):
|
||||
outside); otherwise `src`. An outbound call has no `answered_by` (no extension answered).
|
||||
- **recording** (M7-T3): `sp-sub-record` sets `CDR(SP_REC)`; the file (relative, under
|
||||
`RECORDINGS_DIR`) becomes a `recordings` row (size, ffprobe length) linked to the call.
|
||||
`/api/recordings/:id/audio` serves it to admins and to users whose extension is on the call.
|
||||
`/api/recordings/:id/audio` serves it to admins and to users whose extension made or answered
|
||||
the call (`call_extensions` role `caller` or `answered`), not to a phone that only rang (08 §7
|
||||
#3); `/api/me/calls` shows such a call without its `recordingId`.
|
||||
Retention runs once a day (and at start) in the same day-change check as the nightly regenerate.
|
||||
- Aggregation runs 5 s after a linkedid's last Cdr event; on every AMI connect, linkedids older
|
||||
than a minute without a `calls` row are aggregated (instead of the nightly job).
|
||||
@@ -383,6 +385,8 @@ Auth & self:
|
||||
| GET | `/api/me/softphone-qr` | user | `{url, qr, expiresAt}`: Linphone setup link and its QR (PNG data URL), 24 h (07 §5) |
|
||||
| GET | `/api/me/webrtc` | user | `{ wsUrl: "wss://<host>/ws", sipUri: "sip:101-web@<host>", authUser: "101-web", password, displayName, iceServers: [...] }` |
|
||||
| GET | `/api/me/calls` | user | own call history (via `call_extensions`) |
|
||||
| GET | `/api/me/reports/summary?from&to` | user | `/api/reports/summary` of the calls that rang or were answered by me; `answered` and talk time are the ones I picked up |
|
||||
| POST | `/api/me/spam-reports` {callId, reason} | user | Report spam on an outside call that rang me; the number comes from the call. 404 not my call, 400 hidden number, 409 already blocked or already reported by me |
|
||||
| GET | `/api/me/voicemail` | user | list |
|
||||
| GET | `/api/me/voicemail/:id/audio` | user | streams the wav (`Content-Type: audio/wav`, supports Range) |
|
||||
| PATCH | `/api/me/voicemail/:id` | user | `{folder: 'Old'|'INBOX'}` |
|
||||
@@ -416,6 +420,7 @@ Admin resources (all `requireAdmin`; standard CRUD = `GET /x`, `POST /x`, `GET /
|
||||
| `/api/moh-classes` | `POST {name}` (slug, not `default`), `DELETE /:id` (409 with `usedBy` while an extension or queue uses it), `POST /:id/files?name=&filename=` (raw file body, like sounds), `GET /:id/files/:fileId/audio`, `DELETE /:id/files/:fileId`. No rename: the name is the folder and is stored on extensions and queues. Extensions and queues may only pick `default` or an existing class (400) |
|
||||
| `/api/devices` | `GET /:id/config-preview` (rendered provisioning file, passwords masked). As built (M10-T1): body `{mac (any format), vendor, model, label, extensionId}`; the DTO carries `provisioningUrl` and the `provisioningPassword` (admins type it into the phone); MAC taken → 409; preview of a generic phone → 400 |
|
||||
| `/api/blocked-numbers` | |
|
||||
| `/api/spam-reports` | GET (with the reporter's name) and DELETE (Dismiss). Blocking a number deletes its reports |
|
||||
| `/api/contacts` | company phonebook; `POST /import` CSV (`name,company,email,label1,number1,...`) or vCard (11 §3.1) |
|
||||
| `/api/webhooks` | `POST /:id/test`, `GET /:id/deliveries` |
|
||||
| `/api/api-tokens` | POST returns the token once |
|
||||
@@ -440,6 +445,7 @@ As built (M11-T6): `routes/reports.ts`. `from`/`to` are company-time-zone days,
|
||||
| GET | `/api/system/warnings` | `{items: [{code, message, link, dismissable?}]}` for the dashboard banner: `restart_required`, `e911_cid_missing` (a trunk exists, no default E911 caller ID), `e911_address_unconfirmed` (that DID has no `e911_address`), `smtp_missing`, `tls_cert` (TLS on and the cert missing or expiring within 14 days, M11-T2), `backup_old` (backups on and today's not made yet though the job had its chance, M11-T3), `directory_check` (12 §4.2, §4.5: the directory unreachable at a sign-in or by `directoryCheck`, or that job refusing to disable most people), `spam_quota` (14 §3, dismissable). "Trunk down" comes from live state in the browser |
|
||||
| POST | `/api/system/warnings/spam_quota/dismiss` | hides `spam_quota` until IPQualityScore's credits run out again (14 §3) |
|
||||
| POST | `/api/settings/network/detect-public-ip` | |
|
||||
| POST | `/api/settings/network/probe-key` | a new key for the network test probe, `{ key }` shown this once, stored encrypted in `network.probeKeyEnc` (never in GET: `network.hasProbeKey`); 400 without a probe address. Diagnostics sends it as `Authorization: Bearer`; a new `network.probeUrl` drops it (08 §7 #9) |
|
||||
| GET | `/api/system/status` | `{ db: ok, ami: connected, asteriskVersion, uptime, trunks: [...], disk: {free, total}, restartRequired, lastGeneratorRun }` |
|
||||
| GET | `/api/system/tls` | the SIP TLS certificate in `TLS_DIR`: `{ok: true, subject, names, notAfter}` or `{ok: false, error}` (M11-T2) |
|
||||
| GET | `/api/system/generated-files` | names + contents of generated files, **passwords masked** (debug view) |
|
||||
@@ -530,7 +536,8 @@ Events: `call.started`, `call.answered`, `call.ended`, `voicemail.new`, `sms.rec
|
||||
`sms.sent`, `emergency.call`, `trunk.registration_changed`, `extension.registration_changed`.
|
||||
|
||||
- Payload: `{ "id": "<uuid>", "event": "call.ended", "createdAt": "...", "data": {...} }`.
|
||||
`data` uses the same shapes as the REST API.
|
||||
`data` uses the same shapes as the REST API, except `voicemail.new` has no `transcript`: a
|
||||
webhook leaves the server and transcripts don't (10 §1, 08 §7 #6).
|
||||
- Headers: `Content-Type: application/json`, `X-SelfPhoneNG-Event`,
|
||||
`X-SelfPhoneNG-Timestamp` (unix seconds),
|
||||
`X-SelfPhoneNG-Signature: sha256=<hex HMAC-SHA256(secret, timestamp + "." + rawBody)>`.
|
||||
|
||||
@@ -46,7 +46,7 @@ Left sidebar navigation, in this order:
|
||||
| Recordings | `/admin/recordings` | Searchable list, play, download, delete |
|
||||
| Reports | `/admin/reports` | Summary charts (calls per day stacked by direction, missed per day, busiest hours heatmap), queue report table. As built (M11-T6): From/To dates (the last 30 days by default, a year at most); totals (calls, missed, average talk time); the charts are plain bars, no chart library, each bar labeled for screen readers; the heatmap is a weekday × hour table in the company time zone; the queue table has the same numbers as the queue page. Owner follow-up (2026-10-21, "total minutes, calltime, missed calls"): totals also have answered, talk time and outside minutes (in and out: inbound from arrival, since a receptionist or voicemail answers too; outbound from the answer; roughly what the provider bills), an outside-minutes-per-day chart, and one tile per voip.ms trunk with its account balance (`GET /api/reports/balance`, `getBalance`; a trunk without the API login says what to add) |
|
||||
| SMS | `/admin/sms` | Same UI as the user one, with all DIDs |
|
||||
| Blocked numbers | `/admin/blocked` | |
|
||||
| Blocked numbers | `/admin/blocked` | Users' Report spam on top (number, reason, who, when; Block or Dismiss); their count is a Dashboard tile |
|
||||
| Settings | `/admin/settings` | Tabs: General, Network (public IP detect, LAN IP, local nets, STUN/TURN), SIP (ports, TCP/TLS), Numbering ranges, Email (SMTP + test), Voicemail, Recording (retention, announcement sound + **legal notice text, 08 §5**), Emergency (default E911 caller ID, notify emails/extensions + a **test notification** button that does NOT dial 911), Backups (schedule, keep, include recordings, list + download + "Back up now"), Webhooks, API tokens. Security: desk phone networks, **outside calls at once** (per extension, whole system; 0 = no limit), phone setup files, SIP TLS. Spam check (14 §7.1) |
|
||||
| System | `/admin/system` | Status JSON pretty-printed, Asterisk version, generator runs list, "Apply config now", "Rollback", "Restart telephony", generated-files viewer (read-only, masked), allowlisted CLI dropdown (04 §7.3) with output panel, audit log. As built (owner follow-ups to M11-T7, 2026-10-20), laid out after 3CX's admin dashboard (not copied): a **System information** panel (version, host name, company, public IP static/dynamic, LAN IPs, ports SIP/SIPS/media/HTTPS, telephony running, restart needed; copy buttons) with how to restart (`docker compose restart asterisk` on the server; no restart button),, a **Diagnostics** panel (08 §2.6: the server's own checks, then a Quick or Complete network test through the probe, each line with how to fix it), and an **Event log** panel (severity, event code, time, source, details; Load more; Download = `/api/system/events.csv`). Events (`system_events`, kept 90 days): `trunk.down`/`trunk.up` (registration changes), `telephony.down`/`telephony.up` (AMI), `telephony.restartNeeded`, `config.failed`, `emergency.call`/`emergency.test`, `network.publicIpChanged`, `backup.done`/`backup.failed`, `disk.low`, `spam.quotaExhausted`/`spam.quotaRestored` (14 §3). Admin edits stay in the audit log (not shown yet). The dashboard's `restart_required` warning links here. Generator runs, generated files and CLI views aren't built; the admin guide's troubleshooting page covers them from the shell |
|
||||
|
||||
@@ -102,9 +102,10 @@ Implementation notes (M3):
|
||||
| Page | Path | Contents |
|
||||
|---|---|---|
|
||||
| Home | `/me` | Status card (DND toggle, forwarding summary, queue login toggles), missed calls, new voicemails, colleagues presence list. M4 ships only new voicemails; the rest arrives with DND/forwarding (M6), call history (M7) and presence (M5-T3) |
|
||||
| Calls | `/me/calls` | Own call history, click a number to call back, add to contacts |
|
||||
| Calls | `/me/calls` | Own call history, click a number to call back, add to contacts, Report spam on an outside call that rang me (the spam check's line when it said medium or high, else a reason I type) |
|
||||
| Voicemail | `/me/voicemail` | List (new bold), play (marks read), download, delete, search (transcript, caller). Greetings section: record in the browser (MediaRecorder → upload), upload, or delete for unavail/busy/name |
|
||||
| Contacts | `/me/contacts` | Personal + company (read-only) with search, click to call |
|
||||
| Reports | `/me/reports` | The admin Reports' summary of the calls made to me (rang or answered me, not the ones I made): calls, answered by me, missed, talk time, calls and missed per day, busiest hours. No outside minutes, balance or queues. Shown only with an extension |
|
||||
| Messages | `/me/sms` | Threads per DID + remote number, chat bubbles, composer with 160-char segment counter, unread badges (06 §5) |
|
||||
| Settings | `/me/settings` | Forwarding rules (always/busy/no answer with number fields), voicemail PIN, email options, call report email (off / hourly / daily at a time / weekly on a day at a time, company time zone; optional summaries of recorded calls, 10 §3; nothing sent for a period without calls), softphone audio devices, notification permission, change password, "Set up a phone app" (QR, 07 §5), "Mobile app" (pair a phone, list and remove paired phones, 13 §2) |
|
||||
|
||||
|
||||
@@ -54,8 +54,9 @@ voip.ms Asterisk PJSIP wiki: registration + auth + aor + endpoint + identify,
|
||||
which means the **Request-URI user is the 10-digit DID** (no leading 1).
|
||||
- The dialplan (03 §6.4) normalizes it to 11 digits and checks `sp-did-exists`. If that fails,
|
||||
it falls back to the user part of the `To:` header. That covers either behavior.
|
||||
- **M3 acceptance check (verify):** run `pjsip set logger on`, call the DID from a
|
||||
mobile phone, and confirm which header carries the DID. Record the finding here.
|
||||
- **Checked (owner, 2026-10-21):** a mobile → DID call came in with the DID as the Request-URI
|
||||
user, and the dialplan routed it to the digital receptionist. The `To:` fallback stays for
|
||||
other providers.
|
||||
- Inbound caller ID arrives as 10 digits for North American callers. The dialplan normalizes it to 11.
|
||||
|
||||
## 4. Outbound calls
|
||||
|
||||
@@ -34,10 +34,12 @@
|
||||
cert is missing or expires within 14 days.
|
||||
- `transport-tls` has `verify_server = yes` + `ca_list_file = /etc/ssl/certs/ca-certificates.crt`:
|
||||
the provider's certificate is checked (voip.ms: Let's Encrypt, every POP in its SAN list,
|
||||
checked 2026-10-19). Asterisk 24.0.0-rc2 checks a **qualify** OPTIONS against the IP instead of
|
||||
the host name, which fails on voip.ms ("server identity does not match") and marks the contact
|
||||
Unavailable, so TLS trunks get `qualify_frequency = 0` and Test skips the qualify; REGISTER and
|
||||
INVITE verify the name correctly. Re-check on Asterisk upgrades.
|
||||
checked 2026-10-19). Asterisk 24.0.0-rc2 checked a **qualify** OPTIONS against the IP instead
|
||||
of the host name, which failed on voip.ms ("server identity does not match") and marked the
|
||||
contact Unavailable, so TLS trunks had `qualify_frequency = 0` and Test skipped the qualify.
|
||||
24.0.0-rc3 fixed it ("Preserve target hostname for qualified OPTIONS destination"): TLS trunks
|
||||
are qualified again, and the upgrade check (`tlsQualifyByHostname`, 01 §2) catches it if it
|
||||
comes back.
|
||||
- Phones over TLS are not provisioned (templates stay UDP); that's for remote phones later.
|
||||
|
||||
### 2.2 Phone ACL (setting `sip.restrictPhonesToLocalNets`)
|
||||
@@ -117,8 +119,12 @@ how to fix it.
|
||||
works on Gitea's runner, where the job's checkout can't be bind-mounted).
|
||||
`deploy/probe/selfphoneng-probe.service` runs it under systemd with `DynamicUser` and a
|
||||
read-only system. About 45 MB of memory.
|
||||
- With `PROBE_KEY` set the probe only answers `Authorization: Bearer <key>` (401 otherwise,
|
||||
compared in constant time); without it, it answers anyone and logs a warning at start. The key
|
||||
is made in Settings → Network and sent by the api only, never the browser (08 §7 #9).
|
||||
- `POST /v1/check {host, tests}`: the probe tests **only the address the request came from** (the
|
||||
last X-Forwarded-For entry with `TRUST_PROXY=true`), so it can't be aimed at anyone else; 20
|
||||
last X-Forwarded-For entry with `TRUST_PROXY=true`, believed only from a proxy on 127.0.0.1
|
||||
or ::1, where the probe then listens by default; 08 §7 #4), so it can't be aimed at anyone else; 20
|
||||
tests at most, 10 checks per address per 10 minutes, 4 s per test.
|
||||
- Quick: HTTP 80, HTTPS 443 `/healthz` (status and certificate), SIP OPTIONS over UDP (and TCP
|
||||
when on) to `sip.udpPort`. Complete adds SIP over TLS (when on), a WebSocket upgrade on `/ws`
|
||||
@@ -237,3 +243,36 @@ Fixed after the review (owner, 2026-10-21):
|
||||
exist; with credentials it counts as a failure (`devices.test.ts`).
|
||||
- The login limiter forgets keys past every window, swept at most once a minute
|
||||
(`login-limiter.test.ts`).
|
||||
|
||||
## 7. Security review 2 (2026-10-28)
|
||||
|
||||
Everything since §6 (`8d5475c..`): contacts and Contrack, single sign-on, call reports, local AI,
|
||||
spam check, the mobile app's pairing, my reports and spam reports. Two passes again: one against
|
||||
the code by the author, and an independent review agent (read-only, told to prove each finding
|
||||
end to end). Each fix came with a test that failed before it and passes now. Nothing Critical or
|
||||
High.
|
||||
|
||||
| # | Severity | Finding | Fix | Proof |
|
||||
|---|---|---|---|---|
|
||||
| 1 | Medium | A directory sign-in matched by email a user who signs in with OpenID only. Where people can edit their own `mail`, Mallory set hers to the victim's and her own directory password opened the victim's account | the email match also needs no connected account of any kind (12 §4.3 step 2) | `directory-signin.test.ts` |
|
||||
| 2 | Medium | An OpenID sign-in matched by verified email an admin, or a user who signs in through the directory (no password, no OpenID account yet): a provider account with that email got their session, admin included | not an admin, and no connected account of any kind (12 §3.3 step 2) | `oidc.test.ts`, both key types |
|
||||
| 3 | Medium, privacy | Everyone whose phone **rang** counted as on the call: a ring group or queue member who didn't answer could play a coworker's recording, read its transcript, and got its summary in their call report email and on their Contrack timeline. The audio part predates §6 | `ON_THE_CALL` (`services/cdr.ts`): only the `caller` and `answered` roles, in `mayHear`, `/api/me/calls` (no `recordingId`), the call report and the timeline | `recordings.test.ts`, `call-reports.test.ts`, `contrack.test.ts` |
|
||||
| 4 | Low | The probe with `TRUST_PROXY=true` believed any X-Forwarded-For and listened on every address: reached directly, anyone could have it test any address and ports | X-Forwarded-For only from 127.0.0.1 or ::1; `HOST` defaults to 127.0.0.1 with `TRUST_PROXY=true` (§2.6) | `probe.test.ts` |
|
||||
| 5 | Low | A user could swap their directory account for another one they know the password of (a shared mailbox): the leaver check then followed the wrong account | `POST /api/me/identities/ldap` → 409 `connected_other` when a different one is connected; an admin disconnects first (12 §4.3) | `directory-signin.test.ts` |
|
||||
| 6 | Low, privacy | The `voicemail.new` webhook carried the transcript, though webhooks leave the server and 10 §1 says transcripts don't | the webhook has no `transcript` (04 §9) | `voicemail.test.ts` |
|
||||
| 7 | Low | Contrack's saved company token went to any address: Test with another URL, or saving a new URL, sent it there (SMTP, LDAP and OpenID already refused) | the saved token only for the saved address; a new address needs it typed again and clears everyone's own token (11 §4.3) | `contrack.test.ts` |
|
||||
| 8 | Low | The OpenID connect callback wasn't tied to the browser that asked: a planted `sp_oidc` (a sibling subdomain can set it) connected the victim's provider account to the attacker's user | the callback's own session must be the one in `sp_oidc`, else `expired` (12 §3.3) | `oidc.test.ts`, both key types |
|
||||
| 9 | Low | Anyone who found a probe could use it (owner's idea after #4): to test their own address, and spend its per-address limits | an optional key: Settings → Network → Generate key, set as the probe's `PROBE_KEY`; the api sends it as a Bearer token, encrypted at rest, dropped when the probe address changes. Without a key the probe stays open (owner, 2026-10-28) and Diagnostics warns, strongly recommending one (§2.6) | `probe.test.ts`, `diagnostics.test.ts` |
|
||||
|
||||
The independent agent found 1, 2, 4, 5 and 8, the author 3; both found 6 and 7; 9 was the
|
||||
owner's idea. The agent had
|
||||
checked the recording rule and called it sound: it's the same rule as the audio, which §6 also
|
||||
passed.
|
||||
|
||||
Checked and sound (both passes): every new route's guard and ownership check (contacts and
|
||||
sharing, spam reports, my reports, caller check, mobile devices); a paired phone is never an admin
|
||||
and can't make pairing codes, and codes are single-use; OpenID PKCE, state, nonce, `safeNext` and
|
||||
encrypted provider tokens; LDAP filter escaping and no empty binds; the caller-name lookup only
|
||||
for Asterisk on this machine with its token; phonebook XML and timeline HTML escaped, report
|
||||
emails plain text; AI and Contrack addresses literal local IPs with redirects refused; the spam
|
||||
provider key kept out of errors; every new raw SQL parameterized; no secret in any GET.
|
||||
+1
-1
@@ -47,7 +47,7 @@ is logged and the message goes out without it.
|
||||
or timing out: the run stops and the call is retried next minute.
|
||||
- API: `GET /api/recordings` has `summary`, `hasTranscript`, `aiError`, and `?q=` (ILIKE on the
|
||||
transcript and summary, `%`/`_` taken literally). `GET /api/recordings/:id/transcript`: admins
|
||||
and the people on the call, like the audio. Deleting a recording, and retention, delete its side
|
||||
and the people on the call (made or answered it, not only rang), like the audio. Deleting a recording, and retention, delete its side
|
||||
files too.
|
||||
|
||||
## 4. Next (in order)
|
||||
|
||||
@@ -190,6 +190,9 @@ against the pinned version's `openapi.json`.
|
||||
checked by reading contacts).
|
||||
- Admin, same page: the **company Contrack account's token** (read-only is enough; read-write lets
|
||||
"Add to company contacts" work), write-only like the SMTP password (`hasCompanyToken` in GET).
|
||||
Like it, the saved token only goes to the address it was saved for: Test with another address
|
||||
sends none, and saving a new address needs the token typed again (400). A new address also
|
||||
clears everyone's own token: they connect again (08 §7 #7).
|
||||
The admin makes that account in Contrack (e.g. `company@…`) and fills it like any other.
|
||||
- Contrack tokens expire in 90 days unless made with **Never**: the guide and the forms say to pick
|
||||
Never (or a year).
|
||||
|
||||
+14
-8
@@ -199,11 +199,12 @@ Failed callbacks count in the IP login limiter (04 §2.2).
|
||||
Signing in, in this order:
|
||||
|
||||
1. A `user_identities` row (`oidc`, `"<iss> <sub>"`) → its user.
|
||||
2. Else, a user with that email (case-insensitive) who has **no password and no OpenID account
|
||||
yet** (made by an admin in `oidc` mode, or whose password an admin removed), **and the email is
|
||||
verified** (`email_verified === true`, or `trustEmail`) → connect it now (step 3's row) and sign
|
||||
in. Users who have a password are never matched by email: they connect from My account, so a
|
||||
provider where people can set their own email can't hand over an account.
|
||||
2. Else, a user with that email (case-insensitive) who is **not an admin** and has **no password
|
||||
and no connected account of any kind yet** (made by an admin in `oidc` mode, or whose password
|
||||
an admin removed), **and the email is verified** (`email_verified === true`, or `trustEmail`)
|
||||
→ connect it now (step 3's row) and sign in. Users who have a password, an admin, or someone
|
||||
who signs in through the directory are never matched by email: they connect from My account,
|
||||
so a provider where people can set their own email can't hand over an account (08 §7 #2).
|
||||
3. Else `not_connected`.
|
||||
|
||||
Connecting (from My account, already signed in, any mode but `password`):
|
||||
@@ -211,6 +212,9 @@ Connecting (from My account, already signed in, any mode but `password`):
|
||||
- After the callback, the session's user gets the `user_identities` row (email and groups as
|
||||
sent). Refused (`taken`) when that `iss sub` belongs to another user; a user who already has one
|
||||
replaces it (confirm in the UI). Other sessions stay. Audit `sso_connected`.
|
||||
- The callback must arrive in the browser whose session asked: its `sp_session` is the session in
|
||||
`sp_oidc`, else `expired`. A planted `sp_oidc` (from a sibling subdomain) can't connect the
|
||||
victim's provider account to someone else's user (08 §7 #8).
|
||||
- **Disconnect** (`DELETE /api/me/identities/oidc`; admins also on Users,
|
||||
`DELETE /api/users/:id/identities/oidc`): ends that user's `oidc` sessions. Refused (409
|
||||
`last_way_in`) when it would leave them no way to sign in in the current mode (no password, or
|
||||
@@ -376,11 +380,13 @@ A user can have both a SelfPhoneNG password and a directory account: either pass
|
||||
|
||||
1. A `user_identities` row (`ldap`, id) → its user. Their email here follows the directory's when
|
||||
it changes (unless another user has it: kept, logged).
|
||||
2. Else, a user with the directory email who is **not an admin** and has **no password or only the
|
||||
temporary one** from Users (`must_change_password`) → connect it (add the row) and sign in,
|
||||
2. Else, a user with the directory email who is **not an admin**, has **no password or only the
|
||||
temporary one** from Users (`must_change_password`) and **no connected account of any kind**
|
||||
(an OpenID user's account is theirs, 08 §7 #1) → connect it (add the row) and sign in,
|
||||
audit `ldap_connected`. Anyone else connects on My settings → Sign-in → **Connect directory
|
||||
account** (`POST /api/me/identities/ldap`, `{ login, password }`, checked by the directory and
|
||||
counted by the login limiter; 409 `taken` when another user has it). Security audit,
|
||||
counted by the login limiter; 409 `taken` when another user has it, 409 `connected_other` when
|
||||
they already have a different one: an admin disconnects it first, 08 §7 #5). Security audit,
|
||||
2026-10-26: a directory where people can edit their own `mail` (common OpenLDAP access rules)
|
||||
must not hand out the admin's account.
|
||||
3. Else → 401 "Wrong email or password" (no account is made, §1), with `login_failed` audited as
|
||||
|
||||
+13
-15
@@ -8,13 +8,15 @@ Tick a box only with proof: a date and what was seen.
|
||||
|
||||
- [x] Milestones M0–M11 built and tested (simulated phones and a simulated voip.ms).
|
||||
- [x] Security review (M11-T8), with an independent review (08 §6).
|
||||
- [x] Second security review of everything after it, with an independent review; all eight
|
||||
findings fixed with tests (08 §7, 2026-10-28).
|
||||
|
||||
## Real voip.ms account (M3)
|
||||
|
||||
- [x] The trunk shows **Registered** in the UI (2026-10-21: green, voip.ms, the sub-account at
|
||||
its POP).
|
||||
- [x] A mobile → DID call rings a phone. 2026-10-21: DID → digital receptionist → browser
|
||||
phone; the DID came in the Request-URI. Still to do: write that down in 06 §3.
|
||||
phone; the DID came in the Request-URI (written down in 06 §3).
|
||||
- [x] An outbound call shows the DID as caller ID on the mobile (2026-10-21, owner).
|
||||
- [ ] Write down in 06 §4 whether per-call caller ID (Remote-Party-ID) is honored.
|
||||
|
||||
@@ -31,18 +33,14 @@ On hold until the owner has the phones (2026-10-21).
|
||||
|
||||
## Someone else installs it (M11)
|
||||
|
||||
- [ ] An outside tester follows only the admin guide and gets inbound and outbound calls working
|
||||
on a fresh VM.
|
||||
- [ ] A backup restores on a second VM.
|
||||
|
||||
On hold (2026-10-21).
|
||||
- [x] An outside tester follows only the admin guide and gets inbound and outbound calls working
|
||||
on a fresh VM (2026-10-28, owner).
|
||||
- [x] A backup restores on a second VM (2026-10-28, owner).
|
||||
|
||||
## A week on the owner's server
|
||||
|
||||
- [ ] 7 days handling real calls with no crash or restart of the api or Asterisk.
|
||||
- [ ] Nightly backups restore cleanly.
|
||||
|
||||
In progress on the owner's server (v0.0.2, from 2026-10-21).
|
||||
- [x] 7 days handling real calls with no crash or restart of the api or Asterisk (2026-10-28, owner).
|
||||
- [x] Nightly backups restore cleanly (2026-10-28, owner).
|
||||
|
||||
## Updating
|
||||
|
||||
@@ -57,7 +55,8 @@ Docker only, never bare metal (owner, 2026-10-21).
|
||||
restarts, and the script went back to v0.0.3 with that backup restored.
|
||||
- [ ] A real compose install with the bundled Caddy updated with `scripts/update.sh`, with calls
|
||||
and backups.
|
||||
- [ ] The owner's Portainer stack updated to a release that changes the database.
|
||||
- [x] The owner's Portainer stack updated to a release that changes the database, several times
|
||||
(2026-10-28, owner).
|
||||
|
||||
## Security leftovers (08 §6)
|
||||
|
||||
@@ -73,10 +72,9 @@ Owner's decision (2026-10-21): fix all of them. Each is in 08 §6 with its test.
|
||||
## The release
|
||||
|
||||
- [ ] Version 1.0.0 in every `package.json`, and a v1.0.0 entry in the [changelog](../CHANGELOG.md).
|
||||
- [ ] The release builds and pushes images to both the Gitea registry and ghcr.io. (Gitea works.
|
||||
ghcr.io: the api image pushes; the asterisk package exists, empty, and refuses the push.)
|
||||
- [x] The release builds and pushes images to both the Gitea registry and ghcr.io (2026-10-28, owner).
|
||||
|
||||
## Not needed for v1
|
||||
|
||||
More SIP providers (Telnyx, Flowroute, Twilio), SMS, push notifications for phone apps, and the
|
||||
M12 list in the roadmap.
|
||||
The mobile app (owner, 2026-10-28), more SIP providers (Telnyx, Flowroute, Twilio), SMS, push
|
||||
notifications for phone apps, and the M12 list in the roadmap.
|
||||
+3
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "selfphoneng",
|
||||
"version": "0.0.11",
|
||||
"version": "0.0.12",
|
||||
"private": true,
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"type": "module",
|
||||
@@ -15,7 +15,8 @@
|
||||
"lint": "eslint . && prettier --check .",
|
||||
"format": "prettier --write .",
|
||||
"typecheck": "pnpm -r typecheck",
|
||||
"test:asterisk": "node apps/api/test/asterisk/load-golden.mjs && node --conditions=source apps/api/test/asterisk/call-test.ts && node --conditions=source apps/api/test/asterisk/trunk-test.ts && node --conditions=source apps/api/test/asterisk/voicemail-test.ts && node --conditions=source apps/api/test/asterisk/moh-test.ts && node --conditions=source apps/api/test/asterisk/rec-test.ts"
|
||||
"test:asterisk-upgrade": "node --conditions=source apps/api/test/asterisk/upgrade-test.ts",
|
||||
"test:asterisk": "node apps/api/test/asterisk/load-golden.mjs && node --conditions=source apps/api/test/asterisk/call-test.ts && node --conditions=source apps/api/test/asterisk/trunk-test.ts && node --conditions=source apps/api/test/asterisk/voicemail-test.ts && node --conditions=source apps/api/test/asterisk/moh-test.ts && node --conditions=source apps/api/test/asterisk/rec-test.ts && node --conditions=source apps/api/test/asterisk/upgrade-test.ts"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^10.0.1",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@selfphoneng/shared",
|
||||
"version": "0.0.11",
|
||||
"version": "0.0.12",
|
||||
"private": true,
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"type": "module",
|
||||
|
||||
@@ -17,8 +17,27 @@ export const BlockedCreateSchema = z.object({
|
||||
return z.NEVER;
|
||||
}
|
||||
}),
|
||||
reason: z.string().trim().max(100).nullable().optional(),
|
||||
reason: z.string().trim().max(200).nullable().optional(),
|
||||
});
|
||||
export type BlockedCreate = z.input<typeof BlockedCreateSchema>;
|
||||
|
||||
export type BlockedDto = { id: string; number: string; reason: string | null; createdAt: string };
|
||||
|
||||
/**
|
||||
* A user's "Report spam" on a call that rang them (05 §4). The reason is the spam check's line
|
||||
* when it flagged the call, else what the user typed. An admin blocks or dismisses it.
|
||||
*/
|
||||
export const SpamReportCreateSchema = z.object({
|
||||
callId: z.uuid(),
|
||||
reason: z.string().trim().min(1, 'Say why').max(200),
|
||||
});
|
||||
export type SpamReportCreate = z.input<typeof SpamReportCreateSchema>;
|
||||
|
||||
export type SpamReportDto = {
|
||||
id: string;
|
||||
number: string;
|
||||
reason: string;
|
||||
/** The reporter's display name; null once their account is gone. */
|
||||
reportedBy: string | null;
|
||||
createdAt: string;
|
||||
};
|
||||
@@ -42,6 +42,11 @@ export const SettingsSchemas = {
|
||||
.url({ protocol: /^https?$/ })
|
||||
.nullable()
|
||||
.default(null),
|
||||
/**
|
||||
* The probe's key (its PROBE_KEY), encrypted: made by POST /api/settings/network/probe-key,
|
||||
* sent as a Bearer token, dropped when the address changes (08 §7 #9). Never in GET.
|
||||
*/
|
||||
'network.probeKeyEnc': z.string().nullable().default(null),
|
||||
'network.stunServer': z
|
||||
.string()
|
||||
.regex(/^[A-Za-z0-9.-]+(:\d{1,5})?$/)
|
||||
@@ -327,10 +332,17 @@ export type SettingsDto = {
|
||||
[
|
||||
K in Exclude<
|
||||
SettingKey,
|
||||
'smtp' | 'sms.webhookToken' | 'contacts.contrack' | 'auth.oidc' | 'auth.ldap' | 'spam'
|
||||
| 'smtp'
|
||||
| 'sms.webhookToken'
|
||||
| 'contacts.contrack'
|
||||
| 'auth.oidc'
|
||||
| 'auth.ldap'
|
||||
| 'spam'
|
||||
| 'network.probeKeyEnc'
|
||||
>
|
||||
]: SettingValue<K>;
|
||||
} & {
|
||||
'network.hasProbeKey': boolean;
|
||||
smtp: (Omit<SmtpInput, 'password'> & { hasPassword: boolean }) | null;
|
||||
'contacts.contrack': { url: string; publicUrl: string | null; hasCompanyToken: boolean } | null;
|
||||
spam: SpamSettingsDto;
|
||||
|
||||
Reference in new issue
Block a user